From 92b84b67f7b187b81dacbf1ae46d59a1d0b5b125 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:33 -0700
Subject: Imported Upstream version 1.6

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

(limited to 'CONTRIBUTORS.txt')

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 7dfbcaf..19f59ce 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -45,5 +45,20 @@ In chronological order:
 * Shivaram Lingamneni <slingamn@cs.stanford.edu>
   * Support for explicitly closing pooled connections
 
+* hartator <hartator@gmail.com>
+  * Corrected multipart behavior for params
+
+* Thomas Weißschuh <thomas@t-8ch.de>
+  * Support for TLS SNI
+  * API unification of ssl_version/cert_reqs
+  * SSL fingerprint and alternative hostname verification
+  * Bugfixes in testsuite
+
+* Sune Kirkeby <mig@ibofobi.dk>
+  * Optional SNI-support for Python 2 via PyOpenSSL.
+
+* Marc Schlaich <marc.schlaich@gmail.com>
+  * Various bugfixes and test improvements.
+
 * [Your name or handle] <[email or website]>
   * [Brief summary of your changes]
-- 
cgit v1.2.3