Merge branch 'maint-0.2.2'
commit6d5478a8a7734553fc84574e725625610f46dc8c
authorRoger Dingledine <arma@torproject.org>
Wed, 11 May 2011 03:06:12 +0000 (10 23:06 -0400)
committerRoger Dingledine <arma@torproject.org>
Wed, 11 May 2011 03:06:12 +0000 (10 23:06 -0400)
tree71aa07ef5d6950cf8eb696e57c1dc40eda811133
parente6980faec43504ac32ddd96d9c2bddcccca3a21b
parent7206d784dc3def970d5bd8618242f7b9c9c71e37
Merge branch 'maint-0.2.2'