commit a518dd66506e44c1318c44777187dc82c275329e Merge: aa3c709 ac115f1 Author: Roger Dingledine <arma@torproject.org> Date: Tue Oct 25 19:34:42 2011 -0400 Merge branch 'maint-0.2.2' changes/bug4309 | 5 +++++ doc/tor.1.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)