commit 072e194a15e9aa0e75c6723763a69476f4f31b93 Merge: 30b322925 982757430 Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 30 11:48:06 2017 -0500

Merge branch 'bug21394_029' into maint-0.2.9

changes/bug21394 | 9 +++++++++ src/or/dns.c | 23 ++++++++++++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-)