From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 22 Jul 2015 04:28:28 +0000 (-0500)
Subject: Issue #24603: Merge with 3.5
X-Git-Tag: v3.6.0a1~1938
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bdaaf49ceac963547356723c559aedefcdacc6c3;p=python

Issue #24603: Merge with 3.5
---

bdaaf49ceac963547356723c559aedefcdacc6c3
diff --cc Misc/NEWS
index bd2e07e534,f69138eda0..41e7f76d0f
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -67,6 -48,12 +67,11 @@@ Librar
  - Issue #24669: Fix inspect.getsource() for 'async def' functions.
    Patch by Kai Groner.
  
+ Build
+ -----
+ 
+ - Issue #24603: Update the Windows build to use OpenSSL 1.0.2d.
+ 
 -
  What's New in Python 3.5.0 beta 3?
  ==================================