commit 3bf89fb85f703f406fe7f8a1d264451475e20b07 Merge: edf721f8f 993e314c6 Author: Nick Mathewson nickm@torproject.org Date: Wed May 2 08:46:28 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

changes/bug26007 | 5 +++++ src/or/dirserv.c | 13 +++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)