From d183ec231be0e3f560f844bf2d118e2c71bda25f Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 31 Jan 2017 13:02:49 -0500 Subject: Call monotime_init() earlier. We need to call it before nt_service_parse_options(), since nt_service_parse_options() can call back into nt_service_main(), which calls do_main_loop(). Fixes bug 21356; bugfix on 0.2.9.1-alpha. --- src/or/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/or/main.c b/src/or/main.c index 66a8571901..89cfb2e2ff 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3443,6 +3443,7 @@ tor_main(int argc, char *argv[]) update_approx_time(time(NULL)); tor_threads_init(); init_logging(0); + monotime_init(); #ifdef USE_DMALLOC { /* Instruct OpenSSL to use our internal wrappers for malloc, @@ -3476,8 +3477,6 @@ tor_main(int argc, char *argv[]) #endif } - monotime_init(); - switch (get_options()->command) { case CMD_RUN_TOR: #ifdef NT_SERVICE -- cgit v1.2.3-54-g00ecf