[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug16741_026'

[nickm at torproject.org]

commit f724b2e5aaded4bc471b72f39eb990cc4114cb90
Merge: 5fe18bc 720a9cc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 17 14:40:27 2015 -0400

    Merge remote-tracking branch 'public/bug16741_026'

 changes/bug16741            |    3 +++
 src/common/compat.h         |    3 +++
 src/common/compat_threads.c |   21 ++++++++++++++++-----
 src/common/workqueue.c      |    3 ++-
 4 files changed, 24 insertions(+), 6 deletions(-)