commit 6a35e7d69abfc7394bb673a2e3c338cc4ee2c1dd Merge: 3fda19ef2 b062730a1 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 13 08:50:59 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket25170 | 5 +++++ src/or/dirserv.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)