Merge branch 'feature/tor-browser-bundle' into feature/7725-i2p-browser
commit6662b7a849925b1652c47f96506ca68cc093c0ab
authorTails developers <amnesia@boum.org>
Thu, 2 Oct 2014 22:52:43 +0000 (3 00:52 +0200)
committerTails developers <amnesia@boum.org>
Thu, 2 Oct 2014 22:52:43 +0000 (3 00:52 +0200)
tree74acd78c045cd673994e967d474623ec4fd3dfa5
parent60763d8b981e5f7e06820482d3c9a9ccfb1e9032
parent5b04e01065a85c6c35cee1439c61ffca068dbd8f
Merge branch 'feature/tor-browser-bundle' into feature/7725-i2p-browser
config/chroot_local-hooks/10-tbb
config/chroot_local-includes/etc/tor-browser/profile/preferences/0000tails.js