backport EVP_R_DISABLED_FOR_FIPS removal, increment for 0.2.2
diff --git a/cryptography/__about__.py b/cryptography/__about__.py
index 19a928a..1fe3bb3 100644
--- a/cryptography/__about__.py
+++ b/cryptography/__about__.py
@@ -22,7 +22,7 @@
"recipes and primitives to Python developers.")
__uri__ = "https://github.com/pyca/cryptography"
-__version__ = "0.2.1"
+__version__ = "0.2.2"
__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"
diff --git a/cryptography/hazmat/bindings/openssl/err.py b/cryptography/hazmat/bindings/openssl/err.py
index ddb60ef..56e9a6b 100644
--- a/cryptography/hazmat/bindings/openssl/err.py
+++ b/cryptography/hazmat/bindings/openssl/err.py
@@ -151,7 +151,6 @@
static const int EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH;
static const int EVP_R_DECODE_ERROR;
static const int EVP_R_DIFFERENT_KEY_TYPES;
-static const int EVP_R_DISABLED_FOR_FIPS;
static const int EVP_R_ENCODE_ERROR;
static const int EVP_R_INITIALIZATION_ERROR;
static const int EVP_R_INPUT_NOT_INITIALIZED;
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 3e92906..602be7c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,8 +1,14 @@
Changelog
=========
+0.2.2 - 2014-03-03
+~~~~~~~~~~~~~~~~~~
+
+* Removed a constant definition that was causing compilation problems with specific versions of OpenSSL.
+
0.2.1 - 2014-02-22
~~~~~~~~~~~~~~~~~~
+
* Fix a bug where importing cryptography from multiple paths could cause initialization to fail.
0.2 - 2014-02-20