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

[nickm at torproject.org]

commit 0696ac5b5e5d5d63c0fbc493f6e96276c7aaa837
Merge: 92a6c57 3c08b76
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 30 09:25:51 2015 -0400

    Merge branch 'doc17392'

 changes/doc17392 |    4 ++++
 doc/tor.1.txt    |   24 +++++++++++++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)