merge 3.5

This commit is contained in:
Benjamin Peterson 2015-09-27 01:23:40 -07:00
commit feb8b62847
1 changed files with 2 additions and 2 deletions

View File

@ -176,8 +176,8 @@ A hash object has the following methods:
compute the digests of data sharing a common initial substring.
Key Derivation Function
-----------------------
Key derivation
--------------
Key derivation and key stretching algorithms are designed for secure password
hashing. Naive algorithms such as ``sha1(password)`` are not resistant against