[tor-commits] [tor/master] Merge branch 'ticket23953_033_squashed'

[nickm at torproject.org]

commit 5da0a73838a210bac3be81baa9ade1d4ee7bf343
Merge: 8b3580255 25f882a9c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 21 14:06:57 2017 -0500

    Merge branch 'ticket23953_033_squashed'

 changes/bug23953            |  3 +++
 configure.ac                |  1 +
 src/common/compat_threads.c | 19 ++++++++-----
 src/common/compat_threads.h | 66 +++++++++++++++++++++++++++++++++++++++++----
 4 files changed, 78 insertions(+), 11 deletions(-)