commit 0cc4152b05ae7b5a77721c36409c1229ea2f85d4 Merge: 00dc2f7ee 6c1d2549d Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 15 02:18:54 2018 -0400

Merge branch 'maint-0.3.4' into release-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(-)