commit ef4d5d99fb53a313e94b4bf34a4d0ae2f7ba0fef Merge: b2fa807b9 1868982de Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 15 02:18:54 2018 -0400
Merge branch 'maint-0.3.3' into release-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(-)