tor

commit 676a28599dcc3854a98c684808055db76dcd265b
parent e9dbd6dd8f365a71a3e569d26b12ed5e4a6419ce
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 13 Mar 2018 13:41:24 +0100

Merge branch 'maint-0.3.2' into maint-0.3.3

Diffstat:
A
changes/bug25474
 | 
5
+++++
M
configure.ac
 | 
3
++-

2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/changes/bug25474 b/changes/bug25474
@@ -0,0 +1,5 @@
+  o Minor bugfixes (compilation):
+    - Fix a c99 compliance issue in our configuration script that was
+      causing compilation issues when compiling Tor with certain
+      versions of xtools. Fixes bug 25474; bugfix on 0.3.2.5-alpha.
+
diff --git a/configure.ac b/configure.ac
@@ -660,7 +660,8 @@ TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent $STATIC_LIBEVENT_FLAGS $T
 #include <winsock2.h>
 #endif
 struct event_base;
-struct event_base *event_base_new(void);],
+struct event_base *event_base_new(void);
+void event_base_free(struct event_base *);],
     [
 #ifdef _WIN32
 {WSADATA d; WSAStartup(0x101,&d); }