commit 1868982de6c538b75ab599b332fa896492608620 Merge: fde551a38 b66386865 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Aug 15 02:16:19 2018 -0400 Merge remote-tracking branch 'public/bug26779_033' into maint-0.3.3 changes/bug26779 | 4 ++++ configure.ac | 20 ++++++++++++++++++++ src/common/compat_threads.c | 5 ++--- src/common/compat_threads.h | 19 +++++++++++-------- 4 files changed, 37 insertions(+), 11 deletions(-)