tor

commit 9068e55ce8c11c6500b44347fb9159bb5a8ef8bf
parent 729f9a286c05b990327b6fdcb367c89c72ab57aa
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 20 Nov 2017 14:25:17 -0500

Merge branch 'maint-0.3.2'

Diffstat:
A
changes/bug23783
 | 
5
+++++
M
configure.ac
 | 
2
+-

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/bug23783 b/changes/bug23783
@@ -0,0 +1,5 @@
+  o Minor bugfixes (compilation, windows):
+    - When detecting OpenSSL on Windows from our configure script, make sure
+      to try linking with the ws2_32 library. Fixes bug 23783; bugfix on
+      0.3.2.2-alpha.
+
diff --git a/configure.ac b/configure.ac
@@ -725,7 +725,7 @@ AC_ARG_WITH(ssl-dir,
   ])
 
 AC_MSG_NOTICE([Now, we'll look for OpenSSL >= 1.0.1])
-TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI],
+TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI $TOR_LIB_WS32],
     [#include <openssl/ssl.h>],
     [struct ssl_method_st; const struct ssl_method_st *TLSv1_1_method(void);],
     [TLSv1_1_method();], [],