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

[nickm at torproject.org]

commit 4ef70ff389917f99cbee054bba78872b0b91a556
Merge: 4b56df987 057101581
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 17 08:35:04 2017 -0500

    Merge branch 'maint-0.3.2'

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