tor

commit 8ff60b52889ecd40aa8311171bac619b0598da9b
parent ceeacc734da441051e8c3cfbab420b7083af89b7
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 15 Nov 2017 15:11:30 -0500

Merge branch 'maint-0.3.2'

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

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/bug24279 b/changes/bug24279
@@ -0,0 +1,5 @@
+  o Minor bugfixes (compilation, hardening):
+    - Fix a memory leak warning in one of the libevent-related
+      configuration tests that could occur when manually specifying
+      -fsanitize=address.  Fixes bug 24279; bugfix on 0.3.0.2-alpha.
+      Found and patched by Alex Xu.
diff --git a/configure.ac b/configure.ac
@@ -625,7 +625,7 @@ struct event_base *event_base_new(void);],
 #ifdef _WIN32
 {WSADATA d; WSAStartup(0x101,&d); }
 #endif
-event_base_new();
+event_base_free(event_base_new());
 ], [--with-libevent-dir], [/opt/libevent])
 
 dnl Determine the incantation needed to link libevent.