summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.rst5
-rw-r--r--src/cryptography/__about__.py2
-rw-r--r--vectors/cryptography_vectors/__about__.py2
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f7c62fc15..fec0a021a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
Changelog
=========
+1.2.2 - 2016-01-29
+~~~~~~~~~~~~~~~~~~
+
+* Updated Windows and OS X wheels to be compiled against OpenSSL 1.0.2f.
+
1.2.1 - 2016-01-08
~~~~~~~~~~~~~~~~~~
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index 8fc2e1e41..198ab4949 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__ = "1.2.1"
+__version__ = "1.2.2"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"
diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py
index 36edfa903..d41d868c9 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__ = "1.2.1"
+__version__ = "1.2.2"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"