[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug14554_026_v1'

[nickm at torproject.org]

commit aba90b2125725a2d870a847482e30d78a1a2582d
Merge: 097286e 2c41f12
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 30 15:29:59 2015 -0500

    Merge remote-tracking branch 'dgoulet/bug14554_026_v1'

 changes/bug14554            |    4 ++++
 src/common/compat_threads.c |   16 ++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)