From 57051a53e154c2b401ab84d6f01c6512e6c7b346 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Wed, 22 Nov 2017 11:40:12 +0800
Subject: reopen master (#718)

---
 CHANGELOG.rst          | 26 ++++++++++++++++++++++++++
 src/OpenSSL/version.py |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

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/"
-- 
cgit v1.2.1