Merge branch 'maint-0.2.2'
commit0b07b5dc989b50cb9fad82efe946f160713420cf
authorRoger Dingledine <arma@torproject.org>
Fri, 11 Mar 2011 22:40:16 +0000 (11 17:40 -0500)
committerRoger Dingledine <arma@torproject.org>
Fri, 11 Mar 2011 22:40:16 +0000 (11 17:40 -0500)
treeff7f9a98124dbd634896c57625c140773bead20d
parent4740311d182f5a635f0761b9968f6511509894c0
parent879f1718ad59682387ffc54b9d8589badb5f1e81
Merge branch 'maint-0.2.2'