summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2018-03-12 18:17:38 -0700
committerJeff Forcier <jeff@bitprophet.org>2018-03-12 18:17:38 -0700
commit61ce4dee94b3664b5fc5e52b221c624a5206612e (patch)
tree5f831a110c2733ee9b228f1454e7640c80ee5dc3 /sites
parente62f35a71bcc90447f3eee6f5b48f174a7bfb83e (diff)
parent4de0a3b72444820b68253de308d224ead0067bd2 (diff)
Merge branch '2.0' into 2.1
Diffstat (limited to 'sites')
-rw-r--r--sites/www/changelog.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 302e157c..e252f18c 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -4,6 +4,8 @@ Changelog
* :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