Merge branch '2.3' into 2.4

1 files changed, 18 insertions, 0 deletions

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 0037adf7..67a8bb00 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,24 @@
 Changelog
 =========
 
+- :support:`1292 backported` Backport changes from :issue:`979` (added in
+  Paramiko 2.3) to Paramiko 2.0-2.2, using duck-typing to preserve backwards
+  compatibility. This allows these older versions to use newer Cryptography
+  sign/verify APIs when available, without requiring them (as is the case with
+  Paramiko 2.3+).
+
+  Practically speaking, this change prevents spamming of
+  ``CryptographyDeprecationWarning`` notices which pop up in the above scenario
+  (older Paramiko, newer Cryptography).
+
+  .. note::
+    This is a no-op for Paramiko 2.3+, which have required newer Cryptography
+    releases since they were released.
+
+- :support:`1291 backported` Backport pytest support and application of the
+  ``black`` code formatter (both of which previously only existed in the 2.4
+  branch and above) to everything 2.0 and newer. This makes back/forward
+  porting bugfixes significantly easier.
 - :support:`1262 backported` Add ``*.pub`` files to the MANIFEST so distributed
   source packages contain some necessary test assets. Credit: Alexander
   Kapshuna.