Merge branch 'bug23081_025' into maint-0.3.1

This commit is contained in:
Nick Mathewson 2017-08-03 09:10:58 -04:00
commit b13bf65062
2 changed files with 9 additions and 0 deletions

8
changes/bug23081 Normal file
View File

@ -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".

View File

@ -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();
}