commit b6c8a14bf35c4572fba49be9eb4aaaa78d776c4c Merge: 1bbd381 1ebdaf5 Author: Nick Mathewson nickm@torproject.org Date: Thu May 1 12:13:07 2014 -0400

Merge remote-tracking branch 'public/bug4345a_024'

changes/bug4345 | 10 ++++++++++ src/common/compat.c | 16 +++++++++++----- src/or/cpuworker.c | 7 ++++++- 3 files changed, 27 insertions(+), 6 deletions(-)