summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-02-20 21:15:06 -0800
committerJeff Forcier <jeff@bitprophet.org>2017-02-20 21:15:06 -0800
commit97b9b87798fc18142b79db1b66449f596ff2f558 (patch)
treee5318f224a4d15f0ec0bf721e47e57cb4025f054
parentde45684a49d2a94a0bd97385153717acda41ccc5 (diff)
parentd7071f33c82604798010a0c77015b0e9b88027e9 (diff)
downloadparamiko-97b9b87798fc18142b79db1b66449f596ff2f558.tar.gz
Merge branch '1.17' into 1.18
-rw-r--r--sites/www/changelog.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 9745e53f..e1633bd6 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
Changelog
=========
+* :release:`1.17.4 <2017-02-20>`
* :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.