Merge branch 'maint-0.2.1' into release-0.2.1
commitba8a8ff93571006aa085a41fcb8b8d504861c416
authorRoger Dingledine <arma@torproject.org>
Thu, 16 Dec 2010 21:59:54 +0000 (16 16:59 -0500)
committerRoger Dingledine <arma@torproject.org>
Thu, 16 Dec 2010 21:59:54 +0000 (16 16:59 -0500)
tree88948ad82d2a3e02a7f1bdd2630a6e0a48d9efff
parentdf16e99718fd22f5b507b6eec9ec4262022b5116
parent975ffe439889300783e0607dd20fce550f418ff5
Merge branch 'maint-0.2.1' into release-0.2.1