commit a25c0a5bf81768c4d4f6fe377cea48f47333a8c8 Merge: e70e836 e470f6a Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jun 14 13:46:10 2011 -0400 Merge remote-tracking branch 'public/bug3369' into maint-0.2.2 changes/bug3369 | 4 ++++ src/or/dnsserv.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)