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