Merge branch 'maint-0.2.2' into release-0.2.2
commit6d1ddd78653b1b28c613798e9cf77c75c992f42e
authorRoger Dingledine <arma@torproject.org>
Wed, 19 Jan 2011 00:13:46 +0000 (18 19:13 -0500)
committerRoger Dingledine <arma@torproject.org>
Wed, 19 Jan 2011 00:13:46 +0000 (18 19:13 -0500)
tree62ad987785a1beb0bd62c6d4953d46a7e830c3c7
parent5f63f0d6312d9f0d66b736f872657fd20f10551c
parent9bb947ea149908aa14d9ba7ec67e351da6471812
Merge branch 'maint-0.2.2' into release-0.2.2