summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-09-18 12:07:10 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-09-18 12:07:10 -0700
commit97869a69dc7213e274524d5309076e47b6bafbf9 (patch)
tree52e36874e85034ae7a8e7bd06dcf2698303d9488 /sites
parentb55abff677c348ed41126a59b4f608c2449183aa (diff)
parentd6208bf892c380f439aa01679e95bafd6c380504 (diff)
Merge branch '2.2'
Diffstat (limited to 'sites')
-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 b8872b87..430e89b7 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
Changelog
=========
+* :release:`1.18.4 <2017-09-18>`
* :bug:`1065` Add rekeying support to GSSAPI connections, which was erroneously
missing. Without this fix, any attempt to renegotiate the transport keys for
a ``gss-kex``-authed `~paramiko.transport.Transport` would cause a MIC