Merge branch 'maint-0.2.1'
commit09be26dc515331dcfccb92d2be59d9830f60f00e
authorRoger Dingledine <arma@torproject.org>
Sat, 24 Apr 2010 00:44:31 +0000 (23 20:44 -0400)
committerRoger Dingledine <arma@torproject.org>
Sat, 24 Apr 2010 00:44:31 +0000 (23 20:44 -0400)
tree07eb7b14c8b0cf47a2d4511bc84eaac5e53d026b
parente7bd97493c3193b06cd552342fad12035db72523
parent95bc91cfc3c871d281761c3c255bb82da11c3c8d
Merge branch 'maint-0.2.1'