Merge branch 'maint-0.2.2'
commit03fea3ae91281c8146e5a577e18ef46e81eb6e49
authorRoger Dingledine <arma@torproject.org>
Wed, 26 Oct 2011 11:53:49 +0000 (26 07:53 -0400)
committerRoger Dingledine <arma@torproject.org>
Wed, 26 Oct 2011 11:53:49 +0000 (26 07:53 -0400)
treeb6dffa356ef316c571c7e3b6f30c3fdcd9cb87e2
parenta518dd66506e44c1318c44777187dc82c275329e
parent9af3a3c419fdad85933cad800a995f19bda08d28
Merge branch 'maint-0.2.2'