[tor-commits] [tor-browser/tor-browser-78.0.1esr-10.0-1] fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.

[gk at torproject.org]

commit c6b4574daf4b3b1ccdbb74c4d1970489ebe4a895
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Jul 23 10:59:03 2020 +0000

    fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.
    
    Fixes bug 32612.
---
 browser/confvars.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/browser/confvars.sh b/browser/confvars.sh
index b22913ebca02..f994783f9c65 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -24,11 +24,8 @@ MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 # of values.
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 if test "$MOZ_UPDATE_CHANNEL" = "alpha"; then
-  # alpha is currently using the -release channel id. However we accept
-  # both -alpha and -release channel ID for the alpha so that we can
-  # switch it to -alpha at some point. See bug 32498.
-  ACCEPTED_MAR_CHANNEL_IDS=torbrowser-torproject-alpha,torbrowser-torproject-release
-  MAR_CHANNEL_ID=torbrowser-torproject-release
+  ACCEPTED_MAR_CHANNEL_IDS=torbrowser-torproject-alpha
+  MAR_CHANNEL_ID=torbrowser-torproject-alpha
 elif test "$MOZ_UPDATE_CHANNEL" = "nightly"; then
   ACCEPTED_MAR_CHANNEL_IDS=torbrowser-torproject-nightly
   MAR_CHANNEL_ID=torbrowser-torproject-nightly