summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCory Benfield <lukasaoz@gmail.com>2016-09-26 09:49:21 +0100
committerGitHub <noreply@github.com>2016-09-26 09:49:21 +0100
commit1988666cd06633ab9d817fe9dc596c6957ee2c2c (patch)
tree49286a3d9a7180da7e4406eeb4596b6440636a0c
parentb4b89be8d927b915bb99c4cf8cdd14509fd2b778 (diff)
parente95981e34770d8fa43afb59329de96d05e2aae03 (diff)
downloadurllib3-1988666cd06633ab9d817fe9dc596c6957ee2c2c.tar.gz
Merge pull request #983 from Lukasa/update-changes
Update changes for 1.18
-rw-r--r--CHANGES.rst8
1 files changed, 6 insertions, 2 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 538103c5..e6851865 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,12 @@ Changes
dev (master)
------------
+* ... [Short description of non-trivial change.] (Issue #)
+
+
+1.18 (2016-09-26)
+-----------------
+
* Fixed incorrect message for IncompleteRead exception. (PR #973)
* Accept ``iPAddress`` subject alternative name fields in TLS certificates.
@@ -14,8 +20,6 @@ dev (master)
* Fixed handling of wildcard certificates when using PyOpenSSL. (Issue #979)
-* ... [Short description of non-trivial change.] (Issue #)
-
1.17 (2016-09-06)
-----------------