]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.2' into release-0.2.2
authorRoger Dingledine <arma@torproject.org>
Sat, 14 Apr 2012 00:11:04 +0000 (20:11 -0400)
committerRoger Dingledine <arma@torproject.org>
Sat, 14 Apr 2012 00:11:04 +0000 (20:11 -0400)
commit1614e00a219882c9aa32cef66a013d21ac34880c
treeca2d82138ede98463e9dd6d6c34d4f2f2b2782f9
parentaa0c10611beb4c275f41d0b43216750f7757b325
parent86c4b750da6f25a0fb5291146dd60f151ae5ad7d
Merge branch 'maint-0.2.2' into release-0.2.2