commit 4b14ff45fd01912aada6ff34e32821c5dd1d59c1 Merge: fb4307bf2 246765342 Author: Nick Mathewson nickm@torproject.org Date: Wed May 2 08:46:28 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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