summaryrefslogtreecommitdiffhomepage
path: root/sites/www/changelog.rst
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
commitff30839f40f9440925537d3de7f3e15beee3d265 (patch)
tree8db385484eed66596122e2c3894111bed5b80a8f /sites/www/changelog.rst
parentc07b6e6b8b94fe8a946a8120c1d1b4039c1fe4f0 (diff)
parent594147d8a1039e7b99fdb01163885d9c9fdd9f3c (diff)
Merge branch '2.2' into 2.3
Diffstat (limited to 'sites/www/changelog.rst')
-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 e3d779af..66ad53de 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -6,6 +6,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