nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5

Browse Source
This commit is contained in:
Alexander Færøy 2020-06-30 13:35:13 +00:00
commit bebdd2888f
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug32884 Normal file
View File

@ -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.

2
src/lib/thread/compat_pthreads.c
View File

@ -265,6 +265,6 @@ tor_threads_init(void)
pthread_attr_setdetachstate(&attr_detached, PTHREAD_CREATE_DETACHED); pthread_attr_setdetachstate(&attr_detached, PTHREAD_CREATE_DETACHED);
tor_assert(ret2 == 0); tor_assert(ret2 == 0);
threads_initialized = 1; threads_initialized = 1;
}
set_main_thread(); set_main_thread();
} }
}