summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-05-11 11:47:55 +0000
committerintrigeri <intrigeri@boum.org>2015-05-11 11:47:55 +0000
commit3d56fe48ff25d04015b4765ce5b3186ceb81e615 (patch)
tree3a8154cf544d8d75c661f62a145e5788b7eb74c2
parentebe57d1f2d949393344b2425fc27e5aa1dd38382 (diff)
parentd80cc48c87fb00c5971fba86c248c2f07adf7301 (diff)
Merge branch 'feature/9369-tor-browser-4.5.1' into testing
Fix-committed: #9369, #9333
-rw-r--r--config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt2
-rw-r--r--config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt30
-rw-r--r--wiki/src/contribute/release_process/tor-browser.mdwn2
3 files changed, 17 insertions, 17 deletions
diff --git a/config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt b/config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt
index fb1cf41..e620f94 100644
--- a/config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt
+++ b/config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt
@@ -1 +1 @@
-http://torbrowser-archive.tails.boum.org/4.5/
+http://torbrowser-archive.tails.boum.org/4.5.1/
diff --git a/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt b/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
index edb3dcc..73620bf 100644
--- a/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
+++ b/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
@@ -1,15 +1,15 @@
-548671fe31db1823cc28799a95e39919db4c7270df7beb3fa759034d3c9a1037 tor-browser-linux32-4.5_ar.tar.xz
-be7ad8365f28c48af025d8ce2fd42bebb74e19ea99d1fd2045924c9722f60542 tor-browser-linux32-4.5_de.tar.xz
-895c30e8ebb95c68923bd6dd7850e03ca68834d4dd6a7aad0670a53fd4843b53 tor-browser-linux32-4.5_en-US.tar.xz
-6c8c14efd545c22206bbd24533fb6825fefd5e09eed69e28d748e6270d1ae0b8 tor-browser-linux32-4.5_es-ES.tar.xz
-6e4734f94cb956f3fa568453bf91dd285f41540a59b58025e32cd0f2542e6f99 tor-browser-linux32-4.5_fa.tar.xz
-6dac0ea9bc3bd508b5d33b54be431f7c39d401a91b9fac23c054bb7b37366af3 tor-browser-linux32-4.5_fr.tar.xz
-b975b6ba3abe16b3db895818fa0e5f3f6d2832e74fff2be3475d4c2d20e4c06c tor-browser-linux32-4.5_it.tar.xz
-598866fd69603e755414df7212507db113557d491710289fd5bfb1b1f7ab286d tor-browser-linux32-4.5_ko.tar.xz
-64f331666658332c2b9071b57776bb438281844a889366f9ae714222804a71be tor-browser-linux32-4.5_nl.tar.xz
-44072717e2c87375e66ed5d9d2d778768957300259b2aebd61b58dce86432d6a tor-browser-linux32-4.5_pl.tar.xz
-0e838397d575638b94b64b8e0d3d1cebb5323c73af73ebd1e674a31bf64ac737 tor-browser-linux32-4.5_pt-PT.tar.xz
-0cff5c3acb4255b4f8277300074f3d516a2fb2a50dd88e8fcab4574da4e44d54 tor-browser-linux32-4.5_ru.tar.xz
-be2b87131d2baa26f215d3ac028f711378bf00a7183c597dac0b4579cab28c9c tor-browser-linux32-4.5_tr.tar.xz
-944c89f2564c2893ca2cf13f6ed4d3ec15a8395583e196bd63297fea781b0433 tor-browser-linux32-4.5_vi.tar.xz
-5060595c8e9a709dfc0f8e732458ff2441aa2f8cbdb5035db55a5d47b41eb5d6 tor-browser-linux32-4.5_zh-CN.tar.xz
+77c272f9ed7cb2703d559f6dde24b3caa86c8f43db1b1a36454e0992d3922256 tor-browser-linux32-4.5.1_ar.tar.xz
+e37fd8e2731206fa06f219237bf9a437b3b490c17f18cb532b887f2d4b218e13 tor-browser-linux32-4.5.1_de.tar.xz
+1ccf6a3bb6cdcef95639f090939e172ba860fc5c5582ebfc1cf49dd87d7b7f3a tor-browser-linux32-4.5.1_en-US.tar.xz
+26f5810b7f93823a86d78d09476eb01f65e1f99d431b37ca4d3c29bd4370b44d tor-browser-linux32-4.5.1_es-ES.tar.xz
+4f6ba52e2d740a1df8f121c3b598ac56abfaebf1714213f731cec818022629ca tor-browser-linux32-4.5.1_fa.tar.xz
+db01d0f30994f65fe41bb820d86b50f166615d52648d6b233ba544b9e68ba3fe tor-browser-linux32-4.5.1_fr.tar.xz
+531722b9189e54d3b4e492ba2e37bdce9e996fee5d76401d2317fb36c571435f tor-browser-linux32-4.5.1_it.tar.xz
+1bab54c31dfc9c1e06d8c6f002576fb0bc0f962888c44d568bea74ff0da6c759 tor-browser-linux32-4.5.1_ko.tar.xz
+75d4868e7694ede63ca17c5e3d44ad88475595e1f16bdbe95e611c493efa742e tor-browser-linux32-4.5.1_nl.tar.xz
+a6071a76a613a4955139ddd28d790f8d5d645ce17dde802d1a4ac9fb5465ac1c tor-browser-linux32-4.5.1_pl.tar.xz
+5d450616d746635dd4a6886771c5e88dc92b2fb12c6a7af7c7bcb525b81bfc25 tor-browser-linux32-4.5.1_pt-PT.tar.xz
+10ddf846984e80ec65a1bf29f480c3c82dc3ba23439d779619800101221a5de2 tor-browser-linux32-4.5.1_ru.tar.xz
+bbde08f326cf2e3594d6a150d22b161c16f0c7b5e9d29591a43a85aba118be4f tor-browser-linux32-4.5.1_tr.tar.xz
+2e9748478e974a81634ee2523e0f704de82796b71caf270de5ff459a3ebfc1dc tor-browser-linux32-4.5.1_vi.tar.xz
+3a2b2c089ac03cebd1507eff7af2c707f441c07894a51481376581448fbcde7c tor-browser-linux32-4.5.1_zh-CN.tar.xz
diff --git a/wiki/src/contribute/release_process/tor-browser.mdwn b/wiki/src/contribute/release_process/tor-browser.mdwn
index 2f9989e..10e9324 100644
--- a/wiki/src/contribute/release_process/tor-browser.mdwn
+++ b/wiki/src/contribute/release_process/tor-browser.mdwn
@@ -168,7 +168,7 @@ Adjust the URL in the main Git repository
-----------------------------------------
cd "$TAILS_GIT_REPO" && \
- echo 'http://torbrowser-archive.tails.boum.org/' > \
+ echo "http://torbrowser-archive.tails.boum.org/${VERSION}/" > \
config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt && \
git commit config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt \
-m "Fetch Tor Browser from our own archive."