diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-06-06 13:27:37 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-06-06 13:27:37 -0700 |
| commit | 48a83d3787b101ad3ad93ad89a81cba9834e6df7 (patch) | |
| tree | 6bf672a42ea4deedffc197a6bfca630076c34bb0 /sites/www | |
| parent | 772e405a2172fa90997fea9fdf2d9eb78a2f3fb7 (diff) | |
| parent | d6e57d34bafb65c6ce62a022d1b509f35cf82d49 (diff) | |
Merge branch '2.0' into 2.1
Diffstat (limited to 'sites/www')
| -rw-r--r-- | sites/www/changelog.rst | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index da9d6d05..11c5f2aa 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,10 +2,9 @@ Changelog ========= -* :bug:`-` (partial application of :issue:`983`) Move ``sha1`` above the - now-arguably-broken ``md5`` in the list of preferred MAC algorithms, as an - incremental security improvement for users whose target systems offer both. - Credit: Pierce Lopez. +* :bug:`983` Move ``sha1`` above the now-arguably-broken ``md5`` in the list of + preferred MAC algorithms, as an incremental security improvement for users + whose target systems offer both. Credit: Pierce Lopez. * :bug:`667` The RC4/arcfour family of ciphers has been broken since version 2.0; but since the algorithm is now known to be completely insecure, we are opting to remove support outright instead of fixing it. Thanks to Alex Gaynor |