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

[nickm at torproject.org]

commit b9ecb522fce8f54cc03548f6dc9572f3de9d9259
Merge: fca590a63 c4cb969a2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 11 16:23:24 2017 -0400

    Merge branch 'ticket22281_squashed'

 changes/ticket22281 |  3 +++
 src/or/config.c     | 32 +++++++++++++++++++++++++++-----
 2 files changed, 30 insertions(+), 5 deletions(-)