summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2016-03-01 21:02:30 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2016-03-01 21:02:30 -0500
commitcd7ee203c8459ff74a2cd782013ba1c05793130c (patch)
tree15b50aeac0c26e8606600df88b273877a618c67c
parent3dc1d43b06f60969b7356d14e508da8794d057e6 (diff)
parent0dbc6b68cbb538c000fd779cc2dcd4c4bb49bc77 (diff)
downloadcryptography-1.2.x.tar.gz
Merge pull request #2751 from reaperhulk/1.2.3-changelog1.2.31.2.x
bump to 1.2.3
-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 fec0a021a..5393b30e9 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
Changelog
=========
+1.2.3 - 2016-03-01
+~~~~~~~~~~~~~~~~~~
+
+* Updated Windows and OS X wheels to be compiled against OpenSSL 1.0.2g.
+
1.2.2 - 2016-01-29
~~~~~~~~~~~~~~~~~~
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index 198ab4949..e8642f92e 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.2"
+__version__ = "1.2.3"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"
diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py
index d41d868c9..b881bb350 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.2"
+__version__ = "1.2.3"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"