summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCory Benfield <lukasaoz@gmail.com>2016-08-15 16:19:23 +0100
committerCory Benfield <lukasaoz@gmail.com>2016-08-15 16:19:23 +0100
commit5176c78aa9a7d0ca42cef1cacc54fef5ca769cbe (patch)
treeb20183d366c5826649bb412824de2fdee4874bfc
parent4a15efa7c954abfd6575591c0504265d2703b446 (diff)
downloadurllib3-5176c78aa9a7d0ca42cef1cacc54fef5ca769cbe.tar.gz
Changelog update for #947.
-rw-r--r--CHANGES.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 8344cd3f..dbddffb2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -30,6 +30,9 @@ dev (master)
* Try to use the operating system's certificates when we are using an
``SSLContext``. (PR #941)
+* Updated cipher suite list to allow ChaCha20+Poly1305. AES-GCM is preferred to
+ ChaCha20, but ChaCha20 is then preferred to everything else. (PR #947)
+
* ... [Short description of non-trivial change.] (Issue #)