commit ab1bc38d5ae28be7666a2b896d45aebe3ec5ce4b Merge: 7194d3d dd63a6a Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 25 09:07:02 2015 -0500

Merge remote-tracking branch 'atagar/man_page_fixes'

doc/tor.1.txt | 66 +++++++++++++++++++++++++-------------------------------- 1 file changed, 29 insertions(+), 37 deletions(-)