summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-02-12 15:37:58 +0100
committeranonym <anonym@riseup.net>2016-02-12 15:37:58 +0100
commit32a0f90aaf67927d193f47c222c5ca3a8f573519 (patch)
tree66f6e553636fcdf2dbf8de057d83464a5d4ec438
parentb74801cc5c23f3a127d9184dd9257de4f9647653 (diff)
parentb14132bb3b75baec91ae8917b5b2974b784fdda4 (diff)
Merge remote-tracking branch 'origin/feature/11105-tor-browser-5.5.2' into stable2.0.1
Fix-committed: #11105
-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.txt32
-rw-r--r--wiki/src/contribute/release_process/tor-browser.mdwn4
3 files changed, 19 insertions, 19 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 d5511de..0d0a1ac 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/5.5/
+http://torbrowser-archive.tails.boum.org/5.5.2/
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 0be7356..322b9e8 100644
--- a/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
+++ b/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
@@ -1,16 +1,16 @@
-f175e3908ab741172dca082a2a1703fbb05148b51dac751507dc7632c50f693a tor-browser-linux32-5.5_ar.tar.xz
-28787dd811152b9afd1d1821a0770bd9eefe7fc25bb415c3d5ad0765665e8d8d tor-browser-linux32-5.5_de.tar.xz
-8ebf47dc26fd6d867d54cf6d04675e5bd3fdba4927beaf6af340c2a07b8f7a75 tor-browser-linux32-5.5_en-US.tar.xz
-e28c844b7fd02515cf51f245ac4be2fbc2ee77dd0053515db436090751fa7b97 tor-browser-linux32-5.5_es-ES.tar.xz
-eb56faf8639c4f7019b6adcdb0140048a95a7d165893c8d61a37780ac74b1488 tor-browser-linux32-5.5_fa.tar.xz
-ac90e739fd3fb1e096e3f728265227df81e9416b8e34345513194ef0f2e69e3f tor-browser-linux32-5.5_fr.tar.xz
-013d6b63ddb16c97cfaef532b11729b017903c80242ef6427ec24c19466f07fa tor-browser-linux32-5.5_it.tar.xz
-3dd24c7e2cf19aede85297913e36744812361cd47f5a26ddc4fca587cd0ee257 tor-browser-linux32-5.5_ja.tar.xz
-29c22c65688c87b38f291ffc73f78bd82309e2e1acb06c4716a95f38abba480b tor-browser-linux32-5.5_ko.tar.xz
-410fa9fb4d7f2404b5538a3a487b12aca87ceb26bfa2b95565a2b41ad9835beb tor-browser-linux32-5.5_nl.tar.xz
-fe9f8912254807af8e2171683fbc6b60d00357300f967a4f3dc55a796ea7c6af tor-browser-linux32-5.5_pl.tar.xz
-11936a718c8ee00a464ef24ed0454a0db50142512a67d54058e4468f854ee702 tor-browser-linux32-5.5_pt-PT.tar.xz
-954a32dc88c79ac22bb4010156c2a64eb0fa2c2e9d30fe16618f1c8b05fe8a6c tor-browser-linux32-5.5_ru.tar.xz
-a50121d3a1d3d0b60b4fb45be25122298aa55ff052b6303e789425f047e16272 tor-browser-linux32-5.5_tr.tar.xz
-25ffc583e8a8dcf4d274c6555961fdd05bc1c57c1e4b054b9e64cb07104ebe44 tor-browser-linux32-5.5_vi.tar.xz
-053cec43ed8447e2ad3a122c3d6bd80699b3569c06c26b20bbbb626effcdf406 tor-browser-linux32-5.5_zh-CN.tar.xz
+9b67450e4a4ea482b058c266edfebed219f09760dd8d02198c20eb697a1cdf82 tor-browser-linux32-5.5.2_ar.tar.xz
+3b32acd9ecb80f0c9c83c7111981e97481b236f6cf698b5a124b54f68fb9ca84 tor-browser-linux32-5.5.2_de.tar.xz
+19e36f9fd66135308202f78ea5f7f5835f2c56960efe47a44de6d8d1f3354cbe tor-browser-linux32-5.5.2_en-US.tar.xz
+1e2c4500697cd512d0e1aacdcacdf4edcd923d37d41d81f93c5f2653d0889b94 tor-browser-linux32-5.5.2_es-ES.tar.xz
+fdd12dfc1d729ed995e35ce282343421eab8085d7b986d9cb1767a26cd21e801 tor-browser-linux32-5.5.2_fa.tar.xz
+dcdec685a1f5a4b4d238787bbcb6e88d3701f83f7f9c0e9e089106a58c75da8b tor-browser-linux32-5.5.2_fr.tar.xz
+e7ad29a4fb4cf2e3553e1e1e60be3856807bce609207264c07c95aedfb97851e tor-browser-linux32-5.5.2_it.tar.xz
+adb02492193eec5a9ec3cff3724eb5e8f5a6115eb4cbb1d1127211685d8d2a62 tor-browser-linux32-5.5.2_ja.tar.xz
+7d79db5daa524deea227d4627457200dbbd7ccb14d3ea9ecf9355569eb22dcba tor-browser-linux32-5.5.2_ko.tar.xz
+3c89edcc1d532bed6ee7fb955cb58165efcaea2be9309183d403f76de475ebc4 tor-browser-linux32-5.5.2_nl.tar.xz
+15cef82dd7f4ed471391221e0313078fbce416b26426a9ced8e350e04f16e875 tor-browser-linux32-5.5.2_pl.tar.xz
+3fd03133d2c12bc23f23bf3b99b067f21ec0b3284874fecd9ff67fc0b985fdc2 tor-browser-linux32-5.5.2_pt-PT.tar.xz
+53f680c5228e2beecd08668322d0d91a39b2f1433ae5d23fa544739355c9d05c tor-browser-linux32-5.5.2_ru.tar.xz
+8be80d4ae769e1ea39c8e860e2588af5c76a75dd7bbe5c4df9d7c90baba659aa tor-browser-linux32-5.5.2_tr.tar.xz
+cb83311d8c94d1d2fa5bac7b5961a94c741de2945e76b7564b97cc407451a6d5 tor-browser-linux32-5.5.2_vi.tar.xz
+11ea21a9abc7b3425eca186d58cf49dcadb03439fa2dddc8699bf8151ec611a9 tor-browser-linux32-5.5.2_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 d8faca0..289dc9c 100644
--- a/wiki/src/contribute/release_process/tor-browser.mdwn
+++ b/wiki/src/contribute/release_process/tor-browser.mdwn
@@ -175,10 +175,10 @@ Import a new set of Tor Browser tarballs
Commit and push your changes
----------------------------
- cd "$TORBROWSER_ARCHIVE" && \
+ cd "$TORBROWSER_ARCHIVE" && \
git commit -m "Add Tor Browser ${VERSION}." && \
git annex sync && \
- git annex copy --to origin
+ git annex copy --to origin -- "${VERSION}"
Adjust the URL in the main Git repository
-----------------------------------------