Commit b0bfee8c authored by Alexander Hansen Færøy's avatar Alexander Hansen Færøy 💬
Browse files

Merge branch 'maint-0.3.5' into maint-0.4.2

parents d235e523 bebdd288

changes/bug32884

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (embedded Tor):

    - When starting Tor any time after the first time in a process, register

      the thread in which it is running as the main thread.  Previously, we

      only did this on Windows, which could lead to bugs like 23081 on

      non-Windows platforms.  Fixes bug 32884; bugfix on 0.3.3.1-alpha.

src/lib/thread/compat_pthreads.c

+1 −1
Original line number Diff line number Diff line
@@ -265,6 +265,6 @@ tor_threads_init(void) 
      pthread_attr_setdetachstate(&attr_detached, PTHREAD_CREATE_DETACHED);

    tor_assert(ret2 == 0);

    threads_initialized = 1;

    set_main_thread();

  }

  set_main_thread();

}