summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-06-09 14:00:48 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-06-09 14:00:48 -0700
commitb46591f08007ad3e49a13275c11fab2cd4aab003 (patch)
treed03de830a05fe68729459e9c2f026fa30e1a84cb /sites
parentd9960a122f8afd65956b157b427e534de7fa495d (diff)
parent645c540d9bc489a77efb5b17d92ff4d59cf62f80 (diff)
Merge branch '2.1'
Diffstat (limited to 'sites')
-rw-r--r--sites/www/changelog.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 4bb1ec1b..b83473bb 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
Changelog
=========
+* :bug:`984` Enhance default cipher preference order such that
+ ``aes(192|256)-cbc`` are preferred over ``blowfish-cbc``. Thanks to Alex
+ Gaynor.
* :bug:`971 (1.17+)` Allow any type implementing the buffer API to be used with
`BufferedFile <paramiko.file.BufferedFile>`, `Channel
<paramiko.channel.Channel>`, and `SFTPFile <paramiko.sftp_file.SFTPFile>`.