]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.2' into release-0.2.2
authorRoger Dingledine <arma@torproject.org>
Thu, 2 Feb 2012 07:33:03 +0000 (02:33 -0500)
committerRoger Dingledine <arma@torproject.org>
Thu, 2 Feb 2012 07:33:03 +0000 (02:33 -0500)
commit121ae29ed952a7203f0d96a60fef2f52d5cae23e
tree8dec9aba8e2b46d0fcd7e78d85e9a7c70f09e6c0
parent6cd68895fb373cc10825368ecfa345a100da7ac4
parent688903e919a4c0b942893d7b507a851e57e4e452
Merge branch 'maint-0.2.2' into release-0.2.2