[Python-checkins] cpython (merge 3.4 -> 3.5): merge 3.4

[benjamin.peterson]

https://hg.python.org/cpython/rev/288fbf067df7
changeset:   98311:288fbf067df7
branch:      3.5
parent:      98303:bacb540ab6ba
parent:      98310:4741dfda7438
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Sep 27 02:05:12 2015 -0700
summary:
  merge 3.4

files:
  Doc/library/hashlib.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -227,7 +227,7 @@
    http://csrc.nist.gov/publications/fips/fips180-2/fips180-2.pdf
       The FIPS 180-2 publication on Secure Hash Algorithms.
 
-   http://en.wikipedia.org/wiki/Cryptographic_hash_function#Cryptographic_hash_algorithms
+   https://en.wikipedia.org/wiki/Cryptographic_hash_function#Cryptographic_hash_algorithms
       Wikipedia article with information on which algorithms have known issues and
       what that means regarding their use.
 

-- 
Repository URL: https://hg.python.org/cpython