commit dc0ca5edeea0c9e17b94444cd3d941502ac1d57f Author: Yawning Angel yawning@schwanenlied.me Date: Wed Apr 12 17:59:54 2017 +0000

Bug 21927: Remove the ability to install/update the hardened bundle.

This removes the `hardened` bundle from install/update related metadata assets. New installs will no longer provide the user the option to install the `hardened` channel, and the update check will fail due to lack of an update URL. --- ChangeLog | 1 + data/installer/urls.json | 12 ++++-------- data/ui/channels.json | 2 +- data/ui/locales.json | 3 +-- 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 5331f4f..20cae09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ Changes in version 0.0.4 - UNRELEASED: + * Bug 21927: Remove the ability to install/update the hardened bundle. * Bug 21244: Update the MAR signing key for 7.0. * Bug 21536: Remove asn's scramblesuit bridge from Tor Browser. * Fix compilation with Go 1.8. diff --git a/data/installer/urls.json b/data/installer/urls.json index bbfcdeb..7223654 100644 --- a/data/installer/urls.json +++ b/data/installer/urls.json @@ -1,22 +1,18 @@ { "downloadsURLs": { "release": "https://aus1.torproject.org/torbrowser/update_2/release/downloads.json", - "alpha": "https://aus1.torproject.org/torbrowser/update_2/alpha/downloads.json", - "hardened": "https://aus1.torproject.org/torbrowser/update_2/hardened/downloads.json" + "alpha": "https://aus1.torproject.org/torbrowser/update_2/alpha/downloads.json" }, "downloadsOnions": { "release": "http://x3nelbld33llasqv.onion/torbrowser/update_2/release/downloads.json", - "alpha": "http://x3nelbld33llasqv.onion/torbrowser/update_2/alpha/downloads.json", - "hardened": "http://x3nelbld33llasqv.onion/torbrowser/update_2/hardened/downloads.json" + "alpha": "http://x3nelbld33llasqv.onion/torbrowser/update_2/alpha/downloads.json" }, "updateURLs": { "release": "https://aus1.torproject.org/torbrowser/update_2/release", - "alpha": "https://aus1.torproject.org/torbrowser/update_2/alpha", - "hardened": "https://aus1.torproject.org/torbrowser/update_2/hardened" + "alpha": "https://aus1.torproject.org/torbrowser/update_2/alpha" }, "updateOnions": { "release": "http://x3nelbld33llasqv.onion/torbrowser/update_2/release", - "alpha": "http://x3nelbld33llasqv.onion/torbrowser/update_2/alpha", - "hardened": "http://x3nelbld33llasqv.onion/torbrowser/update_2/hardened" + "alpha": "http://x3nelbld33llasqv.onion/torbrowser/update_2/alpha" } } diff --git a/data/ui/channels.json b/data/ui/channels.json index 8e78f46..5dfbd9f 100644 --- a/data/ui/channels.json +++ b/data/ui/channels.json @@ -1,3 +1,3 @@ { - "linux64": [ "release", "alpha", "hardened" ] + "linux64": [ "release", "alpha" ] } diff --git a/data/ui/locales.json b/data/ui/locales.json index ec48d2b..42adfac 100644 --- a/data/ui/locales.json +++ b/data/ui/locales.json @@ -1,5 +1,4 @@ { "release": [ "en-US", "ar", "de", "es-ES", "fa", "fr", "it", "ja", "ko", "nl", "pl", "pt-PT", "ru", "tr", "vi", "zh-CN" ], - "alpha": [ "en-US", "ar", "de", "es-ES", "fa", "fr", "it", "ja", "ko", "nl", "pl", "pt-PT", "ru", "tr", "vi", "zh-CN" ], - "hardened": [ "ALL"] + "alpha": [ "en-US", "ar", "de", "es-ES", "fa", "fr", "it", "ja", "ko", "nl", "pl", "pt-PT", "ru", "tr", "vi", "zh-CN" ] }