diff options
| author | Alexander Færøy <ahf@torproject.org> | 2020-06-30 13:37:20 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2020-06-30 13:37:20 +0000 |
| commit | b0bfee8c783b495ece772189d478dad2628bc159 (patch) | |
| tree | 59f229234ba0ffeb128cf56d19deb95a4fecbf3d | |
| parent | d235e523d5283591c0d44c934f1e04eafe09b19a (diff) | |
| parent | bebdd2888fd43510ff7786c6c8f52cd8a5565742 (diff) | |
| download | tor-b0bfee8c783b495ece772189d478dad2628bc159.tar.gz tor-b0bfee8c783b495ece772189d478dad2628bc159.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.2
| -rw-r--r-- | changes/bug32884 | 5 | ||||
| -rw-r--r-- | src/lib/thread/compat_pthreads.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug32884 b/changes/bug32884 new file mode 100644 index 0000000000..9ab1d24464 --- /dev/null +++ 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 index 05efe9cfd0..6f7ecd17da 100644 --- 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(); } |