2.2 release! (#4150)
* 2.2 release!
* also change versions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 912a368..84f3dbc 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -3,10 +3,8 @@
.. _v2-2:
-2.2 - `master`_
-~~~~~~~~~~~~~~~
-
-.. note:: This version is not yet released and is under active development.
+2.2 - 2018-03-19
+~~~~~~~~~~~~~~~~
* **BACKWARDS INCOMPATIBLE:** Support for Python 2.6 has been dropped.
* Resolved a bug in ``HKDF`` that incorrectly constrained output size.
@@ -23,6 +21,7 @@
and
:func:`~cryptography.hazmat.primitives.keywrap.aes_key_unwrap_with_padding`
.
+* Allow loading DSA keys with 224 bit ``q``.
.. _v2-1-4:
diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py
index ee16ac8..53d31c2 100644
--- a/src/cryptography/__about__.py
+++ b/src/cryptography/__about__.py
@@ -14,7 +14,7 @@
" and primitives to Python developers.")
__uri__ = "https://github.com/pyca/cryptography"
-__version__ = "2.2.dev1"
+__version__ = "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 466a016..70cca35 100644
--- a/vectors/cryptography_vectors/__about__.py
+++ b/vectors/cryptography_vectors/__about__.py
@@ -14,7 +14,7 @@
__uri__ = "https://github.com/pyca/cryptography"
-__version__ = "2.2.dev1"
+__version__ = "2.2"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"