summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-02-20 21:04:08 -0800
committerJeff Forcier <jeff@bitprophet.org>2017-02-20 21:04:08 -0800
commitf1ce6e2c9e0a3c23b142cdf0456b87e3a7383a7b (patch)
tree6c16e26e8146b6705e42417d2b7d3d409e26bd4b /sites
parent281e1f1f01b9a726561fbefb297b74eb0114d76c (diff)
parentdd66e4d50543ed44aac8868bd5c15187c9044275 (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 957bf5ef..1f7fa62c 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
Changelog
=========
+* :bug:`853 (1.17+)` Tweak how `RSAKey.__str__ <paramiko.rsakey.RSAKey>`
+ behaves so it doesn't cause ``TypeError`` under Python 3. Thanks to Francisco
+ Couzo for the report.
* :bug:`862 (1.17+)` (via :issue:`863`) Avoid test suite exceptions on
platforms lacking ``errno.ETIME`` (which seems to be some FreeBSD and some
Windows environments.) Thanks to Sofian Brabez.