commit 8f6cb933b6a8ee63f2e208ec43933ad27afa2af0 Merge: c49f660 2ac768e Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 27 13:44:55 2011 -0400

Merge branch 'bug1090-manpage-squashed' into bug1090-part1-squashed

doc/tor.1.txt | 74 ++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 58 insertions(+), 16 deletions(-)