aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/ticket213564
-rw-r--r--src/or/main.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/changes/ticket21356 b/changes/ticket21356
new file mode 100644
index 0000000000..394238ba7d
--- /dev/null
+++ b/changes/ticket21356
@@ -0,0 +1,4 @@
+ o Minor bugfixes (Windows services):
+ - Be sure to initialize the monotonic time subsystem before using it,
+ even when running as an NT service.
+ Fixes bug 21356; bugfix on 0.2.9.1-alpha.
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