From b808d5e6eb7e5cc3ab6cc71b7b25a1feb543bdfc Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Fri, 9 Jun 2017 14:00:46 -0700
Subject: Hand-port #984 to 2.0

---
 paramiko/transport.py   | 2 +-
 sites/www/changelog.rst | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/paramiko/transport.py b/paramiko/transport.py
index d219550d..2153b899 100644
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -106,9 +106,9 @@ class Transport(threading.Thread, ClosingContextManager):
         'aes192-ctr',
         'aes256-ctr',
         'aes128-cbc',
-        'blowfish-cbc',
         'aes192-cbc',
         'aes256-cbc',
+        'blowfish-cbc',
         '3des-cbc',
     )
     _preferred_macs = (
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index b850db69..32bb9250 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>`.
-- 
cgit v1.2.3