Skip to content
Snippets Groups Projects
Commit 26bbeb29 authored by Nick Mathewson's avatar Nick Mathewson :game_die:
Browse files

Merge branch 'bug28612_squashed' into maint-0.3.5

parents 702fd6f0 1c2abea3
No related branches found
No related tags found
No related merge requests found
o Minor bugfixes (windows services):
- Make Tor start correctly as an NT service again: previously it
was broken by refactoring. Fixes bug 28612; bugfix on 0.3.5.3-alpha.
......@@ -1269,7 +1269,7 @@ sandbox_init_filter(void)
return cfg;
}
static int
int
run_tor_main_loop(void)
{
handle_signals();
......
......@@ -26,4 +26,6 @@ void tor_free_all(int postfork);
int tor_init(int argc, char **argv);
int run_tor_main_loop(void);
#endif /* !defined(TOR_MAIN_H) */
......@@ -298,7 +298,7 @@ nt_service_body(int argc, char **argv)
service_status.dwCurrentState = SERVICE_RUNNING;
service_fns.SetServiceStatus_fn(hStatus, &service_status);
set_main_thread();
do_main_loop();
run_tor_main_loop();
tor_cleanup();
}
......@@ -326,7 +326,7 @@ nt_service_main(void)
return;
switch (get_options()->command) {
case CMD_RUN_TOR:
do_main_loop();
run_tor_main_loop();
break;
case CMD_LIST_FINGERPRINT:
case CMD_HASH_PASSWORD:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment