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

[nickm at torproject.org]

commit 8e81d329eec224022de8f8d0318ebb60a18265f9
Merge: 3a53b0c9a c66b51267
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 2 08:46:28 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

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