[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm at torproject.org]

commit b9b7013062265e0c38c4ccd564c3b2d95d298028
Merge: 0f4b1020a 17a923941
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 13 08:50:59 2018 -0500

    Merge branch 'maint-0.3.1' into release-0.3.1

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