From 5330aa5b26214c45ed894c7ab6872c004b6e1e43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Tue, 22 Dec 2009 10:48:47 +0000 Subject: Merged revisions 77003 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77003 | martin.v.loewis | 2009-12-22 09:57:39 +0100 (Di, 22 Dez 2009) | 13 lines Merged revisions 76990-76991 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76990 | martin.v.loewis | 2009-12-21 20:27:15 +0100 (Mo, 21 Dez 2009) | 1 line Switch to OpenSSL 0.9.8l. ........ r76991 | martin.v.loewis | 2009-12-21 20:29:59 +0100 (Mo, 21 Dez 2009) | 1 line Add NEWS for OpenSSL changes. ........ ................ --- Misc/NEWS | 2 ++ PCbuild/pyproject.vsprops | 2 +- PCbuild/readme.txt | 2 +- Tools/buildbot/external-common.bat | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index ea0e242..78dd84b 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -267,6 +267,8 @@ Tests Build ----- +- Switch to OpenSSL 0.9.8l on Windows. + - Issue #6603: Change READ_TIMESTAMP macro in ceval.c so that it compiles correctly under gcc on x86-64. This fixes a reported problem with the --with-tsc build on x86-64. diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops index 59163e6..4760500 100644 --- a/PCbuild/pyproject.vsprops +++ b/PCbuild/pyproject.vsprops @@ -58,7 +58,7 @@ />