]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.2' into release-0.2.2
authorRoger Dingledine <arma@torproject.org>
Wed, 26 Oct 2011 21:14:56 +0000 (17:14 -0400)
committerRoger Dingledine <arma@torproject.org>
Wed, 26 Oct 2011 21:14:56 +0000 (17:14 -0400)
commitb5bc84d5eed5c8db78e5c58dcc2b4b966b8a08ca
tree5b1c19b2d73a825bef417547404c5b49df5e1c5c
parent176e122b322753090dea8c446a18aceb68afd93e
parentf85c56182f485bea483288a26fd74cefcb87653a
Merge branch 'maint-0.2.2' into release-0.2.2