[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1

[nickm at torproject.org]

commit 500f04a74e22686f7659adecea02569b3459c71b
Merge: 703ab95e9 766d0a2d9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 30 11:48:12 2017 -0500

    Merge branch 'maint-0.3.0' into maint-0.3.1

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