commit 0571015819317f6b52416d8023a99ee5a8f31dee Merge: 0684e6c6f 2a98fcb84 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 17 08:35:01 2017 -0500

Merge branch 'ticket24097_032' into maint-0.3.2

changes/ticket24097 | 4 ++++ src/or/dns.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-)