diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2018-03-12 18:03:15 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2018-03-12 18:03:15 -0700 |
commit | bade6985c1cdf573775f5f458c91644d3afe5bec (patch) | |
tree | 72cbb24ca9788b5c798af8597f9ed69f0e9c6981 /sites/www | |
parent | 58b0dbc206e74ce0d76ca7a2afa109d73dc1bfbf (diff) | |
parent | e62f35a71bcc90447f3eee6f5b48f174a7bfb83e (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 67f7d157..6bf41ecc 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,8 @@ Changelog ========= +* :release:`2.1.5 <2018-03-12>` +* :release:`2.0.8 <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 |