[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2

[ahf at torproject.org]

commit b0bfee8c783b495ece772189d478dad2628bc159
Merge: d235e523d bebdd2888
Author: Alexander Færøy <ahf at torproject.org>
Date:   Tue Jun 30 13:37:20 2020 +0000

    Merge branch 'maint-0.3.5' into maint-0.4.2

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