commit f25e63d272e9e785717ecec9af8ef0b0d1140130
author Alex Gaynor <alex.gaynor@gmail.com> Fri Aug 26 20:55:44 2016 -0400
committer Paul Kehrer <paul.l.kehrer@gmail.com> Sat Aug 27 08:55:44 2016 +0800
tree 91ca1168d99b2d77330c2559f8e75e3044901f19
parent c0ee738a8460dc3551758400772978ed62a84d46

Reopen master for 1.6 (#3112)

CHANGELOG.rst

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6aeba4f..667720c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.6 - `master`_
+~~~~~~~~~~~~~~~
+
+.. note:: This version is not yet released and is under active development.
+
 1.5 - 2016-08-26
 ~~~~~~~~~~~~~~~~
 

src/cryptography/__about__.py

diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index 3c38986..a056d79 100644
--- a/src/cryptography/__about__.py
+++ b/src/cryptography/__about__.py
@@ -14,7 +14,7 @@
                " and primitives to Python developers.")
 __uri__ = "https://github.com/pyca/cryptography"
 
-__version__ = "1.5"
+__version__ = "1.6.dev1"
 
 __author__ = "The cryptography developers"
 __email__ = "cryptography-dev@python.org"

vectors/cryptography_vectors/__about__.py

diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py
index 495b851..2280ce5 100644
--- a/vectors/cryptography_vectors/__about__.py
+++ b/vectors/cryptography_vectors/__about__.py
@@ -14,7 +14,7 @@
 
 __uri__ = "https://github.com/pyca/cryptography"
 
-__version__ = "1.5"
+__version__ = "1.6.dev1"
 
 __author__ = "The cryptography developers"
 __email__ = "cryptography-dev@python.org"