merge heads

This commit is contained in:
Łukasz Langa 2016-06-11 18:07:28 -07:00
commit 4f62d38cf8

View file

@ -104,7 +104,9 @@ Hashlib provides the following constant attributes:
.. data:: algorithms_guaranteed
A set containing the names of the hash algorithms guaranteed to be supported
by this module on all platforms.
by this module on all platforms. Note that 'md5' is in this list despite
some upstream vendors offering an odd "FIPS compliant" Python build that
excludes it.
.. versionadded:: 3.2