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

[nickm at torproject.org]

commit 3bb6028a8e56a527ee670dc656052c5dee04ed65
Merge: 5f08eb6e5 6d8f98646
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 19 13:07:01 2017 -0400

    Merge branch 'ticket18891'

 changes/ticket18891 |  3 +++
 doc/tor.1.txt       | 13 +++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)