commit b329cdf768e9bb67bc11eb9306b0e330d6522670 Merge: 57d0b8c3c 26f1167e7 Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 15 02:14:17 2018 -0400

Merge remote-tracking branch 'public/bug26779_035'

changes/bug26779 | 4 ++++ configure.ac | 20 ++++++++++++++++++++ src/lib/thread/compat_threads.c | 4 ++-- src/lib/thread/threads.h | 18 +++++++++++------- 4 files changed, 37 insertions(+), 9 deletions(-)