[tbb-commits] [tor-browser-build/master] --remove-update-channel breaks HTTPS-Everywhere

[gk at torproject.org]

commit 72c12814f95f7b7f417f9330aa5cc4e931ed69b0
Author: Georg Koppen <gk at torproject.org>
Date:   Sun Nov 12 19:27:12 2017 +0000

    --remove-update-channel breaks HTTPS-Everywhere
    
    We can't use the --remove-update-channel option as we envisioned in #10394
    as this throws an error in the WebExtensions context in Tor Browser. Falling
    back to regular EFF updates for now.
---
 projects/https-everywhere/build                     | 3 +--
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/projects/https-everywhere/build b/projects/https-everywhere/build
index 49018af..10dd4bf 100644
--- a/projects/https-everywhere/build
+++ b/projects/https-everywhere/build
@@ -2,8 +2,7 @@
 [% c("var/set_default_env") -%]
 tar xf [% project %]-[% c('version') %].tar.gz
 cd [% project %]-[% c('version') %]
-# Bug 10394: We don't want to autoupdate HTTPS Everywhere anymore.
-./make.sh --remove-update-channel
+./make.sh
 # Since 5.0.2 a .xpi for AMO is built, too. We don't need it.
 rm pkg/*-amo.xpi
 mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %]
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 1b5baf3..e458f61 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -15,7 +15,6 @@ Tor Browser 7.5a8 -- November 15 2017
    * Update NoScript to 5.1.5
      * Bug 23968: NoScript icon jumps to the right after update
    * Update sandboxed-tor-browser to 0.0.15
-   * Bug 10394: Don't autoupdate HTTPS Everywhere anymore
  * Windows
    * Bug 20636+10026: Create 64bit Tor Browser for Windows
    * Bug 24052: Block file:// redirects early