diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-01-29 14:20:27 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-01-29 14:20:27 -0500 |
| commit | 5b32344deadf371f3a5301ac4c71508eb1a6cf17 (patch) | |
| tree | 76889cc32eb6f7f365663726a6cc29aae2f3c95b | |
| parent | 80543674d13b44ca9030b83443a1d922d492df1e (diff) | |
| parent | 0426a8150f126f5cfa133b64a82b33fdb0c5840b (diff) | |
| download | cryptography-1.2.2.tar.gz | |
Merge pull request #2697 from reaperhulk/1.2.2-changelog1.2.2
update changelog and version for 1.2.2
| -rw-r--r-- | CHANGELOG.rst | 5 | ||||
| -rw-r--r-- | src/cryptography/__about__.py | 2 | ||||
| -rw-r--r-- | vectors/cryptography_vectors/__about__.py | 2 |
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" |