From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 11 Feb 2016 18:41:31 +0000 (-0500)
Subject: Merge branch 'check_log_mutex_uncherrypicked'
X-Git-Tag: tor-0.2.8.2-alpha~121
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fed8c5199a9fbc91a7476323c145c59e9e30e30c;p=thirdparty%2Ftor.git

Merge branch 'check_log_mutex_uncherrypicked'
---

fed8c5199a9fbc91a7476323c145c59e9e30e30c
diff --cc src/test/testing_common.c
index 9c7fca05a5,fc4e05c4e8..da9969d8d9
--- 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) {