commit 5e65a746aa90f123daa54cafedc0fcb331a7ac86 Merge: dd119b277b f3b9be4422 Author: Alexander Færøy ahf@torproject.org Date: Mon Nov 9 14:12:45 2020 +0000

Merge remote-tracking branch 'tor-gitlab/mr/190'

changes/bug30187 | 5 ++ configure.ac | 8 +-- src/lib/thread/compat_winthreads.c | 124 +++++++++++-------------------------- src/lib/thread/threads.h | 7 +-- 4 files changed, 47 insertions(+), 97 deletions(-)