aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2016-01-30 16:24:58 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2016-01-30 16:24:58 -0500
commit1489a96df302640c351c58a692d18ffc6de9b9e4 (patch)
tree4d10cd07043f94d774f2a513da89479471271533
parent8207318116eba08b45d3abe85451383a2461b099 (diff)
parent2c6b8d043ea39758493f375f99ec4e07fb3f1e75 (diff)
downloadcryptography-1489a96df302640c351c58a692d18ffc6de9b9e4.tar.gz
cryptography-1489a96df302640c351c58a692d18ffc6de9b9e4.tar.bz2
cryptography-1489a96df302640c351c58a692d18ffc6de9b9e4.zip
Merge pull request #2698 from reaperhulk/port-1.2.2-changelog
port 1.2.2 changelog to master
-rw-r--r--CHANGELOG.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3d3aeb0e..a203a164 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -9,6 +9,11 @@ Changelog
* Deprecated support for OpenSSL 0.9.8. Support will be removed in
``cryptography`` 1.4.
+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
~~~~~~~~~~~~~~~~~~