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

[nickm at torproject.org]

commit 51d14b3d478a94c410a695f736445f42ccc23fb9
Merge: 1dd0be75c 63fc23f82
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 28 11:44:25 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/ticket22348 | 5 +++++
 src/or/dirserv.c    | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)