]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.2' into release-0.2.2 tor-0.2.2.29-beta
authorRoger Dingledine <arma@torproject.org>
Tue, 21 Jun 2011 03:50:29 +0000 (23:50 -0400)
committerRoger Dingledine <arma@torproject.org>
Tue, 21 Jun 2011 03:50:29 +0000 (23:50 -0400)
commit2ea53fc0478aaf91c2dd11d520e02da9b2bebd94
treec0bb180bd95de727ae81157de59f141b04399845
parent16e8951c7d523014ccc2ef4d812ea6f8e9eec120
parent1040ccafb20d5d32cdf0945226f570dcbaf96e90
Merge branch 'maint-0.2.2' into release-0.2.2