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

[nickm at torproject.org]

commit 33e4e30d0a0aa8717ca67cb82581e536b402f30b
Merge: e01ea64f0 98e1a1d10
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 24 12:32:10 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

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