mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
Merge remote-tracking branch 'public/bug21356_029'
This commit is contained in:
@@ -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.
|
||||
+1
-2
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user