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

commit ee3d83dbf7ace00080bfa9c77e0fd236f67d1fa8 Merge: 44019d73f d29e4c059 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug22349 | 9 +++++++++ src/or/dirserv.c | 56 ++++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 53 insertions(+), 12 deletions(-)