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

[nickm at torproject.org]

commit 2c1afc2defe4a86ebfe2ae205f201f6e85bf9dc7
Merge: 5e8cf876e 4f473fadb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 29 14:59:01 2018 -0400

    Merge branch 'maint-0.3.3'

 changes/bug25617 | 5 +++++
 src/or/dnsserv.c | 1 +
 2 files changed, 6 insertions(+)