commit b9826ba4518852b9fa8057ab40921f3082916a03 Merge: 066904e75 057101581 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Nov 17 08:35:04 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket24097 | 4 ++++ src/or/dns.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-)