commit 833b6d30bec568660e3a9cdeacd1e8c2837f1a6a Merge: 3ee2fca badc81d Author: Nick Mathewson nickm@torproject.org Date: Fri Mar 13 09:39:04 2015 -0400

Merge remote-tracking branch 'sebastian/bug15211'

changes/bug15211 | 6 ++++++ src/common/compat_pthreads.c | 8 +++++--- src/or/control.c | 4 ++-- src/or/rendservice.c | 3 ++- 4 files changed, 15 insertions(+), 6 deletions(-)