commit 91d792388d7ad2dd67b8bf9e346a6c1a1d92a720 Merge: b31086201 bebdd2888 Author: Alexander Færøy ahf@torproject.org Date: Tue Jun 30 13:37:20 2020 +0000

Merge branch 'maint-0.3.5' into release-0.3.5

changes/bug32884 | 5 +++++ src/lib/thread/compat_pthreads.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)