summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2020-12-15 09:41:27 -0600
committerGitHub <noreply@github.com>2020-12-15 10:41:27 -0500
commit2f26202d0e8acc24e22bede20b1456d63c3ed107 (patch)
tree5fe3a243c04b0848893f8a42f3bd04186df90c41
parent4211b909fb5aa2c4db2b0f5acbab1480972a0554 (diff)
downloadpyopenssl-git-2f26202d0e8acc24e22bede20b1456d63c3ed107.tar.gz
reopen master for dev (#980)
-rw-r--r--CHANGELOG.rst12
-rw-r--r--src/OpenSSL/version.py2
2 files changed, 13 insertions, 1 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 63e74cb..2951256 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,6 +4,18 @@ Changelog
Versions are year-based with a strict backward-compatibility policy.
The third digit is only for regressions.
+21.0.0 (UNRELEASED)
+-------------------
+
+Backward-incompatible changes:
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Deprecations:
+^^^^^^^^^^^^^
+
+Changes:
+^^^^^^^^
+
20.0.1 (2020-12-15)
-------------------
diff --git a/src/OpenSSL/version.py b/src/OpenSSL/version.py
index 9348867..2274aac 100644
--- a/src/OpenSSL/version.py
+++ b/src/OpenSSL/version.py
@@ -17,7 +17,7 @@ __all__ = [
"__version__",
]
-__version__ = "20.0.1"
+__version__ = "21.0.0.dev"
__title__ = "pyOpenSSL"
__uri__ = "https://pyopenssl.org/"