commit 41cff47c6a9807d278fcde75c7dc04da876fb556 Merge: 617d71a 3f837d4 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 18 15:16:11 2013 -0400

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

changes/bug8203 | 4 ++++ src/or/connection_edge.c | 15 +++++++++------ src/or/control.c | 10 +++------- src/or/dnsserv.c | 10 ++++++++-- src/or/dnsserv.h | 2 +- 5 files changed, 25 insertions(+), 16 deletions(-)