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

[nickm at torproject.org]

commit c91c4e9bb69113feee91f0056ca9aea7adc538fd
Merge: f15e1e65c 3d1266324
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 22 08:35:41 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug25415 | 4 ++++
 src/or/dirserv.c | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)