Commit fcaf3335 authored by Nick Mathewson's avatar Nick Mathewson 🐚
Browse files

Merge remote-tracking branch 'public/bug23081_025' into maint-0.2.9

parents 68dea082 3e68db02
Loading
Loading
Loading
Loading

changes/bug23081

0 → 100644
+8 −0
Original line number Diff line number Diff line
  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".
+1 −0
Original line number Diff line number Diff line
@@ -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();
}