commit 2bcb596dcf3dd5972de3875da3f1d9485115ce38 Merge: 8e61d38 9052874 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 24 13:23:44 2015 -0500 Merge remote-tracking branch 'public/bug14129_024' into maint-0.2.4 changes/bug14129 | 7 +++++++ src/or/dns.c | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-)