commit c03b1b3f08b0588c9ba36b2097d372cb62cfdc22 Merge: 5606cfae4 2840580cf Author: teor teor@torproject.org Date: Thu Mar 14 06:55:57 2019 +1000

Merge remote-tracking branch 'tor-github/pr/794' into maint-0.3.4

changes/bug27073 | 4 ++++ src/test/test_threads.c | 30 +++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-)