]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.5'
authorRoger Dingledine <arma@torproject.org>
Fri, 25 Jul 2014 16:22:41 +0000 (12:22 -0400)
committerRoger Dingledine <arma@torproject.org>
Fri, 25 Jul 2014 16:22:41 +0000 (12:22 -0400)
commit3f39c0e63e5b5460ea52b6a217aa4cc658d7a425
treec01f0954e4562d5ea2e2cf5680e7c941d6178d4c
parentbdc2cefd4e3c6190e74337021889b90be4b6768b
parent2126feaabc3e07dc8f7ad712256de496fbcfb976
Merge branch 'maint-0.2.5'