Merge branch '1.10' into 1.11

This commit is contained in:
Jeff Forcier 2014-03-04 16:16:33 -08:00
commit d5ed558c21
1 changed files with 3 additions and 3 deletions

View File

@ -2,9 +2,9 @@
Changelog Changelog
========= =========
* :support:`256` Convert API documentation to Sphinx, yielding a new API * :support:`256 backported` Convert API documentation to Sphinx, yielding a new
docs website to replace the old Epydoc one. Thanks to Olle Lundberg for the API docs website to replace the old Epydoc one. Thanks to Olle Lundberg for
initial conversion work. the initial conversion work.
* :bug:`-` Use constant-time hash comparison operations where possible, to * :bug:`-` Use constant-time hash comparison operations where possible, to
protect against `timing-based attacks protect against `timing-based attacks
<http://codahale.com/a-lesson-in-timing-attacks/>`_. Thanks to Alex Gaynor <http://codahale.com/a-lesson-in-timing-attacks/>`_. Thanks to Alex Gaynor