diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-10-23 08:47:58 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-10-23 08:47:58 -0400 |
| commit | 78b827467903905584156ee733b92a62c70b757e (patch) | |
| tree | 2d98c862ab401a521e94af3c094b9fb7aa6271a3 | |
| parent | ee3d83dbf7ace00080bfa9c77e0fd236f67d1fa8 (diff) | |
| parent | 35574d4a9ad1ce0fb40d3c06493276a71990ac48 (diff) | |
| download | tor-78b827467903905584156ee733b92a62c70b757e.tar.gz tor-78b827467903905584156ee733b92a62c70b757e.zip | |
Merge branch 'maint-0.3.0' into release-0.3.0
| -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 4c65805b32..0e6f296d24 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(); } |