aboutsummaryrefslogtreecommitdiffstats
path: root/docs/security.rst
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-10-23 09:26:41 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-10-23 09:26:41 -0700
commit971b98d40ed1cb6b6eecba7a83c0ff4a1ef89c5f (patch)
tree89abac95e3e96ca5c64ee0f638822eb45030d9d3 /docs/security.rst
parent0ea233631ad2ed7e1abf372dfc1850a04eb7343d (diff)
parenta05af52d1f0fba90030b62185d38523119d68b42 (diff)
downloadcryptography-971b98d40ed1cb6b6eecba7a83c0ff4a1ef89c5f.tar.gz
cryptography-971b98d40ed1cb6b6eecba7a83c0ff4a1ef89c5f.tar.bz2
cryptography-971b98d40ed1cb6b6eecba7a83c0ff4a1ef89c5f.zip
Merge branch 'master' into verify-interfaces
Conflicts: tests/hazmat/primitives/test_hmac.py
Diffstat (limited to 'docs/security.rst')
-rw-r--r--docs/security.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/security.rst b/docs/security.rst
index 3bb10fa4..50253457 100644
--- a/docs/security.rst
+++ b/docs/security.rst
@@ -12,10 +12,10 @@ We ask that you do not report security issues to our normal GitHub issue
tracker.
If you believe you've identified a security issue with ``cryptography``, please
-report it to ``alex.gaynor@gmail.com``. Message may be optionally be encrypted
-with PGP using key fingerprint
-``E27D 4AA0 1651 72CB C5D2 AF2B 125F 5C67 DFE9 4084``
-(this public key is available from most commonly-used key servers).
+report it to ``alex.gaynor@gmail.com``. Messages may be optionally encrypted
+with PGP using key fingerprint
+``E27D 4AA0 1651 72CB C5D2 AF2B 125F 5C67 DFE9 4084`` (this public key is
+available from most commonly-used key servers).
Once you've submitted an issue via email, you should receive an acknowledgment
within 48 hours, and depending on the action to be taken, you may receive