commit a770e1cc22e416b84dcc4e8c81fcec5483d2d00c Merge: 3fa9c9b 57ffef3 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 18 14:30:28 2013 -0400

Merge remote-tracking branch 'origin/maint-0.2.4'

changes/bug6206 | 6 +++++ src/common/compat.c | 54 ++++++++++++++++++++++++++++++++++++++++++-------- src/common/compat.h | 2 +- src/ext/eventdns.c | 7 +++++- src/or/connection.c | 23 +++++++++++++++++---- src/or/cpuworker.c | 7 ++++- 6 files changed, 81 insertions(+), 18 deletions(-)