From 52980ebd0a4eb75acf055a2256e095772c1fa7c6 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:35 -0700
Subject: Imported Upstream version 1.7.1

---
 CONTRIBUTORS.txt | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'CONTRIBUTORS.txt')

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 19f59ce..e1aca42 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -60,5 +60,35 @@ In chronological order:
 * Marc Schlaich <marc.schlaich@gmail.com>
   * Various bugfixes and test improvements.
 
+* Bryce Boe <bbzbryce@gmail.com>
+  * Correct six.moves conflict
+  * Fixed pickle support of some exceptions
+
+* Boris Figovsky <boris.figovsky@ravellosystems.com>
+  * Allowed to skip SSL hostname verification
+
+* Cory Benfield <http://lukasa.co.uk/about/>
+  * Stream method for Response objects.
+  * Return native strings in header values.
+  * Generate 'Host' header when using proxies.
+
+* Jason Robinson <jaywink@basshero.org>
+  * Add missing WrappedSocket.fileno method in PyOpenSSL
+
+* Audrius Butkevicius <audrius.butkevicius@elastichosts.com>
+  * Fixed a race condition
+
+* Stanislav Vitkovskiy <stas.vitkovsky@gmail.com>
+  * Added HTTPS (CONNECT) proxy support
+
+* Stephen Holsapple <sholsapp@gmail.com>
+  * Added abstraction for granular control of request fields
+
+* Martin von Gagern <Martin.vGagern@gmx.net>
+  * Support for non-ASCII header parameters
+
+* Kevin Burke <kev@inburke.com> and Pavel Kirichenko <juanych@yandex-team.ru>
+  * Support for separate connect and request timeouts
+
 * [Your name or handle] <[email or website]>
   * [Brief summary of your changes]
-- 
cgit v1.2.3