[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

commit 6c1d2549df546b6d2628582c9b078753eecd16f4 Merge: b4362b99c 1868982de Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 15 02:16:23 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

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(-)