commit d29e4c05973d9e371e800a8b0ed5f28fb8f1dc22 Merge: f7f55acae 68dea082e Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 23 08:46:29 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

changes/bug22349 | 9 +++++++++ src/or/dirserv.c | 56 ++++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 53 insertions(+), 12 deletions(-)