commit 3894efc7601c17718a1ea2d228c0d841472104d8 Merge: eb94200 63b6757 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 18 14:29:12 2013 -0400 Merge branch 'bug8206_squashed' into maint-0.2.4 changes/bug6206 | 6 +++++ src/common/compat.c | 54 ++++++++++++++++++++++++++++++++++++++++++-------- src/common/compat.h | 2 +- src/ext/eventdns.c | 8 ++++++- src/or/connection.c | 23 +++++++++++++++++---- src/or/cpuworker.c | 7 ++++- 6 files changed, 82 insertions(+), 18 deletions(-)