commit c9dd2d1a6ad2684442abb7a31e29b0998aaf605c Merge: b08cfc6 9052874 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jan 12 00:59:29 2015 -0500 Merge remote-tracking branch 'public/bug14129_024' into maint-0.2.5 changes/bug14129 | 7 +++++++ src/or/dns.c | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-)