Merge branch 'maint-0.2.2' into release-0.2.2
commitd52b86a6c8edbbd8baa46536a88676c02960f99a
authorRoger Dingledine <arma@torproject.org>
Sun, 16 Jan 2011 00:57:54 +0000 (15 19:57 -0500)
committerRoger Dingledine <arma@torproject.org>
Sun, 16 Jan 2011 00:57:54 +0000 (15 19:57 -0500)
treed8dbb7da3f8017a14fb34a39e45d79aba556ffa3
parent54777960ceda94eb9561e25986d3453cf7e80807
parentbebd95e2c99ab3d17ebf6d1b005f483af079330a
Merge branch 'maint-0.2.2' into release-0.2.2