- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-31.7.0esr-4.5-2] fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit 0204f7cdcc2262681675cbd474d0a1d04fc5aa2b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 21:39:54 2015 -0700 fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Add tor search parameter to disconnect. --- browser/locales/en-US/searchplugins/disconnect.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/locales/en-US/searchplugins/disconnect.xml b/browser/locales/en-US/searchplugins/disconnect.xml index 5b80262..cf755c2 100644 --- a/browser/locales/en-US/searchplugins/disconnect.xml +++ b/browser/locales/en-US/searchplugins/disconnect.xml @@ -3,7 +3,7 @@ <ShortName>Search</ShortName> <LongName>Disconnect Private Search</LongName> <Description>Private searches using disconnect.me</Description> - <Url type="text/html" method="POST" template="https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> + <Url type="text/html" method="POST" template="https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> <Param name="query" value="{searchTerms}"/> </Url> <Image height="16" width="16" type="image/icon">data:image/x-icon;base64, AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAD///8B////Af///xP///9H////ff///43///+B////af///0X///8f////B////xP///9H////ff///4////9r////Af///wH///8Zd3d3r0NDQ/9BQUH/Tk5O925ubuGxsbGt////X////yX///8fd3d3rzs7O/8qKir/IiIi/////xP///8Z////LXp6erNERET/RERE/0NDQ/8+Pj7/MjIy/3BwcNX///9b////MXR0dK06Ojr/Kioq/yIiIv////9H////X////2d4eHi5Pj4+/0JCQv9ERET/Q0ND/zs7O/8wMDD/eXl5x////01iYmKjMjIy/ycnJ/8iIiL/fn5+v4eHh9N/f3/PUFBQ1UFBQc9BQUHlQ0ND/0RERP9AQED/NTU1/yoqKv/Jycl9WVlZey8vL8csLCzJKioqx0JCQv83Nzf/KCgo/0BAQN3///8l////A3Nzc1dISEj1Q0ND/zk5Of8pKSn/VVVVz////yn///8B////Af///wFCQkL/Nzc3/ygoKP9AQEDd////Jf///wH///8Nb29vpURERP87Ozv/Kioq/zIyMvH///8v////Af///wH///8BQkJC/zc3N/8oKCj/QEBA3f///yX///8B////Da2trWtDQ0P/Ozs7/yoqKv8iIiL/////L////wH///8B////AUJCQv83Nzf/KCgo/0FBQd3///8l////Bf///yW9vb2FQkJC/zg4OP8pKSn/IiIi/////yf///8B////Af///wFCQkL/Ojo6/y4uLv9LS0vh////Rf///zf///9jioqKzUBAQP8zMzP/JiYm/zMzM+H///8Z// //Af///wH///8BQ0ND/z8/P/87Ozv/Xl5e6f///4v///+PmpqazUNDQ/86Ojr/LS0t/yQkJP9ERESp////C////wH///8B////AURERP9DQ0P/Q0ND/0xMTPtoaGjtRERE/0NDQ/89PT3/MTEx/yYmJv8iIiL/e3t7Nf///wH///8B////Af///wFERET/RERE/0RERP9DQ0P/QkJC/0BAQP87Ozv/MTEx/ycnJ/8jIyP/RkZGc////wX///8B////Af///wH///8BOzs7/zs7O/87Ozv/Ojo6/zc3N/8zMzP/LS0t/yYmJv8jIyP/Ozs7ff///wX///8B////Af///wH///8B////ASoqKv8qKir/Kioq/yoqKv8pKSn/JiYm/y0tLckyMjKbU1NTKf///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8BAAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//w==</Image>

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit 18b11197016751c3aec75c99feb7dfb798573719 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 21:39:54 2015 -0700 fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Add tor search parameter to disconnect. --- browser/locales/en-US/searchplugins/disconnect.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/locales/en-US/searchplugins/disconnect.xml b/browser/locales/en-US/searchplugins/disconnect.xml index 5b80262..cf755c2 100644 --- a/browser/locales/en-US/searchplugins/disconnect.xml +++ b/browser/locales/en-US/searchplugins/disconnect.xml @@ -3,7 +3,7 @@ <ShortName>Search</ShortName> <LongName>Disconnect Private Search</LongName> <Description>Private searches using disconnect.me</Description> - <Url type="text/html" method="POST" template="https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> + <Url type="text/html" method="POST" template="https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> <Param name="query" value="{searchTerms}"/> </Url> <Image height="16" width="16" type="image/icon">data:image/x-icon;base64, AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAD///8B////Af///xP///9H////ff///43///+B////af///0X///8f////B////xP///9H////ff///4////9r////Af///wH///8Zd3d3r0NDQ/9BQUH/Tk5O925ubuGxsbGt////X////yX///8fd3d3rzs7O/8qKir/IiIi/////xP///8Z////LXp6erNERET/RERE/0NDQ/8+Pj7/MjIy/3BwcNX///9b////MXR0dK06Ojr/Kioq/yIiIv////9H////X////2d4eHi5Pj4+/0JCQv9ERET/Q0ND/zs7O/8wMDD/eXl5x////01iYmKjMjIy/ycnJ/8iIiL/fn5+v4eHh9N/f3/PUFBQ1UFBQc9BQUHlQ0ND/0RERP9AQED/NTU1/yoqKv/Jycl9WVlZey8vL8csLCzJKioqx0JCQv83Nzf/KCgo/0BAQN3///8l////A3Nzc1dISEj1Q0ND/zk5Of8pKSn/VVVVz////yn///8B////Af///wFCQkL/Nzc3/ygoKP9AQEDd////Jf///wH///8Nb29vpURERP87Ozv/Kioq/zIyMvH///8v////Af///wH///8BQkJC/zc3N/8oKCj/QEBA3f///yX///8B////Da2trWtDQ0P/Ozs7/yoqKv8iIiL/////L////wH///8B////AUJCQv83Nzf/KCgo/0FBQd3///8l////Bf///yW9vb2FQkJC/zg4OP8pKSn/IiIi/////yf///8B////Af///wFCQkL/Ojo6/y4uLv9LS0vh////Rf///zf///9jioqKzUBAQP8zMzP/JiYm/zMzM+H///8Z// //Af///wH///8BQ0ND/z8/P/87Ozv/Xl5e6f///4v///+PmpqazUNDQ/86Ojr/LS0t/yQkJP9ERESp////C////wH///8B////AURERP9DQ0P/Q0ND/0xMTPtoaGjtRERE/0NDQ/89PT3/MTEx/yYmJv8iIiL/e3t7Nf///wH///8B////Af///wFERET/RERE/0RERP9DQ0P/QkJC/0BAQP87Ozv/MTEx/ycnJ/8jIyP/RkZGc////wX///8B////Af///wH///8BOzs7/zs7O/87Ozv/Ojo6/zc3N/8zMzP/LS0t/yYmJv8jIyP/Ozs7ff///wX///8B////Af///wH///8B////ASoqKv8qKir/Kioq/yoqKv8pKSn/JiYm/y0tLckyMjKbU1NTKf///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8BAAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//w==</Image>

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit 9a44958183f42b496f9e6d82bc53f4ed84f62933 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 20:48:10 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug #16254: Disable GeoIP-based search results. --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index b16737d..da69e6e 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -59,6 +59,9 @@ pref("services.sync.engine.addons", false); pref("services.sync.engine.tabs", false); pref("extensions.getAddons.cache.enabled", false); // https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/ pref("browser.newtabpage.enhanced", false); // Bug 16316 - Avoid potential confusion over tiles for now. +pref("browser.search.countryCode", "US"); // The next three prefs disable GeoIP search lookups (#16254) +pref("browser.search.region", "US"); +pref("browser.search.geoip.url", ""); // Fingerprinting pref("webgl.min_capability_mode", true);

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit d31de7a147a2634e7e8bef0ce48d6fd8e081c08e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 20:42:08 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Disable tiles for now until we can audit the real version in FF45-esr. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index cddb430..b16737d 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -58,6 +58,7 @@ pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs pref("services.sync.engine.addons", false); pref("services.sync.engine.tabs", false); pref("extensions.getAddons.cache.enabled", false); // https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/ +pref("browser.newtabpage.enhanced", false); // Bug 16316 - Avoid potential confusion over tiles for now. // Fingerprinting pref("webgl.min_capability_mode", true);

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] Merge remote-tracking branch 'brade/bug16439-01' into tor-browser-38.1.0esr-5.x-1
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit 7989c2c5a56006e2ae1d4988ea8e9ce1e26057d6 Merge: c1baf26 b8fc9ed Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 20:22:37 2015 -0700 Merge remote-tracking branch 'brade/bug16439-01' into tor-browser-38.1.0esr-5.x-1 browser/modules/moz.build | 6 +++++- toolkit/modules/moz.build | 10 ++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-)

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] Bug 16439: remove screencasting code.
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit b8fc9ed4eb889944b1f6d19723e11acb549b1bd5 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jun 24 11:01:11 2015 -0400 Bug 16439: remove screencasting code. Screencasting is disabled in desktop browsers because browser.casting.enabled = false. However, to avoid including code that could lead to proxy bypass, we exclude the related JS modules from Tor Browser. --- browser/modules/moz.build | 6 +++++- toolkit/modules/moz.build | 10 ++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/browser/modules/moz.build b/browser/modules/moz.build index 574455c..3c0162c 100644 --- a/browser/modules/moz.build +++ b/browser/modules/moz.build @@ -12,7 +12,6 @@ XPCSHELL_TESTS_MANIFESTS += [ EXTRA_JS_MODULES += [ 'BrowserUITelemetry.jsm', - 'CastingApps.jsm', 'Chat.jsm', 'ContentClick.jsm', 'ContentLinkHandler.jsm', @@ -39,6 +38,11 @@ EXTRA_JS_MODULES += [ 'WebappManager.jsm', ] +if not CONFIG['TOR_BROWSER_VERSION']: + EXTRA_JS_MODULES += [ + 'CastingApps.jsm', + ] + if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': EXTRA_JS_MODULES += [ 'Windows8WindowFrameColor.jsm', diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index 35c9a80..6416ac4 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -44,7 +44,6 @@ EXTRA_JS_MODULES += [ 'RemoteSecurityUI.jsm', 'RemoteWebNavigation.jsm', 'RemoteWebProgress.jsm', - 'secondscreen/SimpleServiceDiscovery.jsm', 'SelectContentHelper.jsm', 'SelectParentHelper.jsm', 'sessionstore/FormData.jsm', @@ -66,7 +65,6 @@ EXTRA_PP_JS_MODULES += [ 'GMPInstallManager.jsm', 'GMPUtils.jsm', 'ResetProfile.jsm', - 'secondscreen/RokuApp.jsm', 'Services.jsm', 'Troubleshoot.jsm', 'UpdateChannel.jsm', @@ -74,6 +72,14 @@ EXTRA_PP_JS_MODULES += [ 'WindowsPrefSync.jsm', ] +if not CONFIG['TOR_BROWSER_VERSION']: + EXTRA_JS_MODULES += [ + 'secondscreen/SimpleServiceDiscovery.jsm', + ] + EXTRA_PP_JS_MODULES += [ + 'secondscreen/RokuApp.jsm', + ] + if 'Android' != CONFIG['OS_TARGET']: EXTRA_PP_JS_MODULES += [ 'LightweightThemeConsumer.jsm',

1 0

[torbutton/master] Merge remote-tracking branch 'arthur/16357'
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit a3d3114747cf8f758f7b650b141f4fdbdd10868f Merge: bdf2289 d8dfd2f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 20:13:49 2015 -0700 Merge remote-tracking branch 'arthur/16357' src/chrome/content/torbutton.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[torbutton/master] Bug 16357: Use Mozilla API to wipe permissions db
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit d8dfd2fbcf46240eddf5c20bc55d2f294856558f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Jun 12 16:56:05 2015 -0700 Bug 16357: Use Mozilla API to wipe permissions db --- src/chrome/content/torbutton.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 5f4ba5c..0c48f30 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -20,6 +20,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "WebConsoleUtils", "resource://gre/modules/devtools/WebConsoleUtils.jsm"); let { LoadContextInfo } = Cu.import('resource://gre/modules/LoadContextInfo.jsm'); +let { Services } = Cu.import("resource://gre/modules/Services.jsm"); const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; @@ -1769,8 +1770,7 @@ function torbutton_do_new_identity() { // This clears the STS cache and site permissions on Tor Browser // XXX: Tie to some kind of disk-ok pref? try { - m_tb_prefs.setBoolPref('permissions.memory_only', false); - m_tb_prefs.setBoolPref('permissions.memory_only', true); + Services.perms.removeAll(); } catch(e) { // Actually, this catch does not appear to be needed. Leaving it in for // safety though.

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit c1baf26f15edaf6964436175b98bf33d13531207 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 20:06:46 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug #16222: Disable WebIDE to prevent remote debugging and addon downloads. --- browser/app/profile/000-tor-browser.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index cffb790..cddb430 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -139,6 +139,11 @@ pref("browser.eme.ui.enabled", false); pref("media.gmp-eme-adobe.enabled", false); pref("media.eme.enabled", false); pref("media.eme.apiVisible", false); +// WebIDE can bypass proxy settings for remote debugging. It also downloads +// some additional addons that we have not reviewed. Turn all that off. +pref("devtools.webide.autoinstallADBHelper", false); +pref("devtools.webide.autoinstallFxdtAdapters", false); +pref("devtools.webide.enabled", false); // Security slider pref("svg.in-content.enabled", true);

1 0

[tor-launcher/master] Bug 16428: Use internal update URL
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit 06f135535fac7e79be9051229030d195a44c84a7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 24 10:26:10 2015 +0000 Bug 16428: Use internal update URL We avoid using https://127.0.0.1 as update URL in order to omit scary Tor warnings (see: #13129). --- src/install.rdf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 2e9babc..0b8fc34 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -9,7 +9,8 @@ <em:id>tor-launcher(a)torproject.org</em:id> <em:version>0.2.7.6</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> - <em:updateURL>https://127.0.0.1/</em:updateURL> + <em:updateURL>data:text/plain,</em:updateURL> + <em:updateKey>-</em:updateKey>

1 0