Merge branch 'maint-0.2.2'
commit96da10aace8aa9486872a21986a191b07821a506
authorRoger Dingledine <arma@torproject.org>
Sun, 5 Jun 2011 15:14:28 +0000 (5 11:14 -0400)
committerRoger Dingledine <arma@torproject.org>
Sun, 5 Jun 2011 15:14:28 +0000 (5 11:14 -0400)
tree7e2ed92c2899397a6dab462427533580a5cb182e
parentbc607bee3fc5ae8de0e08d99eaa69180e3184c60
parent83e3975c8bebb3f0aeb95d672e09d31797f7bd6a
Merge branch 'maint-0.2.2'