diff --git a/CHANGES.rst b/CHANGES.rst index 683001c0e6..3d19f8ec13 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -6,11 +6,13 @@ dev (master) * Skip DNS names that can't be idna-decoded when using pyOpenSSL (Issue #1405). -* ... [Short description of non-trivial change.] (Issue #) - * Add a server_hostname parameter to HTTPSConnection which allows for overriding the SNI hostname sent in the handshake. (Pull #1397) +* Drop support for EOL Python 2.6 (Pull #1429 and Pull #1430) + +* ... [Short description of non-trivial change.] (Issue #) + 1.23 (2018-06-05) ----------------- diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index c2cb21bed2..733e8fbd83 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -30,7 +30,7 @@ In chronological order: * kennethreitz * Bugfixes, suggestions, Requests integration -* georgemarshall +* georgemarshall * Bugfixes, Improvements and Test coverage * Thomas Kluyver @@ -67,7 +67,7 @@ In chronological order: * Boris Figovsky * Allowed to skip SSL hostname verification -* Cory Benfield +* Cory Benfield * Stream method for Response objects. * Return native strings in header values. * Generate 'Host' header when using proxies. @@ -96,7 +96,7 @@ In chronological order: * Nipunn Koorapati * Ignore default ports when comparing hosts for equality -* Danilo @dbrgn +* Danilo @dbrgn * Disabled TLS compression by default on Python 3.2+ * Disabled TLS compression in pyopenssl contrib module * Configurable cipher suites in pyopenssl contrib module @@ -114,7 +114,7 @@ In chronological order: * Tahia Khan * Added Timeout examples in docs -* Arthur Grunseid +* Arthur Grunseid * source_address support and tests (with https://github.com/bui) * Ian Cordasco @@ -259,8 +259,11 @@ In chronological order: * Improve contribution guide * Add ``HTTPResponse.geturl`` method to provide ``urllib2.urlopen().geturl()`` behavior -* Bruce Merry +* Bruce Merry * Fix leaking exceptions when system calls are interrupted with zero timeout +* Hugo van Kemenade + * Drop support for EOL Python 2.6 + * [Your name or handle] <[email or website]> * [Brief summary of your changes]