diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2017-09-18 12:07:08 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2017-09-18 12:07:08 -0700 |
commit | d6208bf892c380f439aa01679e95bafd6c380504 (patch) | |
tree | 76413a534ca16d9f0f17a6a21f576a4d1838c282 /sites/www | |
parent | 61d1297f3c9fc1bb9e8d4f4524d287d38c56c3cf (diff) | |
parent | b58beb4dd0211092e352fd01af0be5e6550c9db5 (diff) |
Merge branch '2.1' into 2.2
Diffstat (limited to 'sites/www')
-rw-r--r-- | sites/www/changelog.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index aebf21f1..b3609fe1 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 |