[tor-commits] [tor/maint-0.2.2] Merge remote branch 'rransom/typo-fix-2011-03-03-01' into maint-0.2.2

[nickm at torproject.org]

commit 1d6af67ab8d96c30e022f1f7602276f10c8444dc
Merge: 6b74081 88e0de9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 3 13:50:17 2011 -0500

    Merge remote branch 'rransom/typo-fix-2011-03-03-01' into maint-0.2.2

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