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

[nickm at torproject.org]

commit 63fc23f8260e2723182fbd8476df78559be325d3
Merge: 6069c829f ab166fe68
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 28 11:44:18 2017 -0400

    Merge branch 'ticket22348_031' into maint-0.3.1

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