commit 221a0159b81707f7cfcb3ec34c21830e9ce8aca5 Merge: 5d4b501 8d0fb3a Author: Nick Mathewson nickm@torproject.org Date: Fri Jul 26 15:42:10 2013 +0200

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

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