Compare revisions

Matthew Finkel · Alex Catarineu · Matthew Finkel · Alex Catarineu · Matthew Finkel · Alex Catarineu
--- a/build.gradle
+++ b/build.gradle
@@ -136,7 +136,13 @@ subprojects {
            rename { 'manifest.json' }
            into extDir
-            def values = ['version': rootProject.ext.config.componentsVersion + "." + new Date().format('MMddHHmmss')]
+            def systemEnvBuildDate = System.getenv('MOZ_BUILD_DATE')
+            // MOZ_BUILD_DATE is in the YYYYMMDDHHMMSS format. Thus, we only use a
+            // substring of it if it is available.
+            def values = ['version': rootProject.ext.config.componentsVersion + "." +
+                          (systemEnvBuildDate != null ?
+                           systemEnvBuildDate.substring(4) :
+                           new Date().format('MMddHHmmss'))]
            inputs.properties(values)
            expand(values)
        }

--- a/components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt
+++ b/components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt
@@ -626,6 +626,22 @@ class GeckoEngine(
        override var forceUserScalableContent: Boolean
            get() = runtime.settings.forceUserScalableEnabled
            set(value) { runtime.settings.forceUserScalableEnabled = value }
+        override var torSecurityLevel: Int
+            get() = runtime.settings.torSecurityLevel
+            set(value) {
+                value.let {
+                    runtime.settings.torSecurityLevel = it
+                }
+            }
+        override var spoofEnglish: Boolean
+            get() = runtime.settings.spoofEnglish
+            set(value) {
+                value.let {
+                    runtime.settings.spoofEnglish = it
+                    localeUpdater.updateValue()
+                }
+            }
    }.apply {
        defaultSettings?.let {
            this.javascriptEnabled = it.javascriptEnabled
@@ -643,6 +659,8 @@ class GeckoEngine(
            this.forceUserScalableContent = it.forceUserScalableContent
            this.clearColor = it.clearColor
            this.loginAutofillEnabled = it.loginAutofillEnabled
+            this.torSecurityLevel = it.torSecurityLevel
+            this.spoofEnglish = it.spoofEnglish
        }
    }

--- a/components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt
+++ b/components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt
@@ -88,6 +88,7 @@ private fun Request.toWebRequest(): WebRequest = WebRequest.Builder(url)
    .addHeadersFrom(this)
    .addBodyFrom(this)
    .cacheMode(if (useCaches) CACHE_MODE_DEFAULT else CACHE_MODE_RELOAD)
+    .origin(origin)
    .build()
 private fun WebRequest.Builder.addHeadersFrom(request: Request): WebRequest.Builder {

--- a/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt
+++ b/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt
@@ -626,6 +626,22 @@ class GeckoEngine(
        override var forceUserScalableContent: Boolean
            get() = runtime.settings.forceUserScalableEnabled
            set(value) { runtime.settings.forceUserScalableEnabled = value }
+        override var torSecurityLevel: Int
+            get() = runtime.settings.torSecurityLevel
+            set(value) {
+                value.let {
+                    runtime.settings.torSecurityLevel = it
+                }
+            }
+        override var spoofEnglish: Boolean
+            get() = runtime.settings.spoofEnglish
+            set(value) {
+                value.let {
+                    runtime.settings.spoofEnglish = it
+                    localeUpdater.updateValue()
+                }
+            }
    }.apply {
        defaultSettings?.let {
            this.javascriptEnabled = it.javascriptEnabled
@@ -643,6 +659,8 @@ class GeckoEngine(
            this.forceUserScalableContent = it.forceUserScalableContent
            this.clearColor = it.clearColor
            this.loginAutofillEnabled = it.loginAutofillEnabled
+            this.torSecurityLevel = it.torSecurityLevel
+            this.spoofEnglish = it.spoofEnglish
        }
    }

--- a/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt
+++ b/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt
@@ -88,6 +88,7 @@ private fun Request.toWebRequest(): WebRequest = WebRequest.Builder(url)
    .addHeadersFrom(this)
    .addBodyFrom(this)
    .cacheMode(if (useCaches) CACHE_MODE_DEFAULT else CACHE_MODE_RELOAD)
+    .origin(origin)
    .build()
 private fun WebRequest.Builder.addHeadersFrom(request: Request): WebRequest.Builder {

--- a/components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt
+++ b/components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt
@@ -52,7 +52,8 @@ class HttpIconLoader(
            connectTimeout = Pair(CONNECT_TIMEOUT, TimeUnit.SECONDS),
            readTimeout = Pair(READ_TIMEOUT, TimeUnit.SECONDS),
            redirect = Request.Redirect.FOLLOW,
-            useCaches = true)
+            useCaches = true,
+            origin = request.url)
        return try {
            val response = httpClient.fetch(downloadRequest)

--- a/components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt
+++ b/components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt
@@ -8,7 +8,6 @@ import android.content.Context
 import androidx.annotation.ColorRes
 import mozilla.components.browser.menu.item.BackPressMenuItem
 import mozilla.components.browser.menu.item.BrowserMenuDivider
-import mozilla.components.browser.menu.item.BrowserMenuImageText
 import mozilla.components.browser.menu.item.NO_ID
 import mozilla.components.browser.menu.item.ParentBrowserMenuItem
 import mozilla.components.browser.menu.item.WebExtensionPlaceholderMenuItem
@@ -66,20 +65,10 @@ class WebExtensionBrowserMenuBuilder(
                iconTintColorResource = webExtIconTintColorResource
            )
-            val addonsManagerMenuItem = BrowserMenuImageText(
-                label = context.getString(R.string.mozac_browser_menu_addons_manager),
-                imageResource = R.drawable.mozac_ic_extensions,
-                iconTintColorResource = webExtIconTintColorResource
-            ) {
-                onAddonsManagerTapped.invoke()
-            }
            val webExtSubMenuItems = if (appendExtensionSubMenuAtStart) {
                listOf(backPressMenuItem) + BrowserMenuDivider() +
-                    filteredExtensionMenuItems +
+                    filteredExtensionMenuItems
-                    BrowserMenuDivider() + addonsManagerMenuItem
            } else {
-                listOf(addonsManagerMenuItem) + BrowserMenuDivider() +
                    filteredExtensionMenuItems +
                    BrowserMenuDivider() + backPressMenuItem
            }
@@ -95,17 +84,13 @@ class WebExtensionBrowserMenuBuilder(
                endOfMenuAlwaysVisible = endOfMenuAlwaysVisible
            )
        } else {
-            BrowserMenuImageText(
+            null
-                label = context.getString(R.string.mozac_browser_menu_addons),
-                imageResource = R.drawable.mozac_ic_extensions,
-                iconTintColorResource = webExtIconTintColorResource
-            ) {
-                onAddonsManagerTapped.invoke()
-            }
        }
        val menuItems =
-            if (appendExtensionSubMenuAtStart) {
+            if (webExtMenuItem == null) {
+                items
+            } else if (appendExtensionSubMenuAtStart) {
                listOf(webExtMenuItem) + finalList
            } else {
                finalList + webExtMenuItem

--- a/components/browser/search/src/main/assets/search/list.json
+++ b/components/browser/search/src/main/assets/search/list.json
 {
  "default": {
-    "searchDefault": "Google",
+    "searchDefault": "DuckDuckGo",
-    "searchOrder": ["Google", "Bing"],
+    "searchOrder": ["DuckDuckGo", "YouTube", "Google", "DuckDuckGoOnion", "Startpage", "Twitter", "Wikipedia", "Yahoo"],
    "visibleDefaultEngines": [
-      "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia"
+      "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage"
    ]
  },
  "regionOverrides": {
-    "US": {
-      "google-b-m": "google-b-1-m"
-    }
  },
  "locales": {
-    "ach": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia"
-        ]
-      }
-    },
-    "an": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia-an"
-        ]
-      }
-    },
-    "ar": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-ar"
-        ]
-      }
-    },
-    "as": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-as"
-        ]
-      }
-    },
-    "ast": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-ast"
-        ]
-      }
-    },
-    "az": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazondotcom", "ddg", "azerdict", "wikipedia-az"
-        ]
-      }
-    },
-    "be": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia-be", "yandex.by"
-        ]
-      },
-      "BY": {
-        "searchDefault": "Яндекс"
-      },
-      "KZ": {
-        "searchDefault": "Яндекс"
-      },
-      "RU": {
-        "searchDefault": "Яндекс"
-      },
-      "TR": {
-        "searchDefault": "Яндекс"
-      }
-    },
-    "bg": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "pazaruvaj", "wikipedia-bg"
-        ]
-      }
-    },
-    "bn": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia-bn"
-        ]
-      }
-    },
-    "bn-BD": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia-bn"
-        ]
-      }
-    },
-    "bn-IN": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazondotcom", "ddg", "rediff", "wikipedia-bn"
-        ]
-      }
-    },
-    "br": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia-br"
-        ]
-      }
-    },
-    "bs": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia-bs"
-        ]
-      }
-    },
-    "ca": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "ddg", "wikipedia-ca", "diec2"
-        ]
-      }
-    },
-    "cak": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "amazondotcom", "ddg", "wikipedia-es"
-        ]
-      }
-    },
-    "cs": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "heureka-cz", "mapy-cz", "seznam-cz", "wikipedia-cz"
-        ]
-      }
-    },
-    "cy": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-co-uk", "ddg", "wikipedia-cy"
-        ]
-      }
-    },
-    "da": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "amazon-co-uk", "ddg", "wikipedia-da"
-        ]
-      }
-    },
-    "de": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-de", "ddg", "ecosia", "qwant", "wikipedia-de"
-        ]
-      }
-    },
-    "dsb": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-de", "ddg", "wikipedia-dsb"
-        ]
-      }
-    },
-    "el": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "skroutz", "wikipedia-el"
-        ]
-      }
-    },
-    "en-CA": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-ca", "ddg", "wikipedia"
-        ]
-      }
-    },
-    "en-GB": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-co-uk", "ddg", "qwant", "wikipedia"
-        ]
-      },
-      "RU": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-co-uk", "ddg", "qwant", "wikipedia", "yandex-en"
-        ]
-      }
-    },
-    "en-US": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia"
-        ]
-      },
-      "RU": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia", "yandex-en"
-        ]
-      },
-      "experimental-hidden": {
-        "visibleDefaultEngines": [
-          "amazon-ca", "amazon-au", "google-2018", "duckduckgo", "google"
-        ]
-      }
-    },
-    "en-ZA": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "ddg", "wikipedia"
-        ]
-      }
-    },
-    "eo": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "reta-vortaro", "wikipedia-eo"
-        ]
-      }
-    },
-    "es-AR": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "ddg", "mercadolibre-ar", "wikipedia-es"
-        ]
-      }
-    },
-    "es-CL": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "drae", "mercadolibre-cl", "wikipedia-es"
-        ]
-      }
-    },
-    "es-ES": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia-es"
-        ]
-      }
-    },
-    "es-MX": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazondotcom", "ddg", "mercadolibre-mx", "wikipedia-es"
-        ]
-      },
-      "experimental-hidden": {
-        "visibleDefaultEngines": [
-          "amazon-mx"
-        ]
-      }
-    },
-    "et": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "amazon-co-uk", "ddg", "wikipedia-et"
-        ]
-      }
-    },
-    "eu": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "elebila", "wikipedia-eu"
-        ]
-      }
-    },
-    "fa": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia-fa"
-        ]
-      }
-    },
-    "ff": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-fr", "ddg", "wikipedia-fr"
-        ]
-      }
-    },
-    "fi": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "amazondotcom", "ddg", "wikipedia-fi"
-        ]
-      }
-    },
-    "fr": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "qwant", "wikipedia-fr"
-        ]
-      }
-    },
-    "fy-NL": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "ddg", "wikipedia-fy-NL", "bolcom-fy-NL"
-        ]
-      },
-      "experimental-hidden": {
-        "visibleDefaultEngines": [
-          "amazon-nl"
-        ]
-      }
-    },
-    "ga-IE": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "amazon-co-uk", "ddg", "tearma", "wikipedia-ga-IE"
-        ]
-      }
-    },
-    "gd": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "faclair-beag", "wikipedia-gd"
-        ]
-      }
-    },
-    "gl": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-gl"
-        ]
-      }
-    },
-    "gn": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-gn"
-        ]
-      }
-    },
-    "gu-IN": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-gu"
-        ]
-      }
-    },
-    "he": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-he"
-        ]
-      }
-    },
-    "hi-IN": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-hi"
-        ]
-      }
-    },
-    "hr": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-co-uk", "ddg", "wikipedia-hr"
-        ]
-      }
-    },
-    "hsb": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-de", "ddg", "wikipedia-hsb"
-        ]
-      }
-    },
-    "hu": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "ddg", "sztaki-en-hu", "vatera", "wikipedia-hu"
-        ]
-      }
-    },
-    "hy-AM": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazondotcom", "ddg", "list-am", "wikipedia-hy-AM"
-        ]
-      }
-    },
-    "ia": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-ia"
-        ]
-      }
-    },
-    "id": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia-id"
-        ]
-      }
-    },
-    "is": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazondotcom", "ddg", "leit-is", "wikipedia-is"
-        ]
-      }
-    },
-    "it": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia-it"
-        ]
-      }
-    },
-    "ja": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "amazon-jp", "bing", "ddg", "wikipedia-ja", "yahoo-jp"
-        ]
-      }
-    },
-    "ka": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-ka"
-        ]
-      }
-    },
-    "kab": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia-kab"
-        ]
-      }
-    },
-    "kk": {
-      "default": {
-        "visibleDefaultEngines": [
-          "yandex", "google-b-m", "bing", "ddg", "wikipedia-kk"
-        ]
-      },
-      "KZ": {
-        "searchDefault": "Яндекс"
-      },
-      "BY": {
-        "searchDefault": "Яндекс"
-      },
-      "RU": {
-        "searchDefault": "Яндекс"
-      },
-      "TR": {
-        "searchDefault": "Яндекс"
-      }
-    },
-    "km": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-km"
-        ]
-      }
-    },
-    "kn": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-kn", "wiktionary-kn"
-        ]
-      }
-    },
-    "ko": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "ddg", "danawa-kr", "daum-kr", "naver-kr"
-        ]
-      }
-    },
-    "lij": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-it", "ddg", "wikipedia-lij"
-        ]
-      }
-    },
-    "lo": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia-lo"
-        ]
-      }
-    },
-    "lt": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "ddg", "wikipedia-lt"
-        ]
-      }
-    },
-    "ltg": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-co-uk", "wikipedia-ltg"
-        ]
-      }
-    },
-    "lv": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "ddg", "salidzinilv", "sslv", "wikipedia-lv"
-        ]
-      }
-    },
-    "mai": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-hi"
-        ]
-      }
-    },
-    "meh": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-es"
-        ]
-      }
-    },
-    "mix": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-es"
-        ]
-      }
-    },
-    "ml": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia-ml"
-        ]
-      }
-    },
-    "mr": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-in", "ddg", "rediff", "wikipedia-mr"
-        ]
-      }
-    },
-    "ms": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-ms"
-        ]
-      }
-    },
-    "my": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-my"
-        ]
-      }
-    },
-    "nb-NO": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "ddg", "gulesider-mobile-NO", "wikipedia-NO"
-        ]
-      }
-    },
-    "ne-NP": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia-ne"
-        ]
-      }
-    },
-    "nl": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "bolcom-nl", "ddg", "wikipedia-nl"
-        ]
-      },
-      "experimental-hidden": {
-        "visibleDefaultEngines": [
-          "amazon-nl"
-        ]
-      }
-    },
-    "nn-NO": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "ddg", "gulesider-mobile-NO", "wikipedia-NN"
-        ]
-      }
-    },
-    "oc": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia-oc", "wiktionary-oc"
-        ]
-      }
-    },
-    "or": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-or", "wiktionary-or"
-        ]
-      }
-    },
-    "pa-IN": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia-pa"
-        ]
-      }
-    },
-    "pl": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia-pl"
-        ]
-      }
-    },
-    "pt-BR": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia-pt"
-        ]
-      },
-      "experimental-hidden": {
-        "visibleDefaultEngines": [
-          "amazon-br"
-        ]
-      }
-    },
-    "pt-PT": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "ddg", "wikipedia-pt"
-        ]
-      }
-    },
-    "rm": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "leo_ende_de", "pledarigrond", "wikipedia-rm"
-        ]
-      }
-    },
-    "ro": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "ddg", "wikipedia-ro"
-        ]
-      }
-    },
-    "ru": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "ddg", "yandex-ru", "wikipedia-ru"
-        ]
-      },
-      "RU": {
-        "searchDefault": "Яндекс"
-      },
-      "BY": {
-        "searchDefault": "Яндекс"
-      },
-      "KZ": {
-        "searchDefault": "Яндекс"
-      },
-      "TR": {
-        "searchDefault": "Яндекс"
-      }
-    },
-    "sk": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "ddg", "azet-sk", "slovnik-sk", "wikipedia-sk"
-        ]
-      }
-    },
-    "sl": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "ddg", "ceneje", "odpiralni", "wikipedia-sl"
-        ]
-      }
-    },
-    "son": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "ddg", "bing", "amazon-fr", "wikipedia-fr"
-        ]
-      }
-    },
-    "sq": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-co-uk", "ddg", "wikipedia-sq"
-        ]
-      }
-    },
-    "sr": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia-sr"
-        ]
-      }
-    },
-    "sv-SE": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "prisjakt-sv-SE", "ddg", "wikipedia-sv-SE"
-        ]
-      }
-    },
-    "ta": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-ta", "wiktionary-ta"
-        ]
-      }
-    },
-    "te": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-te", "wiktionary-te"
-        ]
-      }
-    },
-    "th": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "ddg", "wikipedia-th"
-        ]
-      }
-    },
-    "tl": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazondotcom", "ddg"
-        ]
-      }
-    },
-    "tr": {
-      "default": {
-        "visibleDefaultEngines": [
-          "yandex-tr", "google-b-m", "ddg", "wikipedia-tr"
-        ]
-      },
-      "TR": {
-        "searchDefault": "Yandex"
-      },
-      "BY": {
-        "searchDefault": "Yandex"
-      },
-      "KZ": {
-        "searchDefault": "Yandex"
-      },
-      "RU": {
-        "searchDefault": "Yandex"
-      }
-    },
-    "trs": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-es"
-        ]
-      }
-    },
-    "uk": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "ddg", "wikipedia-uk", "hotline-ua"
-        ]
-      }
-    },
-    "ur": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazon-in", "ddg", "wikipedia-ur"
-        ]
-      }
-    },
-    "uz": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "amazondotcom", "ddg", "wikipedia-uz"
-        ]
-      }
-    },
-    "vi": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "coccoc", "ddg", "wikipedia-vi"
-        ]
-      }
-    },
-    "wo": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia-wo"
-        ]
-      }
-    },
-    "xh": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia"
-        ]
-      }
-    },
-    "zam": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia-es"
-        ]
-      }
-    },
-    "zh-CN": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "baidu", "bing", "ddg", "taobao", "wikipedia-zh-CN"
-        ]
-      },
-      "CN": {
-        "searchDefault": "百度"
-      }
-    },
-    "zh-TW": {
-      "default": {
-        "visibleDefaultEngines": [
-          "google-b-m", "bing", "ddg", "wikipedia-zh-TW"
-        ]
-      },
-      "experimental-hidden": {
-        "visibleDefaultEngines": [
-          "duckduckgo"
-        ]
-      }
-    }
  }
 }
--- a/components/browser/search/src/main/assets/searchplugins/ddg-onion.xml
+++ b/components/browser/search/src/main/assets/searchplugins/ddg-onion.xml
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+<ShortName>DuckDuckGoOnion</ShortName>
+<Description>Duck Duck Go Onion</Description>
+<InputEncoding>UTF-8</InputEncoding>
+<Image height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB8lBMVEUAAADkRQzjPwPjQQXkRQ3iPwTiQQXgPQPeQgrcOwPVNgDVNQDWOgbTMwDRMgDQMwDSMwDRNwTQLgDRJgDSJwDSLgDSNwTjOgDiOADjOQDkPADhQAXzs5v+/fv////0vKbiRQvgPQHpdUr85NzuknPdKgDcIwDnZzj2w7HqeU/gPQLsimb/+PftjWn97Obpb0LdJQDeLQDtjmvsi2jgSBDnbULgOQD/39HgLQDeMgDpeFLgSBH0v670uqbaJQD2qImWvP/G1Ob5+/3u//+fvvXyp47dMwDaLwD0u6v0v6/aNQDiXi/aKQD3qozU7/8gSY2vvtg0ZK/OqLDaKQHYKgLgWTfaNADZMgDZMADZLADzqpD7//+xwdz//9H/5Bn/7Bn//ADofADYMADYMQDZOgPXLgDiZDj//97/0AD3tQDvlgHZOgbXLATXMADWMgDfXjLVLQD///z+0AD/3Rn/yRnwnQDcVjbVMQDyv67wuKTSJwDRHQD+8O/tg3/iQQDwhAHnawHWMADvtKfyva7XQxHga0bQGQD2vbH/u8LXIQCmPQzja07XQxLliGn99fPkcVHvhnGZ5VguvUU5wktBwCcAgxzydVv/8/XmiGngdlL+ysi3+I8LtCE80V6P3YmX4sDleljSNQLzr6D7sKPXNQTSIwAEAbMrAAAAF3RSTlMARqSkRvPz80PTpKRG3fPe3hio9/eoGP50jNsAAAABYktHRB5yCiArAAAAyElEQVQYGQXBvUqCYRiA4fu2V9Tn+UQddI3aCpxaOoU6iU4gcqqpoYbALXBuCuoYmttamqJDiEoh4YP+MOi6BNCh+uYKEGiOVNCXXxA2XDVV/UyfKbRCXTLQWAxbP2vt8Ue/uYDvfim91615sb2um6rqtrr/NFb1cUf1Ybd06areU6lSlYpK79jzK1SyJOkfhOl8JGEcqV5zoKrTRqO6yUzIzNu46ijdM1VV9bhuUJ/nZURExLRzUiPQm3kKXHi4BAEGOmOi78A/L1QoU/VHoTsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTQtMDEtMTlUMjA6MDE6MTEtMDU6MDAuET6cAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE0LTAxLTE5VDIwOjAxOjExLTA1OjAwX0yGIAAAAABJRU5ErkJggg==</Image>
+<Url type="text/html" method="POST" template="https://3g2upl4pq6kufc4m.onion">
+  <Param name="q" value="{searchTerms}"/>
+</Url>
+<SearchForm>https://3g2upl4pq6kufc4m.onion</SearchForm>
+</SearchPlugin>
--- a/components/browser/search/src/main/assets/searchplugins/ddg.xml
+++ b/components/browser/search/src/main/assets/searchplugins/ddg.xml
@@ -4,20 +4,11 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>DuckDuckGo</ShortName>
+<Description>Duck Duck Go</Description>
 <InputEncoding>UTF-8</InputEncoding>
 <Image width="16" height="16">data:image/png;base64,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</Image>
-<Url type="application/x-suggestions+json" method="GET" template="https://ac.duckduckgo.com/ac/">
+<Url type="text/html" method="POST" template="https://duckduckgo.com">
  <Param name="q" value="{searchTerms}"/>
-  <Param name="type" value="list"/>
-</Url>
-<!-- this is effectively x-moz-phonesearch, but search service expects a text/html entry -->
-<Url type="text/html" method="GET" template="https://duckduckgo.com/">
-  <Param name="q" value="{searchTerms}" />
-  <Param name="t" value="fpas" />
-</Url>
-<Url type="application/x-moz-tabletsearch" method="GET" template="https://duckduckgo.com/">
-  <Param name="q" value="{searchTerms}" />
-  <Param name="t" value="ftas" />
 </Url>
 <SearchForm>https://duckduckgo.com</SearchForm>
 </SearchPlugin>
--- a/components/browser/search/src/main/assets/searchplugins/startpage.xml
+++ b/components/browser/search/src/main/assets/searchplugins/startpage.xml
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+<ShortName>Startpage</ShortName>
+<Description>Start Page</Description>
+<InputEncoding>UTF-8</InputEncoding>
+<Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2jkj+9YtD/vWLQ/71i0P+9otD/vaLRP72i0T+9YtE/vWLRP72i0T+9otD/vaNRP72jUT+9otF/vaLRf73kkv+9Yc///WJP//1iT//9Yk///rAmf/94Mz/+sCa//aRTv/1iUH/9ok///aJP//2i0H/9otB//aJQv/2iUL/9otC//aNRP/2jUT/9o1E//aNRP/6wpv////////////96dr/95dQ//aNRP/2kET/9pBG//aQRv/2kEb/9pBG//aRR//3lEz/95BH//mueP/7xJ3/959g//efYf/4p23//vDm//3p2//3kEr/95FJ//aRSf/niFH/95FK//aRSv/2mE//95hS/vq4iP/////////////////81bj/95xZ//q4iP//////+bF+//eZT//njFT/PSqi/2xGjv/2mVD/951V/vedVv783cX///////vQrf/++PP///////748//+8uj///////m3gf/olFr/PSuj/w8Pt/9sSJD/951V//eeWf73oVv++8ul///////5sXf/+KRi//vRsf////////////3r3v/olF//Piyk/w8Pt/9sSJH/+J5Z//ieWv/3oV/++KZf/vihXP/97N7//vn0//zTs//6wJP/+bBy//q6iP/onW//Piyl/w8Pt/8fGbH/m2iB/+icY//4pGD/96hl/viqZf74pmD/+Kxr//3iy/////////n1//ivbP/onGj/Pi2m/w8Pt/8uJKz/fFeQ/x8Zsf8+Lqb/6J9r//ivbP74rm3++Klm//mpZv/5q2f/+bR9//m0e//poW7/Pi6n/w8Pt/9sTZj/+Ktp//ira/+rd4P/Dw+3/4xijv/5snH++LN1/vmvbf/5r23/+a5t//mvb//4r2//TTuk/w8Pt/8fGrL/6ah1//ivcP/4r3P/q3yI/w8Pt/+MZpP/+bN5/vm4ev75t3X/+bV1//m1df/5t3X/+Ld3/8qUhP98XZn/Hxqz/+mse//5t3f/2p+B/x8as/8PD7f/u4qK//m7fv76u4D++bl7//m3fP/5uXz/+bl8//m5fP/5t3z/+bl//x8as/9NPKf/fWCb/x8as/8PD7f/bVOh//q5f//6v4X++sGI/vm9g//5voX/+b6F//m9hf/6vYX/+r6F//nCh/+bepr/Hxu0/w8Pt/8PD7f/fWOh//q+hf/6wof/+saN/vrGjf75xIv/+ceL//nEi//5xIv/+sSL//rHi//6x43/+ceN/+m7kP+7lpj/6ruQ//rHkP/6x43/+seQ//rLlf76ypT++seR//rJkf/6yZH/+seR//rJkf/6yZH/+8mR//vJlP/7yZT/+smU//rJlP/6yZT/+8yV//rJlf/6zpn+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==</Image>
+<Url type="text/html" method="POST" template="https://startpage.com/rto/search">
+  <Param name="q" value="{searchTerms}"/>
+</Url>
+<SearchForm>https://startpage.com/rto/search/</SearchForm>
+</SearchPlugin>
--- a/components/browser/search/src/main/assets/searchplugins/yahoo.xml
+++ b/components/browser/search/src/main/assets/searchplugins/yahoo.xml
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
+<ShortName>Yahoo</ShortName>
+<Description>Yahoo Search</Description>
+<InputEncoding>UTF-8</InputEncoding>
+<Image width="16" height="16">data:image/png;base64,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</Image>
+<Url type="application/x-suggestions+json" method="GET"
+     template="https://search.yahoo.com/sugg/ff">
+  <Param name="output"  value="fxjson" />
+  <Param name="appid"   value="ffd" />
+  <Param name="command" value="{searchTerms}" />
+</Url>
+<Url type="text/html" method="GET" template="https://search.yahoo.com/yhs/search"
+     resultdomain="yahoo.com" rel="searchform">
+  <Param name="p" value="{searchTerms}"/>
+  <Param name="ei" value="UTF-8"/>
+  <Param name="hspart" value="mozilla"/>
+</Url>
+</SearchPlugin>
--- a/components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt
+++ b/components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt
@@ -499,6 +499,7 @@ class DisplayToolbar internal constructor(
        @ColorInt val color = when (siteSecurity) {
            Toolbar.SiteSecurity.INSECURE -> colors.securityIconInsecure
            Toolbar.SiteSecurity.SECURE -> colors.securityIconSecure
+            Toolbar.SiteSecurity.ONION -> colors.securityIconSecure
        }
        if (color == Color.TRANSPARENT) {
            views.securityIndicator.clearColorFilter()

--- a/components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/SiteSecurityIconView.kt
+++ b/components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/SiteSecurityIconView.kt
@@ -43,6 +43,11 @@ internal class SiteSecurityIconView @JvmOverloads constructor(
                View.mergeDrawableStates(drawableState, intArrayOf(R.attr.state_site_secure))
                drawableState
            }
+            SiteSecurity.ONION -> {
+                val drawableState = super.onCreateDrawableState(extraSpace + 1)
+                View.mergeDrawableStates(drawableState, intArrayOf(R.attr.state_site_onion))
+                drawableState
+            }
        }
    }
 }
--- a/components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml
+++ b/components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml
@@ -3,6 +3,9 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ac="http://schemas.android.com/apk/res-auto">
+    <item
+        android:drawable="@drawable/mozac_ic_onion"
+        ac:state_site_onion="true" />
    <item
        android:drawable="@drawable/mozac_ic_lock"
        ac:state_site_secure="true" />

--- a/components/browser/toolbar/src/main/res/values/attrs_browser_toolbar.xml
+++ b/components/browser/toolbar/src/main/res/values/attrs_browser_toolbar.xml
@@ -27,6 +27,10 @@
    <attr name="state_site_secure" format="boolean"/>
  </declare-styleable>
+  <declare-styleable name="BrowserToolbarSiteOnionState">
+    <attr name="state_site_onion" format="boolean"/>
+  </declare-styleable>
  <declare-styleable name="ActionContainer">
    <attr name="actionContainerItemSize" format="dimension" />
  </declare-styleable>

--- a/components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt
+++ b/components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt
@@ -8,8 +8,8 @@ import android.content.Intent
 import android.graphics.Bitmap
 import androidx.annotation.CallSuper
 import mozilla.components.concept.engine.EngineSession.TrackingProtectionPolicy.Companion.RECOMMENDED
-import mozilla.components.concept.engine.EngineSession.TrackingProtectionPolicy.CookiePolicy.ACCEPT_ALL
 import mozilla.components.concept.engine.EngineSession.TrackingProtectionPolicy.CookiePolicy.ACCEPT_NON_TRACKERS
+import mozilla.components.concept.engine.EngineSession.TrackingProtectionPolicy.CookiePolicy.ACCEPT_ONLY_FIRST_PARTY
 import mozilla.components.concept.engine.content.blocking.Tracker
 import mozilla.components.concept.engine.history.HistoryItem
 import mozilla.components.concept.engine.manifest.WebAppManifest
@@ -380,7 +380,9 @@ abstract class EngineSession(
            fun none() = TrackingProtectionPolicy(
                trackingCategories = arrayOf(TrackingCategory.NONE),
-                cookiePolicy = ACCEPT_ALL
+                useForPrivateSessions = false,
+                useForRegularSessions = false,
+                cookiePolicy = ACCEPT_ONLY_FIRST_PARTY
            )
            /**

--- a/components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt
+++ b/components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt
@@ -179,6 +179,13 @@ abstract class Settings {
     * Setting to control the clear color while drawing.
     */
    open var clearColor: Int? by UnsupportedSetting()
+    /**
+     * Setting to control the current security level
+     */
+    open var torSecurityLevel: Int by UnsupportedSetting()
+    open var spoofEnglish: Boolean by UnsupportedSetting()
 }
 /**
@@ -214,7 +221,9 @@ data class DefaultSettings(
    override var fontSizeFactor: Float? = null,
    override var forceUserScalableContent: Boolean = false,
    override var loginAutofillEnabled: Boolean = false,
-    override var clearColor: Int? = null
+    override var clearColor: Int? = null,
+    override var torSecurityLevel: Int = 4,
+    override var spoofEnglish: Boolean = false
 ) : Settings()
 class UnsupportedSetting<T> {

--- a/components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt
+++ b/components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt
@@ -48,7 +48,8 @@ data class Request(
    val redirect: Redirect = Redirect.FOLLOW,
    val cookiePolicy: CookiePolicy = CookiePolicy.INCLUDE,
    val useCaches: Boolean = true,
-    val private: Boolean = false
+    val private: Boolean = false,
+    val origin: String? = null
 ) {
    /**
     * A [Body] to be send with the [Request].

--- a/components/concept/toolbar/src/main/java/mozilla/components/concept/toolbar/Toolbar.kt
+++ b/components/concept/toolbar/src/main/java/mozilla/components/concept/toolbar/Toolbar.kt
@@ -395,6 +395,7 @@ interface Toolbar {
    enum class SiteSecurity {
        INSECURE,
        SECURE,
+        ONION,
    }
    /**
No results found