commit 8fa7bcead5d8344b80ee295f3c1e0e15fd37ba87 Merge: 621e95a 2c88dd7 Author: Nick Mathewson nickm@torproject.org Date: Thu May 12 11:36:41 2011 -0400
Merge remote-tracking branch 'origin/maint-0.2.2'
doc/tor.1.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)