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

[nickm at torproject.org]

commit 3df954549232bf5516ba5fce13c66a3ac91524a4
Merge: 619059325 961d2ad59
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 2 08:51:47 2018 -0400

    Merge branch 'maint-0.3.3'

 changes/bug22310 | 8 ++++++++
 src/or/dirserv.c | 1 +
 2 files changed, 9 insertions(+)