commit fed8c5199a9fbc91a7476323c145c59e9e30e30c Merge: 5a164d5 a7a98e2 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Feb 11 13:41:31 2016 -0500 Merge branch 'check_log_mutex_uncherrypicked' changes/assert_event_base | 5 +++++ src/common/compat_libevent.c | 1 + src/common/log.c | 13 ++++++++++--- src/test/testing_common.c | 4 +++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --cc src/test/testing_common.c index 9c7fca0,fc4e05c..da9969d --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@@ -238,13 -241,7 +241,12 @@@ main(int c, const char **v update_approx_time(time(NULL)); options = options_new(); tor_threads_init(); + + struct tor_libevent_cfg cfg; + memset(&cfg, 0, sizeof(cfg)); + tor_libevent_initialize(&cfg); + control_initialize_event_queue(); - init_logging(1); configure_backtrace_handler(get_version()); for (i_out = i = 1; i < c; ++i) {