commit 4f473fadbd15ededac11feb76c064e49687c3d2b Merge: 2e9e91ebb e35eb9baa Author: Nick Mathewson <nickm@torproject.org> Date: Thu Mar 29 14:58:58 2018 -0400 Merge branch 'bug25617_029' into maint-0.3.3 changes/bug25617 | 5 +++++ src/or/dnsserv.c | 1 + 2 files changed, 6 insertions(+)