summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-12-28 16:51:42 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2014-12-28 16:51:42 -0800
commit9a4f1a0f6c89e3e56b955e5acc6c0001e418443d (patch)
treec0f47861b1f04cce3c4f155c39d97695ea5e5432
parentc8affc30fd15b127d8c8f55da3f4dd32e9866282 (diff)
parent880f6529ac9240e96a29eeeccefacf1aef250d4f (diff)
downloadcryptography-9a4f1a0f6c89e3e56b955e5acc6c0001e418443d.tar.gz
Merge pull request #1588 from reaperhulk/update-0.7.1-changelog0.7.1
add changelog entry for 0.7.1 and update versions
-rw-r--r--CHANGELOG.rst6
-rw-r--r--src/cryptography/__about__.py2
-rw-r--r--vectors/cryptography_vectors/__about__.py2
3 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 5f295f2b0..508124abf 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,12 @@
Changelog
=========
+0.7.1 - 2014-12-28
+~~~~~~~~~~~~~~~~~~
+
+* Fixed an issue preventing compilation on platforms where ``OPENSSL_NO_SSL3``
+ was defined.
+
0.7 - 2014-12-17
~~~~~~~~~~~~~~~~
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index f022b21d9..06b7b900e 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__ = "0.7"
+__version__ = "0.7.1"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"
diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py
index 5f36cb64f..2786460d3 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__ = "0.7"
+__version__ = "0.7.1"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"