commit ed5a7717a50edd3b0a9b7c729b2281dabd18390d
author Paul Kehrer <paul.l.kehrer@gmail.com> Wed Nov 29 13:20:48 2017
committer Alex Gaynor <alex.gaynor@gmail.com> Wed Nov 29 13:20:48 2017
tree 92023baf2005289f17158745bb31681aaf10d341
parent e85fceec5a7d3aab7b47225de65066a02b1874d7

changelog and version bump (#4030)

CHANGELOG.rst

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index cf68365..7654477 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,13 @@
 =========
 
 
+.. _v2-1-4:
+
+2.1.4 - 2017-11-29
+~~~~~~~~~~~~~~~~~~
+
+* Added ``X509_up_ref`` for an upcoming ``pyOpenSSL`` release.
+
 .. _v2-1-3:
 
 2.1.3 - 2017-11-02

src/cryptography/__about__.py

diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index b0df097..d754a07 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__ = "2.1.3"
+__version__ = "2.1.4"
 
 __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 4e5d2c9..f43a58c 100644
--- a/vectors/cryptography_vectors/__about__.py
+++ b/vectors/cryptography_vectors/__about__.py
@@ -14,7 +14,7 @@
 
 __uri__ = "https://github.com/pyca/cryptography"
 
-__version__ = "2.1.3"
+__version__ = "2.1.4"
 
 __author__ = "The cryptography developers"
 __email__ = "cryptography-dev@python.org"