tor

commit 7852499812a4bbe707ff0da065a853de69be2c4d
parent 75ad1a1f2fca79dd2e48cfe1416d21a2b82b76b6
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 11 Sep 2018 14:05:16 -0400

Merge remote-tracking branch 'tor-github/pr/312'

Diffstat:
A
changes/ticket8415
 | 
4
++++
M
src/core/mainloop/main.c
 | 
5
+++++

2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/changes/ticket8415 b/changes/ticket8415
@@ -0,0 +1,4 @@
+  o Minor features (memory management):
+    - Get libevent code to use the same memory allocator that
+      Tor code is using by calling event_set_mem_functions()
+      during initialization. Resolves ticket 8415.
diff --git a/src/core/mainloop/main.c b/src/core/mainloop/main.c
@@ -4242,6 +4242,11 @@ tor_run_main(const tor_main_configuration_t *tor_cfg)
                strerror(-bt_err));
     }
   }
+
+#ifdef EVENT_SET_MEM_FUNCTIONS_IMPLEMENTED
+  event_set_mem_functions(tor_malloc_, tor_realloc_, tor_free_);
+#endif
+
   init_protocol_warning_severity_level();
 
   update_approx_time(time(NULL));