summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2017-11-22 11:40:12 +0800
committerAlex Gaynor <alex.gaynor@gmail.com>2017-11-21 21:40:12 -0600
commit57051a53e154c2b401ab84d6f01c6512e6c7b346 (patch)
treebaade9b0b1d092822b00b33516e1ff9964217c26
parente61e2025237c571ee5ee8dc1735381252f5c5abf (diff)
downloadpyopenssl-57051a53e154c2b401ab84d6f01c6512e6c7b346.tar.gz
reopen master (#718)
-rw-r--r--CHANGELOG.rst26
-rw-r--r--src/OpenSSL/version.py2
2 files changed, 27 insertions, 1 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4989822..abf3efa 100644
--- 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
index 4ac2945..f328cef 100644
--- a/src/OpenSSL/version.py
+++ b/src/OpenSSL/version.py
@@ -11,7 +11,7 @@ __all__ = [
"__title__", "__uri__", "__version__",
]
-__version__ = "17.4.0"
+__version__ = "17.5.0.dev0"
__title__ = "pyOpenSSL"
__uri__ = "https://pyopenssl.org/"