Merge branch 'maint-0.2.2' into release-0.2.2
commitd4f10b83431cecab0c9479c9fa9fa45d71804e71
authorRoger Dingledine <arma@torproject.org>
Sat, 15 Jan 2011 22:31:19 +0000 (15 17:31 -0500)
committerRoger Dingledine <arma@torproject.org>
Sat, 15 Jan 2011 22:31:19 +0000 (15 17:31 -0500)
treeb263b5383425037b7fb76f6a0e4a129890da3906
parent9bbe4de5e3046f2f047d15d88387204b7b055e51
parenta7790d48af73760a2ae10fcff70b319914316b90
Merge branch 'maint-0.2.2' into release-0.2.2
configure.in