[tbb-commits] [tor-browser/tor-browser-68.3.0esr-9.5-1] fixup! TB3: Tor Browser's official .mozconfigs.

[gk at torproject.org]

commit cb3038cf717f25e759fb3fdc0a8e941dbfc4e0f1
Author: Richard Pospesel <richard at torproject.org>
Date:   Mon Dec 9 16:55:21 2019 -0800

    fixup! TB3: Tor Browser's official .mozconfigs.
---
 .mozconfig | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/.mozconfig b/.mozconfig
index 9383f1ad1a73..b4c5440304ac 100755
--- a/.mozconfig
+++ b/.mozconfig
@@ -1,5 +1,14 @@
 . $topsrcdir/browser/config/mozconfig
 
+# This mozconfig file is not used in official Tor Browser builds.
+# It is only intended to be used when doing incremental Linux builds
+# during development. The platform-specific mozconfig configuration
+# files used in official Tor Browser releases can be found in the
+# tor-browser-build repo:
+#   https://gitweb.torproject.org/builders/tor-browser-build.git/
+# under:
+#   tor-browser-build/projects/firefox/mozconfig-$OS-$ARCH
+
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj- at CONFIG_GUESS@
 mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
 export MOZILLA_OFFICIAL=1
@@ -10,7 +19,8 @@ ac_add_options --enable-official-branding
 # Let's support GTK3 for ESR60
 ac_add_options --enable-default-toolkit=cairo-gtk3
 
-ac_add_options --enable-tor-browser-update
+ac_add_options --disable-tor-launcher
+ac_add_options --disable-tor-browser-update
 ac_add_options --enable-signmar
 ac_add_options --enable-verify-mar
 
@@ -25,4 +35,6 @@ ac_add_options --disable-eme
 ac_add_options --enable-proxy-bypass-protection
 
 # Disable telemetry
-ac_add_options MOZ_TELEMETRY_REPORTING=
\ No newline at end of file
+ac_add_options MOZ_TELEMETRY_REPORTING=
+
+ac_add_options --with-tor-browser-version=dev-build