commit 3bf1d81a1db38f6cbc04fd4b817dd5285ae0d4fe Merge: 4b6ba0967 68dea082e Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 23 08:46:29 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

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