commit 8d0fb3a4347aa543d2aa27f177446888fbdae125 Merge: 1d2e802 11f1b7d Author: Nick Mathewson nickm@torproject.org Date: Fri Jul 26 15:41:35 2013 +0200

Merge branch 'bug9337' into maint-0.2.4

changes/bug9337 | 4 ++++ src/or/dns.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-)