[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.3' into release-0.3.3

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