From e6838673bda9af1e9bf7c4f71b25cf3e3dfc1253 Mon Sep 17 00:00:00 2001
From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
Date: Thu, 8 Oct 2015 13:19:43 -0700
Subject: Imported Upstream version 1.11

---
 CONTRIBUTORS.txt | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

(limited to 'CONTRIBUTORS.txt')

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 5807307..b8a0f01 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -1,4 +1,4 @@
-# Contributions to the urllib3 project
+# Contributions to the urllib3 project
 
 ## Creator & Maintainer
 
@@ -148,6 +148,27 @@ In chronological order:
 * tlynn <https://github.com/tlynn>
   * Respect the warning preferences at import.
 
+* David D. Riddle <ddriddle@illinois.edu>
+  * IPv6 bugfixes in testsuite
+
+* Jon Wayne Parrott <jonwayne@google.com>
+  * App Engine environment tests.
+  
+* John Krauss <https://github.com/talos>
+  * Clues to debugging problems with `cryptography` dependency in docs
+
+* Disassem <https://github.com/Disassem>
+  * Fix pool-default headers not applying for url-encoded requests like GET.
+
+* James Atherfold <jlatherfold@hotmail.com>
+  * Bugfixes relating to cleanup of connections during errors.
+
+* Christian Pedersen <https://github.com/chripede>
+  * IPv6 HTTPS proxy bugfix
+
+* Jordan Moldow <https://github.com/jmoldow>
+  * Fix low-level exceptions leaking from ``HTTPResponse.stream()``.
+
 * [Your name or handle] <[email or website]>
   * [Brief summary of your changes]
 
-- 
cgit v1.2.3