diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2018-03-12 18:17:38 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2018-03-12 18:17:38 -0700 |
commit | 594147d8a1039e7b99fdb01163885d9c9fdd9f3c (patch) | |
tree | 37174ed7fff060e18819473cbed5298cca40668f /sites/www | |
parent | 04f0d9fc74f6219d2932252b6ba7d835bb4914ef (diff) | |
parent | 61ce4dee94b3664b5fc5e52b221c624a5206612e (diff) |
Merge branch '2.1' into 2.2
Diffstat (limited to 'sites/www')
-rw-r--r-- | sites/www/changelog.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index d6b7057d..826462ec 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -5,6 +5,8 @@ Changelog * :release:`2.2.3 <2018-03-12>` * :release:`2.1.5 <2018-03-12>` * :release:`2.0.8 <2018-03-12>` +* :release:`1.18.5 <2018-03-12>` +* :release:`1.17.6 <2018-03-12>` * :bug:`1175 (1.17+)` Fix a security flaw (CVE-2018-7750) in Paramiko's server mode (emphasis on **server** mode; this does **not** impact *client* use!) where authentication status was not checked before processing channel-open |