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

[nickm at torproject.org]

commit 583ef6042cc57b65c93417afb45d678e9ea0f66e
Merge: d0dadf4d1 33e4e30d0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 24 12:32:10 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/27286    | 4 ++++
 src/or/dirserv.c | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)