[tor-commits] [tor/master] Merge remote-tracking branch 'public/ticket19704'

[nickm at torproject.org]

commit 94a88eaa45adfb05359ceed99aea572f9b123974
Merge: 3c9ff0af9 de6f121b5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 18 15:02:16 2017 -0400

    Merge remote-tracking branch 'public/ticket19704'

 changes/ticket19704 | 5 +++++
 doc/tor.1.txt       | 6 ++++--
 src/or/config.c     | 4 ++++
 3 files changed, 13 insertions(+), 2 deletions(-)