Merge branch 'maint-0.2.1' into maint-0.2.2
commita62038f01db0df22f864623e6d82d69b447c1414
authorRoger Dingledine <arma@torproject.org>
Fri, 17 Dec 2010 00:23:21 +0000 (16 19:23 -0500)
committerRoger Dingledine <arma@torproject.org>
Fri, 17 Dec 2010 00:23:21 +0000 (16 19:23 -0500)
treea181abeac131aaad4b3456fe9b95dab314778584
parent53c14507eb2bbe08c311d93ee2fab8e1b4165cbc
parentef5b3680c6c4f630b670681f73967f4535b786e1
Merge branch 'maint-0.2.1' into maint-0.2.2