summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2018-03-12 18:04:54 -0700
committerJeff Forcier <jeff@bitprophet.org>2018-03-12 18:04:54 -0700
commitc5f06cc919471184eca775650d1ae65995cf8773 (patch)
tree8bacd57976236c41adb7c1d87289ea14f09514ce
parent1cd44d6950168654031cc7e4521047ecc23344a5 (diff)
parent8bd1506c816b025b4a74e1b254e4879518ae696d (diff)
Merge branch '2.4'
-rw-r--r--paramiko/_version.py2
-rw-r--r--sites/www/changelog.rst5
2 files changed, 6 insertions, 1 deletions
diff --git a/paramiko/_version.py b/paramiko/_version.py
index c1e20464..a5db89b8 100644
--- a/paramiko/_version.py
+++ b/paramiko/_version.py
@@ -1,2 +1,2 @@
-__version_info__ = (2, 4, 0)
+__version_info__ = (2, 4, 1)
__version__ = '.'.join(map(str, __version_info__))
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 3672e532..437e2f7b 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,11 @@
Changelog
=========
+* :release:`2.4.1 <2018-03-12>`
+* :release:`2.3.2 <2018-03-12>`
+* :release:`2.2.3 <2018-03-12>`
+* :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