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

[nickm at torproject.org]

commit eebfe4f5398c94292986c3eab7fc995635c66a21
Merge: 1b1eeb0fb 6fea44c67
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 8 08:11:11 2017 -0400

    Merge branch 'ticket22731'

 changes/bug22731 |  5 +++++
 src/or/config.c  | 52 ++++++++++++++++++++++++++++++++--------------------
 2 files changed, 37 insertions(+), 20 deletions(-)