summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2017-11-29 21:20:48 +0800
committerAlex Gaynor <alex.gaynor@gmail.com>2017-11-29 08:20:48 -0500
commited5a7717a50edd3b0a9b7c729b2281dabd18390d (patch)
tree92023baf2005289f17158745bb31681aaf10d341
parente85fceec5a7d3aab7b47225de65066a02b1874d7 (diff)
downloadcryptography-2.1.x.tar.gz
changelog and version bump (#4030)2.1.42.1.x
-rw-r--r--CHANGELOG.rst7
-rw-r--r--src/cryptography/__about__.py2
-rw-r--r--vectors/cryptography_vectors/__about__.py2
3 files changed, 9 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index cf6836528..765447780 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,13 @@ Changelog
=========
+.. _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
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index b0df09716..d754a0796 100644
--- a/src/cryptography/__about__.py
+++ b/src/cryptography/__about__.py
@@ -14,7 +14,7 @@ __summary__ = ("cryptography is a package which provides cryptographic recipes"
" 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"
diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py
index 4e5d2c96d..f43a58ca5 100644
--- a/vectors/cryptography_vectors/__about__.py
+++ b/vectors/cryptography_vectors/__about__.py
@@ -14,7 +14,7 @@ __summary__ = "Test vectors for the cryptography package."
__uri__ = "https://github.com/pyca/cryptography"
-__version__ = "2.1.3"
+__version__ = "2.1.4"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"