diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-08-03 09:11:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-08-03 09:11:03 -0400 |
| commit | 8e451c5c7c22ed2f48d2378aecfbbc9ae851090a (patch) | |
| tree | 50ae3dee90a89f1b6bce21ec4681c9af16306c3b | |
| parent | e084fa419a77c21c810ef6c65287259e1c9bdd32 (diff) | |
| parent | b13bf65062c5918e90cb72c622ef8bdc29d53c20 (diff) | |
| download | tor-8e451c5c7c22ed2f48d2378aecfbbc9ae851090a.tar.gz tor-8e451c5c7c22ed2f48d2378aecfbbc9ae851090a.zip | |
Merge branch 'maint-0.3.1' into release-0.3.1
| -rw-r--r-- | changes/bug23081 | 8 | ||||
| -rw-r--r-- | src/or/ntmain.c | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/changes/bug23081 b/changes/bug23081 new file mode 100644 index 0000000000..76c4e30971 --- /dev/null +++ b/changes/bug23081 @@ -0,0 +1,8 @@ + o Minor bugfixes (Windows service): + - When running as a Windows service, set the ID of the main thread + correctly. Failure to do so made us fail to send log messages + to the controller in 0.2.1.16-rc, slowed down controller + event delivery in 0.2.7.3-rc and later, and crash with an assertion + failure in 0.3.1.1-alpha. Fixes bug 23081; bugfix on 0.2.1.6-alpha. + Patch and diagnosis from "Vort". + diff --git a/src/or/ntmain.c b/src/or/ntmain.c index e087bd6937..d0d5276c48 100644 --- a/src/or/ntmain.c +++ b/src/or/ntmain.c @@ -293,6 +293,7 @@ nt_service_body(int argc, char **argv) * event loop */ service_status.dwCurrentState = SERVICE_RUNNING; service_fns.SetServiceStatus_fn(hStatus, &service_status); + set_main_thread(); do_main_loop(); tor_cleanup(); } |