[tor-commits] [tor/master] Merge branch 'bug21394_029' into maint-0.3.2

[nickm at torproject.org]

commit 9f3d9c68ab21e4856da11580c29f4895bf398a09
Merge: 7c1f33dd0 982757430
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Nov 5 14:39:37 2017 -0500

    Merge branch 'bug21394_029' into maint-0.3.2

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