Import python-urllib3_1.12.orig.tar.gz

1 files changed, 19 insertions, 9 deletions

diff --git a/CHANGES.rst b/CHANGES.rst
index 7f5620f..ea10bb7 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,19 @@
 Changes
 =======
 
+1.12 (2015-09-03)
++++++++++++++++++
+
+* Rely on ``six`` for importing ``httplib`` to work around
+  conflicts with other Python 3 shims. (Issue #688)
+
+* Add support for directories of certificate authorities, as supported by
+  OpenSSL. (Issue #701)
+
+* New exception: ``NewConnectionError``, raised when we fail to establish
+  a new connection, usually ``ECONNREFUSED`` socket error.
+
+
 1.11 (2015-07-21)
 +++++++++++++++++
 
@@ -9,10 +22,10 @@ Changes
 
 * ``pip install urllib3[secure]`` will install Certifi and
   PyOpenSSL as dependencies. (Issue #678)
-  
+
 * Made ``HTTPHeaderDict`` usable as a ``headers`` input value
   (Issues #632, #679)
-  
+
 * Added `urllib3.contrib.appengine <https://urllib3.readthedocs.org/en/latest/contrib.html#google-app-engine>`_
   which has an ``AppEngineManager`` for using ``URLFetch`` in a
   Google AppEngine environment. (Issue #664)
@@ -27,28 +40,25 @@ Changes
 
 * Fix pools not getting replenished when an error occurs during a
   request using ``release_conn=False``. (Issue #644)
-  
+
 * Fix pool-default headers not applying for url-encoded requests
   like GET. (Issue #657)
 
 * log.warning in Python 3 when headers are skipped due to parsing
   errors. (Issue #642)
-  
+
 * Close and discard connections if an error occurs during read.
   (Issue #660)
-  
+
 * Fix host parsing for IPv6 proxies. (Issue #668)
 
 * Separate warning type SubjectAltNameWarning, now issued once
   per host. (Issue #671)
-  
+
 * Fix ``httplib.IncompleteRead`` not getting converted to
   ``ProtocolError`` when using ``HTTPResponse.stream()``
   (Issue #674)
 
-* ... [Short description of non-trivial change.] (Issue #)
-
-
 1.10.4 (2015-05-03)
 +++++++++++++++++++