Commit 26bbeb29 authored Dec 18, 2018 by Nick Mathewson

Merge branch 'bug28612_squashed' into maint-0.3.5

parents 702fd6f0 1c2abea3

changes/bug28612

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		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.

src/app/main/main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1269,7 +1269,7 @@ sandbox_init_filter(void)
		return cfg;
		}

		static int
		int
		run_tor_main_loop(void)
		{
		handle_signals();

src/app/main/main.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -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) */

src/app/main/ntmain.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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: