From: Ned Deily <nad@acm.org>
Date: Fri, 24 Jul 2015 23:25:30 +0000 (-0700)
Subject: Issue #24603: merge from 3.5
X-Git-Tag: v3.6.0a1~1914
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=401e52e80374783cc5d04ccee8071b540340c46b;p=python

Issue #24603: merge from 3.5
---

401e52e80374783cc5d04ccee8071b540340c46b
diff --cc Misc/NEWS
index 89eb7fc120,d8922be945..481188d628
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -96,8 -70,10 +96,9 @@@ Librar
  Build
  -----
  
- - Issue #24603: Update the Windows build to use OpenSSL 1.0.2d.
+ - Issue #24603: Update Windows builds and OS X 10.5 installer to use OpenSSL
+   1.0.2d.
  
 -
  What's New in Python 3.5.0 beta 3?
  ==================================