From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 7 Jul 2016 06:58:16 +0000 (-0700)
Subject: merge 3.5 (#24557)
X-Git-Tag: v3.6.0a3~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=50600a78cb6b0e4ea47033a2fd5e982c20a5d946;p=python

merge 3.5 (#24557)
---

50600a78cb6b0e4ea47033a2fd5e982c20a5d946
diff --cc Modules/clinic/_ssl.c.h
index 2bf46b5c1b,9cbcc28955..1d9f91d58d
--- a/Modules/clinic/_ssl.c.h
+++ b/Modules/clinic/_ssl.c.h
@@@ -1135,4 -1102,4 +1135,4 @@@ exit
  #ifndef _SSL_ENUM_CRLS_METHODDEF
      #define _SSL_ENUM_CRLS_METHODDEF
  #endif /* !defined(_SSL_ENUM_CRLS_METHODDEF) */
- /*[clinic end generated code: output=c6fe203099a5aa89 input=a9049054013a1b77]*/
 -/*[clinic end generated code: output=abe795f14cb63b6a input=a9049054013a1b77]*/
++/*[clinic end generated code: output=df99659ec790e573 input=a9049054013a1b77]*/