diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-04-23 07:55:14 -0400 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-04-23 07:55:14 -0400 |
commit | eac11dc5453153a0cf67d6f780553c80e53c58c3 (patch) | |
tree | 4c2766d89111518881e72fe0ac78c9b0961c2d35 /sites | |
parent | ecc04e50909054c388904673f3cd6b41fe3940e6 (diff) | |
parent | a14d266ce13e1909203e59c8b84965070a0aa69f (diff) |
Merge branch 'master' into switch-to-cryptography
Diffstat (limited to 'sites')
-rw-r--r-- | sites/www/changelog.rst | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 6b30ff68..eaf3cd57 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,10 @@ Changelog ========= +* :support:`612` Identify & work around a race condition in the test for + handshake timeouts, which was causing frequent test failures for a subset of + contributors as well as Travis-CI (usually, but not always, limited to Python + 3.5). Props to Ed Kellett for assistance during some of the troubleshooting. * :support:`697` Remove whitespace in our ``setup.py``'s ``install_requires`` as it triggers occasional bugs in some versions of ``setuptools``. Thanks to Justin Lecher for catch & original patch. |