commit fd28cbef4b1a1b85f8fc6d936a8916302abdf171
author Zachary Ware <zachary.ware@gmail.com> Mon Oct 10 22:11:12 2016 -0500
committer Zachary Ware <zachary.ware@gmail.com> Mon Oct 10 22:11:12 2016 -0500
tree 40c1657b88a6aa9df76135058adbdf4cdeab158f
parent d2a584b47b30f2e8189730201c4d19d51cdd0e89
parent 068534ab037236aa80d489383aded87c28553eb0

Issue #28248: Merge with 3.4

PCbuild/python.props

diff --git a/PCbuild/python.props b/PCbuild/python.props
index ee70210..1553731 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -46,7 +46,7 @@
     <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <lzmaDir>$(ExternalsDir)xz-5.0.5\</lzmaDir>
-    <opensslDir>$(ExternalsDir)openssl-1.0.2h\</opensslDir>
+    <opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir>
     <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
     <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
     <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>