]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.2' into release-0.2.2
authorRoger Dingledine <arma@torproject.org>
Mon, 20 Jun 2011 01:03:44 +0000 (21:03 -0400)
committerRoger Dingledine <arma@torproject.org>
Mon, 20 Jun 2011 01:03:44 +0000 (21:03 -0400)
commit7cc2b9dc83c375bf25e8e093fd9d72e5b46e63df
tree6b8f859a0109212afe4160325a1d3f79c1443e4f
parent66f847857c5b3a8df8f47b77ff9159d8f3e2b471
parent8e5dfe42a0230722bff07ba6ededcc0d2dbd53e7
Merge branch 'maint-0.2.2' into release-0.2.2