tor

commit b0bfee8c783b495ece772189d478dad2628bc159
parent d235e523d5283591c0d44c934f1e04eafe09b19a
Author: Alexander Færøy <ahf@torproject.org>
Date:   Tue, 30 Jun 2020 13:37:20 +0000

Merge branch 'maint-0.3.5' into maint-0.4.2

Diffstat:
A
changes/bug32884
 | 
5
+++++
M
src/lib/thread/compat_pthreads.c
 | 
2
+-

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/bug32884 b/changes/bug32884
@@ -0,0 +1,5 @@
+  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.
diff --git a/src/lib/thread/compat_pthreads.c b/src/lib/thread/compat_pthreads.c
@@ -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();
 }