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

[nickm at torproject.org]

commit 8625f36de1085cb24e532adb0bb76d3d2b6b5808
Merge: f26d6ead2 c66b51267
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 2 08:46:28 2018 -0400

    Merge branch 'maint-0.3.3'

 changes/bug26007 |  5 +++++
 src/or/dirserv.c | 13 +++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)