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

[nickm at torproject.org]

commit c66b512671cf1711c7325db664335f1694bb3109
Merge: b116710e3 246765342
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 2 08:46:28 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

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