[tor-commits] [tor/master] Merge remote-tracking branch 'arthuredelstein/21873'

[nickm at torproject.org]

commit b47aecbe7647ca85e7c150180440962787910ca4
Merge: 9d34a1e 6f0edff
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 6 11:57:14 2017 -0400

    Merge remote-tracking branch 'arthuredelstein/21873'

 doc/tor.1.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)