From 58c5ea426f44cef0671afa3577cc2fcfea2c759d Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Fri, 24 Aug 2018 17:09:42 +0300
Subject: [PATCH 1/2] Update CHANGES and CONTRIBUTORS

---
 CHANGES.rst      |  2 ++
 CONTRIBUTORS.txt | 13 ++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 683001c0e6..ff7ba58c77 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -11,6 +11,8 @@ dev (master)
 * 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)
+
 
 1.23 (2018-06-05)
 -----------------
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index c2cb21bed2..28acbb2c35 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -30,7 +30,7 @@ In chronological order:
 * kennethreitz <me@kennethreitz.com>
   * Bugfixes, suggestions, Requests integration
 
-* georgemarshall <http://github.com/georgemarshall>
+* georgemarshall <https://github.com/georgemarshall>
   * Bugfixes, Improvements and Test coverage
 
 * Thomas Kluyver <thomas@kluyver.me.uk>
@@ -67,7 +67,7 @@ In chronological order:
 * Boris Figovsky <boris.figovsky@ravellosystems.com>
   * Allowed to skip SSL hostname verification
 
-* Cory Benfield <http://lukasa.co.uk/about/>
+* Cory Benfield <https://lukasa.co.uk/about/>
   * 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 <nipunn1313@gmail.com>
   * Ignore default ports when comparing hosts for equality
 
-* Danilo @dbrgn <http://dbrgn.ch/>
+* Danilo @dbrgn <https://dbrgn.ch/>
   * 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 <http://tahia.tk/>
   * Added Timeout examples in docs
 
-* Arthur Grunseid <http://grunseid.com>
+* Arthur Grunseid <https://grunseid.com>
   * source_address support and tests (with https://github.com/bui)
 
 * Ian Cordasco <graffatcolmingov@gmail.com>
@@ -259,8 +259,11 @@ In chronological order:
   * Improve contribution guide
   * Add ``HTTPResponse.geturl`` method to provide ``urllib2.urlopen().geturl()`` behavior
 
-* Bruce Merry <http://www.brucemerry.org.za>
+* Bruce Merry <https://www.brucemerry.org.za>
   * Fix leaking exceptions when system calls are interrupted with zero timeout
 
+* [Hugo van Kemenade] <https://github.com/hugovk>
+  * Drop support for EOL Python 2.6
+
 * [Your name or handle] <[email or website]>
   * [Brief summary of your changes]

From 605c054d7fd8ea656a52631cad070f93aed26f52 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Fri, 24 Aug 2018 21:35:23 +0300
Subject: [PATCH 2/2] Review updates

---
 CHANGES.rst      | 6 +++---
 CONTRIBUTORS.txt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index ff7ba58c77..3d19f8ec13 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,12 +6,12 @@ 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)
+* 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 28acbb2c35..733e8fbd83 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -262,7 +262,7 @@ In chronological order:
 * Bruce Merry <https://www.brucemerry.org.za>
   * Fix leaking exceptions when system calls are interrupted with zero timeout
 
-* [Hugo van Kemenade] <https://github.com/hugovk>
+* Hugo van Kemenade <https://github.com/hugovk>
   * Drop support for EOL Python 2.6
 
 * [Your name or handle] <[email or website]>