Merge branch 'maint-0.2.1' into maint-0.2.2
commitbebd95e2c99ab3d17ebf6d1b005f483af079330a
authorRoger Dingledine <arma@torproject.org>
Sun, 16 Jan 2011 00:57:01 +0000 (15 19:57 -0500)
committerRoger Dingledine <arma@torproject.org>
Sun, 16 Jan 2011 00:57:01 +0000 (15 19:57 -0500)
tree08cdbb2ef31029f1f3cf22c0414d2b458c006df6
parenta7790d48af73760a2ae10fcff70b319914316b90
parent511049025350339629f270cde9495963e48d10d2
Merge branch 'maint-0.2.1' into maint-0.2.2