Merge branch 'maint-0.2.2' into release-0.2.2
commitd310597440776a9e52f32b48025309a092c0a086
authorRoger Dingledine <arma@torproject.org>
Tue, 25 Jan 2011 21:15:42 +0000 (25 16:15 -0500)
committerRoger Dingledine <arma@torproject.org>
Tue, 25 Jan 2011 21:15:42 +0000 (25 16:15 -0500)
tree0be0f94bc43211472e3635b0eaa584ec97b59e93
parent5541610133ca3694701bb0dc81a908567a18f99a
parent7a446e6754b21eae1b0cfe3b0cf737ac2be964a9
Merge branch 'maint-0.2.2' into release-0.2.2