commit 8f2ba127875371bfa707525d0778942587daf87c Author: Alex Catarineu acat@torproject.org Date: Mon Oct 21 18:27:13 2019 +0200

fixup! Bug 10760: Integrate TorButton to TorBrowser core --- browser/base/content/browser.xul | 1 - mobile/android/chrome/content/browser.xul | 1 - 2 files changed, 2 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index 6a81cc8c0f72..8e47fd36fb75 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -102,7 +102,6 @@ Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this); - Services.scriptloader.loadSubScript("chrome://torbutton/content/torbutton_util.js", this); Services.scriptloader.loadSubScript("chrome://torbutton/content/tor-circuit-display.js", this); Services.scriptloader.loadSubScript("chrome://torbutton/content/torbutton.js", this);

diff --git a/mobile/android/chrome/content/browser.xul b/mobile/android/chrome/content/browser.xul index fab93922a5f6..039599131f17 100644 --- a/mobile/android/chrome/content/browser.xul +++ b/mobile/android/chrome/content/browser.xul @@ -12,7 +12,6 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul%22%3E

<script type="application/javascript" src="chrome://browser/content/browser.js"/> - <script type="application/javascript" src="chrome://torbutton/content/torbutton_util.js"/> <script type="application/javascript" src="chrome://torbutton/content/torbutton.js"/>

<deck id="browsers" flex="1"/>