commit c10323faae87f8e928566edc10a7be62fe7bb51b Merge: ec2bc07f4 b0bfee8c7 Author: Alexander Færøy ahf@torproject.org Date: Tue Jun 30 13:37:20 2020 +0000

Merge branch 'maint-0.4.2' into release-0.4.2

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