summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-08-03 09:10:58 -0400
committerNick Mathewson <nickm@torproject.org>2017-08-03 09:10:58 -0400
commitb13bf65062c5918e90cb72c622ef8bdc29d53c20 (patch)
treea3f72ed0d6d83406db4e1f0c106251021ef3bf48 /src
parente220e6e4372dad90cac9138ec21ea91d4f6df7ca (diff)
parent3e68db02c45ea06c3f20854df1f76894424d4357 (diff)
downloadtor-b13bf65062c5918e90cb72c622ef8bdc29d53c20.tar.gz
tor-b13bf65062c5918e90cb72c622ef8bdc29d53c20.zip
Merge branch 'bug23081_025' into maint-0.3.1
Diffstat (limited to 'src')
-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 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();
}