]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.6' into release-0.2.6 tor-0.2.6.5-rc
authorNick Mathewson <nickm@torproject.org>
Wed, 18 Mar 2015 13:10:55 +0000 (09:10 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 18 Mar 2015 13:10:55 +0000 (09:10 -0400)
commite0b77cd3194d705f9bca254f8a95e520070ca365
tree227eaa2ac7977b178a5324e1ee3eb0ceaf251096
parenteea90546f65b6629dd7fcc74df407de3fa839ced
parent77c671b7dd1b0bc61e69b97ab41af51bec669285
Merge branch 'maint-0.2.6' into release-0.2.6