[tor-commits] [tor/release-0.4.2] Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5

[ahf at torproject.org]

commit bebdd2888fd43510ff7786c6c8f52cd8a5565742
Merge: 0c0214bcc 4f6901d7c
Author: Alexander Færøy <ahf at torproject.org>
Date:   Tue Jun 30 13:35:13 2020 +0000

    Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5

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