From f1a707d191589056145da4ff649ffece8fad7c63 Mon Sep 17 00:00:00 2001
From: Nate Prewitt <Nate.Prewitt@gmail.com>
Date: Fri, 9 Dec 2016 12:22:03 -0700
Subject: [PATCH] updating 3.0 history

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

diff --git a/3.0-HISTORY.rst b/3.0-HISTORY.rst
index f332485f..1956a5d1 100644
--- a/3.0-HISTORY.rst
+++ b/3.0-HISTORY.rst
@@ -1,6 +1,31 @@
 3.0.0 (2016-xx-xx)
 ++++++++++++++++++
 
+- Remove support for non-string/bytes parameters in ``_basic_auth_str``.
+
+- Prevent ``Session.merge_environment`` from erroneously setting the
+  ``verify`` parameter to ``None`` instead of ``True``.
+
+- Streaming responses with ``Response.iter_lines`` or ``Response.iter_content``
+  now requires an encoding to be set if one isn't provided by the server.
+
+- Raise exception if multiple locations are returned during a redirect.
+
+- Update ConnectionPool connections when TLS/SSL settings change.
+
+- Remove simplejson import and only use standard json module.
+
+- Strip surrounding whitespace from urls.
+
+- MissingSchema and InvalidSchema renamed to MissingScheme and InvalidScheme
+  respectively.
+
+- Change merge order for environment settings to avoid excluding Session-level
+  settings.
+
+- Encode redirect URIs as latin-1 before performing redirects in Python 3 to
+  avoid mangling during the requoting process.
+
 - Remove the ``__bool__`` and ``__nonzero__`` methods from a ``Response``
   object.