]> 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, 10 May 2012 21:57:16 +0000 (17:57 -0400)
committerRoger Dingledine <arma@torproject.org>
Thu, 10 May 2012 21:57:16 +0000 (17:57 -0400)
commit0daad3e44d609b451173d1fdbbb39f28f2d1d461
tree4a5d6e972ade3ea200fca5eba07fbc7d13d7e3fb
parentd06ea86850704084670ec864a685a5e857c3a6a6
parent436654ee9670aed5f21f571f3eae743c109a2eba
Merge branch 'maint-0.2.2' into release-0.2.2