add changelog entry, set proper deprecation warning
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index fd92a56..69eea52 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -27,6 +27,10 @@
* Add support for parsing X.509 certificate signing requests (CSRs) with
:func:`~cryptography.x509.load_pem_x509_csr` and
:func:`~cryptography.x509.load_der_x509_csr`.
+* Moved ``cryptography.exceptions.InvalidToken`` to
+ :class:`cryptography.hazmat.primitives.twofactor.InvalidToken` and deprecated
+ the old location. This was moved to minimize confusion between this exception
+ and :class:`cryptography.fernet.InvalidToken`.
0.8.2 - 2015-04-10
~~~~~~~~~~~~~~~~~~
diff --git a/src/cryptography/utils.py b/src/cryptography/utils.py
index 31d7275..445554e 100644
--- a/src/cryptography/utils.py
+++ b/src/cryptography/utils.py
@@ -11,7 +11,7 @@
DeprecatedIn08 = DeprecationWarning
-DeprecatedIn09 = DeprecationWarning
+DeprecatedIn09 = PendingDeprecationWarning
def read_only_property(name):