Merge branch 'maint-0.2.2' into release-0.2.2
commit16c7b05ac6238697128306b5b72cdc3155d51b4e
authorRoger Dingledine <arma@torproject.org>
Wed, 18 May 2011 01:15:33 +0000 (17 21:15 -0400)
committerRoger Dingledine <arma@torproject.org>
Wed, 18 May 2011 01:15:33 +0000 (17 21:15 -0400)
treeb299814e172c1317b71973b120457df97c37702d
parent5540434fc13193879a5654e98882761432585d6a
parent073fed06c458fac428b2377b4828412acb7d3802
Merge branch 'maint-0.2.2' into release-0.2.2