commit b1c543cf4d3d14132ea3a5c87b5fd8b9f32de6f0 Merge: 98b28e789 766d0a2d9 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Nov 30 11:48:12 2017 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug21394 | 9 +++++++++ src/or/dns.c | 23 ++++++++++++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-)