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
commit8572e5a55b3d9a01f0ec1037eaf4c64a82736cbb (patch)
tree60d630ab1c51c7a5e2ab7adf8e28b22f0e7a51f9 /sites
parentc5f06cc919471184eca775650d1ae65995cf8773 (diff)
parent6943aed6f969144748e6e3f396a8eff219defd64 (diff)
Merge branch '2.4'
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 437e2f7b..7fe84884 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -7,6 +7,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