commit c948db425280f6d132fe0415617e73c63607d904 Merge: c2dc94d8e 4f6901d7c Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 14 12:46:14 2020 -0500

Merge remote-tracking branch 'tor-github/pr/1636'

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