[tbb-commits] [tor-browser/tor-browser-78.0.1esr-10.0-1] squash! TB3: Tor Browser's official .mozconfigs.

[gk at torproject.org]

commit 127d9c51c425868c97d4463b6f63f48296b718e2
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Mon Jun 15 15:25:49 2020 -0400

    squash! TB3: Tor Browser's official .mozconfigs.
    
    Bug 33851: Omit Parental Controls.
---
 .mozconfig         | 1 +
 .mozconfig-android | 1 +
 .mozconfig-asan    | 1 +
 .mozconfig-mac     | 1 +
 .mozconfig-mingw   | 1 +
 5 files changed, 5 insertions(+)

diff --git a/.mozconfig b/.mozconfig
index d0307eaa79c0..d71c858844e3 100755
--- a/.mozconfig
+++ b/.mozconfig
@@ -25,6 +25,7 @@ ac_add_options --disable-tests
 ac_add_options --disable-debug
 ac_add_options --disable-crashreporter
 ac_add_options --disable-webrtc
+ac_add_options --disable-parental-controls
 # Let's make sure no preference is enabling either Adobe's or Google's CDM.
 ac_add_options --disable-eme
 ac_add_options --enable-proxy-bypass-protection
diff --git a/.mozconfig-android b/.mozconfig-android
index 008444714dd4..1b5e3f3178b7 100755
--- a/.mozconfig-android
+++ b/.mozconfig-android
@@ -27,6 +27,7 @@ ac_add_options --disable-rust-debug
 ac_add_options --disable-updater
 ac_add_options --disable-crashreporter
 ac_add_options --disable-webrtc
+ac_add_options --disable-parental-controls
 
 ac_add_options --enable-proxy-bypass-protection
 
diff --git a/.mozconfig-asan b/.mozconfig-asan
index 71f8e65d0732..ca05fb12eedb 100644
--- a/.mozconfig-asan
+++ b/.mozconfig-asan
@@ -36,6 +36,7 @@ ac_add_options --enable-tests
 ac_add_options --enable-debug
 ac_add_options --disable-crashreporter
 ac_add_options --disable-webrtc
+ac_add_options --disable-parental-controls
 ac_add_options --disable-eme
 ac_add_options --enable-proxy-bypass-protection
 
diff --git a/.mozconfig-mac b/.mozconfig-mac
index f6a2645e207c..9be7751f8241 100644
--- a/.mozconfig-mac
+++ b/.mozconfig-mac
@@ -46,6 +46,7 @@ ac_add_options --enable-verify-mar
 
 ac_add_options --disable-crashreporter
 ac_add_options --disable-webrtc
+ac_add_options --disable-parental-controls
 ac_add_options --disable-tests
 # Let's make sure no preference is enabling either Adobe's or Google's CDM.
 ac_add_options --disable-eme
diff --git a/.mozconfig-mingw b/.mozconfig-mingw
index a920527ccf7b..6a9d3749b2ec 100644
--- a/.mozconfig-mingw
+++ b/.mozconfig-mingw
@@ -22,6 +22,7 @@ ac_add_options --disable-eme
 ac_add_options --disable-crashreporter
 ac_add_options --disable-maintenance-service
 ac_add_options --disable-webrtc
+ac_add_options --disable-parental-controls
 ac_add_options --disable-tests
 ac_add_options --enable-proxy-bypass-protection