]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.2' into release-0.2.2
authorRoger Dingledine <arma@torproject.org>
Tue, 5 Jun 2012 22:38:32 +0000 (18:38 -0400)
committerRoger Dingledine <arma@torproject.org>
Tue, 5 Jun 2012 22:38:32 +0000 (18:38 -0400)
commit4f62f420feb5e5d29ca9db4ea0e486b11023844f
tree776ffa525ce6db3f6830fc3f1657a940b552aab1
parentc1414cf70cbfcbb7ad053370f299e7159a85ffc3
parent491dc3a601d7c2610503f73192bd1a40bcb37ab2
Merge branch 'maint-0.2.2' into release-0.2.2