merge with 3.2

This commit is contained in:
Georg Brandl 2012-02-21 22:37:36 +01:00
commit 42ae472798
2 changed files with 2 additions and 2 deletions

View file

@ -236,7 +236,7 @@ Miscellaneous options
This is intended to provide protection against a denial-of-service caused by
carefully-chosen inputs that exploit the worst case performance of a dict
insertion, O(n^2) complexity. See
construction, O(n^2) complexity. See
http://www.ocert.org/advisories/ocert-2011-003.html for details.
Changing hash values affects the order in which keys are retrieved from a