merge heads

4f62d38c · Łukasz Langa · 34ad2ef8 · 7bfb415c · 4f62d38c
Commit 4f62d38c authored Jun 11, 2016 by Łukasz Langa
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

Doc/library/hashlib.rst Doc/library/hashlib.rst +3 -1

No files found.
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -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