Commit ed876c88 authored by intrigeri's avatar intrigeri
Browse files

Merge remote-tracking branch 'origin/feature/10858-tor-browser-5.5' into devel

Fix-committed: #10858
parents 3b4445b5 4823ed27
......@@ -22,7 +22,7 @@ BROWSER_LOCALIZATION_DIR="/usr/share/tails/browser-localization"
DESCRIPTIONS_FILE="${BROWSER_LOCALIZATION_DIR}/descriptions"
BRANDING_TEMPLATE_FILE="${BROWSER_LOCALIZATION_DIR}/amnesia.properties-template"
BRANDING_DIR="/usr/local/share/tor-browser-extensions/branding@amnesia.boum.org/"
NO_SPELLCHECKER_LOCALES="ko nl pl tr zh"
NO_SPELLCHECKER_LOCALES="ja ko nl pl tr zh"
apt-get --yes install imagemagick
......
......@@ -102,3 +102,9 @@ pref("browser.download.panel.shown", true);
// open external applications, so let's not offer the option to the user,
// and instead only propose them to save downloaded files.
pref("browser.download.forbid_open_with", true);
// The window resizing feature in Tor Browser 5.5a6 is a bit crazy,
// causing frequent resizing of the window at inconvenient times. In
// the automated test suite this results in misclicks because some
// targets move (due to this window resizing) suddenly.
pref("extensions.torbutton.resize_windows", false);
......@@ -5,6 +5,7 @@ en-US:US:English:english:english
fa:IR:فارسی:persian:
fr:FR:Français:francais:francais
it:IT:Italiano:italiano:italiano
ja:JP:日本語:nihongo:nihongo
ko:KR:한국어:hangul:hangul
nl:NL:Nederlands:nederlands:nederlands
pl:PL:Polski:polski:polski
......
http://torbrowser-archive.tails.boum.org/5.0.7/
http://dist.torproject.org/torbrowser/5.5a6/
a68627c27a0ba493c04850f4dec46290c3f63a5f6bca3684c52824bc59559226 tor-browser-linux32-5.0.7_ar.tar.xz
b501847d677a3036bbcde161708bc8c958c2db3e1036a10c28fc1326a132c488 tor-browser-linux32-5.0.7_de.tar.xz
99d0da3b4b9f227059009818e5f0bf7ce2c3bb85a806561ac7199101c8900190 tor-browser-linux32-5.0.7_en-US.tar.xz
592d35b1293c6a18ea27078698bf50e623d53e5e9d4889d204e8b2b981903cff tor-browser-linux32-5.0.7_es-ES.tar.xz
269917e9e9f8cc4bcc156d206ee340e2eb64462ec68f1b289ca34f44b72b7a27 tor-browser-linux32-5.0.7_fa.tar.xz
79372d38c3264463bb0d75952ef5df189ae2b1310e2b856ddb045bd0d63a0a6f tor-browser-linux32-5.0.7_fr.tar.xz
83748b3634cb7d90a068bec6b2e563cffdc5fb92dfe8dd886fcb1fc49dc78260 tor-browser-linux32-5.0.7_it.tar.xz
1d4e3fefef8820d544f96468f2e0260ae98074cebef97153b4dad500164c2fa8 tor-browser-linux32-5.0.7_ko.tar.xz
5b49fc54575e59a7e441669942cf55ebc20e554381324f44f3de14fdaabb452f tor-browser-linux32-5.0.7_nl.tar.xz
5e3df17dd576073511542997f73987278f8d6f697645a567c683c062d803474a tor-browser-linux32-5.0.7_pl.tar.xz
f7122d7eaa5073fe82a108d2eab8989e1a8d355d9cf9822ae2c3f69ed082fadc tor-browser-linux32-5.0.7_pt-PT.tar.xz
faf3a8d222b857e7103d3634c9ac3a56d11bea627d4dca56d99eb10594a68e89 tor-browser-linux32-5.0.7_ru.tar.xz
6dc076333442490d96d5f94f909600d48cc9bfb49627b401faa21f847d557c5c tor-browser-linux32-5.0.7_tr.tar.xz
20da61111d3df2bcecc3dce3b237cc891b48b26d9833418683414f5d8031d5b3 tor-browser-linux32-5.0.7_vi.tar.xz
4b9f42fbb18587a77994153e3a0e59e1f1c3395f8bd3a13468f630057df36d9d tor-browser-linux32-5.0.7_zh-CN.tar.xz
2a612c7a91de872066e7bd1d4204b66265012afc7bce5c4f856f7a77f63f8ba8 tor-browser-linux32-5.5a6_ar.tar.xz
cbb49fccf9e239fe056ed6611611d008884371ba04cdaf499b6716bd4cdf0209 tor-browser-linux32-5.5a6_de.tar.xz
2857b70baa0e352b2635884eac1db511cc5845cff7a948bbd6661695740f2891 tor-browser-linux32-5.5a6_en-US.tar.xz
3d01f8d773e1cb4b8db3f84237f40e72b416bce6fa8646cdc3d0e29a82b1139f tor-browser-linux32-5.5a6_es-ES.tar.xz
26111f86af08f3b880d9e96a85099be8e327b8064ce89be64a544750abe59ae5 tor-browser-linux32-5.5a6_fa.tar.xz
fc8e85d61eb6edc6d4d9c3f792aed63486a0ce8aa1057cc32fa922d702292e05 tor-browser-linux32-5.5a6_fr.tar.xz
9a82456217a931cecd08140bd8bd1194d8a2542b5ae7af02f806bf665a02af34 tor-browser-linux32-5.5a6_it.tar.xz
9a7c9458639d3007bdcd07335bc352bf7dc30df89811abda4f36e0346a7da414 tor-browser-linux32-5.5a6_ja.tar.xz
ba6f72bc1ae62952df79d0b5c3f9399ef569a873adc490f8f975ac1d3125e856 tor-browser-linux32-5.5a6_ko.tar.xz
14a640820926f34ee6094158c9d47805e4e00f22e961b20d8b6568d161570207 tor-browser-linux32-5.5a6_nl.tar.xz
c1cee5d88e44ae63f83fde0eaf82f00f2b5bc2b1df5ad40b37c6dc204d8bbc61 tor-browser-linux32-5.5a6_pl.tar.xz
9bc418a533d7ebf3dda6d7c7455b405d28f6fc85cdc96d6b457421dbadd4810f tor-browser-linux32-5.5a6_pt-PT.tar.xz
80cb6af26a502cffcf2f700fb970357332de9ed777cc48073a8fba045d1f57c0 tor-browser-linux32-5.5a6_ru.tar.xz
cb8677b6bb9cfdf84c1b468ae1fe20385af0cb49b9d2b66928041abd99b469a0 tor-browser-linux32-5.5a6_tr.tar.xz
a2c08efebe45af2adc28048825c51ecea2027d9177223ed8b89d794f863ac37e tor-browser-linux32-5.5a6_vi.tar.xz
6848428bd1a91452f251475746372a1765a82ce49e8a1c21c10159037ce6e28b tor-browser-linux32-5.5a6_zh-CN.tar.xz
......@@ -6,7 +6,7 @@
VIRTUAL_MACHINE_HOSTNAME = 'tails-builder-20140709.vagrantup.com'
# Approximate amount of extra space needed for builds
BUILD_SPACE_REQUIREMENT = 7*1024
BUILD_SPACE_REQUIREMENT = 7*1024 + 128
# Virtual machine memory size for on-disk builds
VM_MEMORY_FOR_DISK_BUILDS = 512
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment