commit b062730a11a78f9cb11e4b0af20a66997280c0f9 Merge: 021c3bd58 17a923941 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 13 08:50:59 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket25170 | 5 +++++ src/or/dirserv.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)