summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlexander Færøy <ahf@torproject.org>2020-06-30 13:37:20 +0000
committerAlexander Færøy <ahf@torproject.org>2020-06-30 13:37:20 +0000
commitb0bfee8c783b495ece772189d478dad2628bc159 (patch)
tree59f229234ba0ffeb128cf56d19deb95a4fecbf3d /src
parentd235e523d5283591c0d44c934f1e04eafe09b19a (diff)
parentbebdd2888fd43510ff7786c6c8f52cd8a5565742 (diff)
downloadtor-b0bfee8c783b495ece772189d478dad2628bc159.tar.gz
tor-b0bfee8c783b495ece772189d478dad2628bc159.zip
Merge branch 'maint-0.3.5' into maint-0.4.2
Diffstat (limited to 'src')
-rw-r--r--src/lib/thread/compat_pthreads.c2
1 files changed, 1 insertions, 1 deletions
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();
}