[tor-commits] [tor/master] Merge branch 'ticket22348_031'

[nickm at torproject.org]

commit c107aae3c29bb0f62586ffef4c636ae2f47e746b
Merge: 4b4b3afb5 ab166fe68
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 28 11:43:55 2017 -0400

    Merge branch 'ticket22348_031'

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