commit eee942c5bed2d93cd4413c8c2fb13539d5816b69 Merge: ab8c0d4 1a016c9 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jul 6 10:56:47 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' doc/tor.1.txt | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)