Merge branch '2.2' into 2.3

karatheodory · Mar 13, 2018 · ff30839 · ff30839
2 parents c07b6e6 + 594147d
commit ff30839
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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