summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorAlexander Færøy <ahf@torproject.org>2020-06-30 13:35:13 +0000
committerAlexander Færøy <ahf@torproject.org>2020-06-30 13:35:13 +0000
commitbebdd2888fd43510ff7786c6c8f52cd8a5565742 (patch)
tree1469f359549547bcf3efaee41508375b7eb44fdb /src/lib
parent0c0214bcc08e85040e8eb12f8388a45d271a6918 (diff)
parent4f6901d7cc827e5bfa98467b7a568f725ce7fa9f (diff)
downloadtor-bebdd2888fd43510ff7786c6c8f52cd8a5565742.tar.gz
tor-bebdd2888fd43510ff7786c6c8f52cd8a5565742.zip
Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5
Diffstat (limited to 'src/lib')
-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();
}