Merge branch 'always_init_base'

4 files changed, 6 insertions, 9 deletions

diff --git a/src/test/test.c b/src/test/test.c
index f12ae21ff0..d671ac896e 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -319,11 +319,7 @@ test_circuit_timeout(void *arg)
   int i, runs;
   double close_ms;
   (void)arg;
-  tor_libevent_cfg cfg;
 
-  memset(&cfg, 0, sizeof(cfg));
-
-  tor_libevent_initialize(&cfg);
   initialize_periodic_events();
 
   circuit_build_times_init(&initial);
diff --git a/src/test/test_circuitmux.c b/src/test/test_circuitmux.c
index 6d93731eea..5c72fc656d 100644
--- a/src/test/test_circuitmux.c
+++ b/src/test/test_circuitmux.c
@@ -36,11 +36,7 @@ test_cmux_destroy_cell_queue(void *arg)
   circuit_t *circ = NULL;
   cell_queue_t *cq = NULL;
   packed_cell_t *pc = NULL;
-  tor_libevent_cfg cfg;
 
-  memset(&cfg, 0, sizeof(cfg));
-
-  tor_libevent_initialize(&cfg);
   scheduler_init();
 
   (void) arg;
diff --git a/src/test/test_dns.c b/src/test/test_dns.c
index 6fdbe905e0..5289ca58ff 100644
--- a/src/test/test_dns.c
+++ b/src/test/test_dns.c
@@ -490,7 +490,7 @@ NS(test_main)(void *arg)
 
   (void)arg;
 
-  TO_CONN(exitconn)->address = tor_strdup("127.0.0.1.in-addr.arpa");
+  TO_CONN(exitconn)->address = tor_strdup("1.0.0.127.in-addr.arpa");
 
   NS_MOCK(router_my_exit_policy_is_reject_star);
 
diff --git a/src/test/testing_common.c b/src/test/testing_common.c
index e20e9e6095..9c7fca05a5 100644
--- a/src/test/testing_common.c
+++ b/src/test/testing_common.c
@@ -238,6 +238,11 @@ 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());