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

This commit is contained in:
Nick Mathewson 2018-09-11 14:05:16 -04:00
commit 7852499812
2 changed files with 9 additions and 0 deletions

4
changes/ticket8415 Normal file
View file

@ -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.

View file

@ -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));