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

[nickm at torproject.org]

commit 98e1a1d106f9abe07d184bd4b0568bd50f91bf93
Merge: 36bb11a65 14be9cba4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 24 12:32:06 2018 -0400

    Merge branch 'ticket27286_032_v2' into maint-0.3.2

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