aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-08-03 09:07:28 -0400
committerNick Mathewson <nickm@torproject.org>2017-08-03 09:09:08 -0400
commit3e68db02c45ea06c3f20854df1f76894424d4357 (patch)
treed48726d92b4a031c7bc810cb5da53f7a2d90cb02 /src/or
parent1280de42a41ccf7ae398cc86529c880455e9c5d1 (diff)
downloadtor-3e68db02c45ea06c3f20854df1f76894424d4357.tar.gz
tor-3e68db02c45ea06c3f20854df1f76894424d4357.zip
In ntmain, call set_main_thread() before running the loop.
Patch from Vort; fixes bug 23081; bugfix on fd992deeea76972 in 0.2.1.16-rc when set_main_thread() was introduced. See the changes file for a list of all the symptoms this bug has been causing when running Tor as a Windows Service.
Diffstat (limited to 'src/or')
-rw-r--r--src/or/ntmain.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/ntmain.c b/src/or/ntmain.c
index e848314043..ddbe7a3e44 100644
--- a/src/or/ntmain.c
+++ b/src/or/ntmain.c
@@ -281,6 +281,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();
}