reopen master (#718)

pyca · Nov 22, 2017 · 57051a5 · 57051a5
1 parent e61e202
commit 57051a5
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,32 @@ Changelog
 Versions are year-based with a strict backward-compatibility policy.
 The third digit is only for regressions.
 
+17.5.0 (UNRELEASED)
+-------------------
+
+
+Backward-incompatible changes:
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+*none*
+
+
+Deprecations:
+^^^^^^^^^^^^^
+
+*none*
+
+
+Changes:
+^^^^^^^^
+
+
+*none*
+
+----
+
+
+
 17.4.0 (2017-11-21)
 -------------------
 

diff --git a/src/OpenSSL/version.py b/src/OpenSSL/version.py
@@ -11,7 +11,7 @@
     "__title__", "__uri__", "__version__",
 ]
 
-__version__ = "17.4.0"
+__version__ = "17.5.0.dev0"
 
 __title__ = "pyOpenSSL"
 __uri__ = "https://pyopenssl.org/"