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

[nickm at torproject.org]

commit c64adaaf90683f9c60cc90d3981ebf70cc87a6a7
Merge: 3b2d6da 4451405
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 15 12:17:15 2017 -0400

    Merge branch 'bug21540_029_v2'

 changes/bug21540            |  4 +++
 src/common/compat_threads.c | 68 ++++++++++++++++++++++++++++++---------------
 src/common/workqueue.c      |  5 ++--
 3 files changed, 52 insertions(+), 25 deletions(-)