]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.2'
authorRoger Dingledine <arma@torproject.org>
Thu, 8 Dec 2011 09:40:30 +0000 (04:40 -0500)
committerRoger Dingledine <arma@torproject.org>
Thu, 8 Dec 2011 09:40:30 +0000 (04:40 -0500)
commit630337e7626d19f33eba6436dbd0aae1fee94f1e
tree9192e9dd38820713b425c84a0154f1c1e9da72b5
parent06b10ccdc4cae7881436841a87e3e5677ecc7962
parent0582746e0d25ef07e925521f9e6eb272725f64ee
Merge branch 'maint-0.2.2'