[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

commit 6a0dc0e585cbd9d53c91fe217adf2a4d4754694e Merge: 08ced4a 47f7085 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Apr 8 20:30:30 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug11437 | 3 +++ src/or/dns.c | 1 + 2 files changed, 4 insertions(+)