[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug22747'

[nickm at torproject.org]

commit 76843639e58d433e8860e336eff52497d0f1ec35
Merge: b26db5ddd 40d5b573a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 28 16:12:01 2018 -0400

    Merge remote-tracking branch 'teor/bug22747'

 doc/tor.1.txt | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)