[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'andrea/bug8639_v3' into maint-0.2.4

[arma at torproject.org]

commit 75b7cc1785c040b4f0deb46b89fecec5c90a9fe6
Merge: fff9386 ce147a2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 12 20:55:35 2013 -0400

    Merge remote-tracking branch 'andrea/bug8639_v3' into maint-0.2.4

 changes/bug8639  |    5 +++++
 src/or/control.c |   17 +++++++++++++++--
 src/or/dnsserv.c |   15 +++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)