]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'check_log_mutex_uncherrypicked'
authorNick Mathewson <nickm@torproject.org>
Thu, 11 Feb 2016 18:41:31 +0000 (13:41 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 11 Feb 2016 18:41:31 +0000 (13:41 -0500)
1  2 
src/test/testing_common.c

index 9c7fca05a5a462654efb9855976a678b3ec6c609,fc4e05c4e89ebe754a1715bc9dba4c3a2af8c259..da9969d8d96aff1c544718f0038ef9a35b8f7738
@@@ -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) {