commit 14746dfba26aaac0a2b89a371e26b98e1211cb11 Merge: 7c548437c 500f04a74 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Nov 30 11:48:12 2017 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug21394 | 9 +++++++++ src/or/dns.c | 23 ++++++++++++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-)