]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge commit 'arma/dotexit'
authorNick Mathewson <nickm@torproject.org>
Mon, 10 Aug 2009 01:48:08 +0000 (18:48 -0700)
committerNick Mathewson <nickm@torproject.org>
Mon, 10 Aug 2009 01:48:08 +0000 (18:48 -0700)
1  2 
doc/tor.1.in

diff --cc doc/tor.1.in
Simple merge