[tor-commits] [tor/master] Merge remote-tracking branch 'catalyst-oniongit/bug23611'

[nickm at torproject.org]

commit e1d8a4bd720dd9941b467edb42ca64624743f51d
Merge: c92ecac8b 87faed921
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 21 14:42:03 2017 -0400

    Merge remote-tracking branch 'catalyst-oniongit/bug23611'

 changes/bug23611 | 4 ++++
 doc/tor.1.txt    | 9 ++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)