diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-02-02 09:03:13 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-02-02 09:03:13 -0500 |
| commit | 6777cd0a8486a4930ec3020fdf31dc2be1c34f9b (patch) | |
| tree | ac22c4fc2d0bf8084a97834c4f713d0db153f9d0 | |
| parent | b11f00c153dc6e107642258e1efe5a6daf641925 (diff) | |
| parent | d183ec231be0e3f560f844bf2d118e2c71bda25f (diff) | |
| download | tor-6777cd0a8486a4930ec3020fdf31dc2be1c34f9b.tar.gz tor-6777cd0a8486a4930ec3020fdf31dc2be1c34f9b.zip | |
Merge remote-tracking branch 'public/bug21356_029'
| -rw-r--r-- | changes/ticket21356 | 4 | ||||
| -rw-r--r-- | src/or/main.c | 3 |
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 24b209ce8a..5549f97998 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3584,6 +3584,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, @@ -3617,8 +3618,6 @@ tor_main(int argc, char *argv[]) #endif } - monotime_init(); - switch (get_options()->command) { case CMD_RUN_TOR: #ifdef NT_SERVICE |