merge 3.4 (#26066)

benjaminp · benjaminp · commit 4d927420b81a · 2016-01-09T23:56:31.000-08:00
diff --git a/Doc/library/crypto.rst b/Doc/library/crypto.rst
@@ -16,14 +16,3 @@ Here's an overview:
 
    hashlib.rst
    hmac.rst
-
-.. index::
-   pair: AES; algorithm
-   single: cryptography
-   single: Kuchling, Andrew
-
-Hardcore cypherpunks will probably find the cryptographic modules written by
-A.M. Kuchling of further interest; the package contains modules for various
-encryption algorithms, most notably AES.  These modules are not distributed with
-Python but available separately.  See the URL http://www.pycrypto.org/ for more
-information.
