commit 47f7085de7a496b6bfa79de9e1b22ca4a28b0f27 Merge: 48578e1 ab1a679 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Apr 8 20:29:24 2014 -0400 Merge remote-tracking branch 'public/bug11437_024' into maint-0.2.4 changes/bug11437 | 3 +++ src/or/dns.c | 1 + 2 files changed, 4 insertions(+)