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

[nickm at torproject.org]

commit 52846f728d92b44cda1a7cab1bfa53b2450a29b9
Merge: 218b1746b ec8ee5412
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 4 08:57:24 2018 -0400

    Merge branch 'maint-0.3.3'

 changes/bug21394.2 |  7 +++++++
 src/or/dns.c       | 19 +++++++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)