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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.3' into release-0.3.3

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