commit e76f626ff6aa4f7ea869996f10b073a3f951f040 Merge: ee2efc5 ac115f1 Author: Roger Dingledine arma@torproject.org Date: Tue Oct 25 19:34:20 2011 -0400

Merge branch 'maint-0.2.2' into release-0.2.2

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