commit 372262b4587d4d268d1eff56512e1691e32b92b9 Merge: 870c55b cc33ac3 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Aug 25 18:55:28 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' doc/tor.1.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)