Merge branch '2.1'

devent · Jun 9, 2017 · e059529 · e059529
2 parents 799e483 + c2de25f
commit e059529
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/paramiko/_version.py b/paramiko/_version.py
@@ -1,2 +1,2 @@
-__version_info__ = (2, 1, 2)
+__version_info__ = (2, 1, 3)
 __version__ = '.'.join(map(str, __version_info__))
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
@@ -2,6 +2,10 @@
 Changelog
 =========
 
+* :release:`2.1.3 <2017-06-09>`
+* :release:`2.0.6 <2017-06-09>`
+* :release:`1.18.3 <2017-06-09>`
+* :release:`1.17.5 <2017-06-09>`
 * :bug:`865` SSHClient now requests the type of host key it has (e.g. from
   known_hosts) and does not consider a different type to be a "Missing" host
   key. This fixes a common case where an ECDSA key is in known_hosts and the