From be2f92b9e300d0b5c7af0fed7d1f421b06676d3a Mon Sep 17 00:00:00 2001
From: Nate Prewitt <Nate.Prewitt@gmail.com>
Date: Wed, 1 Mar 2017 10:32:05 -0700
Subject: [PATCH] updating HISTORY

---
 3.0-HISTORY.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/3.0-HISTORY.rst b/3.0-HISTORY.rst
index 4701e529..4674579a 100644
--- a/3.0-HISTORY.rst
+++ b/3.0-HISTORY.rst
@@ -1,6 +1,10 @@
 3.0.0 (2017-xx-xx)
 ++++++++++++++++++
 
+- Simplified logic for determining Content-Length and Transfer-Encoding.
+  Requests will now avoid setting both headers on the same request, and
+  raise an exception if this is done manually by a user.
+
 - Remove the HTTPProxyAuth class in favor of supporting proxy auth via
   the proxies parameter.