summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--paramiko/_version.py2
-rw-r--r--sites/www/changelog.rst1
2 files changed, 2 insertions, 1 deletions
diff --git a/paramiko/_version.py b/paramiko/_version.py
index 7adb8add..95dafc60 100644
--- a/paramiko/_version.py
+++ b/paramiko/_version.py
@@ -1,2 +1,2 @@
-__version_info__ = (1, 17, 3)
+__version_info__ = (1, 18, 0)
__version__ = '.'.join(map(str, __version_info__))
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index de992850..ebe6f918 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
Changelog
=========
+* :release:`1.18.0 <2016-12-09>`
* :release:`1.17.3 <2016-12-09>`
* :bug:`802 (1.17+)` (via :issue:`804`) Update our vendored Windows API module
to address errors of the form ``AttributeError: 'module' object has no