October 2019 - tbb-commits - lists.torproject.org

[tor-launcher/master] Bug 31286: New strings for about:preferences#tor
by gk＠torproject.org 11 Oct '19

11 Oct '19

commit 42ece714278aee288f63d3aab1450c9c1badcbac Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Oct 9 16:46:45 2019 -0700 Bug 31286: New strings for about:preferences#tor Adds several new strings for the about:preferences#tor page. Not quite complete and a few tedious things to do: - Remove the colon (':') character from several strings (Username, Password, Port, etc) to match style of existing fields in about:preferences - Duplicate some existing strings living in torlauncher.properties over to network-settings.dtd --- src/chrome/locale/en-US/network-settings.dtd | 31 ++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/chrome/locale/en-US/network-settings.dtd b/src/chrome/locale/en-US/network-settings.dtd index c6c5687..2c6e5a5 100644 --- a/src/chrome/locale/en-US/network-settings.dtd +++ b/src/chrome/locale/en-US/network-settings.dtd @@ -26,17 +26,23 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> + <!ENTITY torsettings.useProxy.type "Proxy Type:"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> + <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> + <!ENTITY torsettings.useProxy.port "Port:"> + <!ENTITY torsettings.useProxy.username "Username:"> + <!ENTITY torsettings.useProxy.password "Password:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> + <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> @@ -60,3 +66,28 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.categoryTitle "Tor"> +<!ENTITY torPreferences.torSettings "Tor Settings"> +<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > +<!ENTITY torPreferences.learnMore "Learn More"> +<!ENTITY torPreferences.bridges "Bridges"> +<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> +<!ENTITY torPreferences.useBridge "Use a bridge"> + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.provideBridge "Provide a bridge"> +<!ENTITY torPreferences.advanced "Advanced"> +<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> +<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> + +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> + +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> + +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> +<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> +<!ENTITY torPreferences.viewLogs "View Logs…"> +<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 23247: Communicating security expectations for .onion
by gk＠torproject.org 11 Oct '19

11 Oct '19

commit dece7a15a8703596366c54f4420bd7286c66b10f Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Sep 20 12:48:40 2019 +0200 fixup! Bug 23247: Communicating security expectations for .onion --- browser/base/content/browser-siteIdentity.js | 4 +++ docshell/base/nsDocShell.cpp | 4 ++- security/manager/ssl/nsSecureBrowserUIImpl.cpp | 46 ++++++++++++++++---------- 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js index 12d9a29bf512..9da2e289b86d 100644 --- a/browser/base/content/browser-siteIdentity.js +++ b/browser/base/content/browser-siteIdentity.js @@ -612,6 +612,10 @@ var gIdentityHandler = { * built-in (returns false) or imported (returns true). */ _hasCustomRoot() { + if (!this._secInfo) { + return false; + } + let issuerCert = null; // Walk the whole chain to get the last cert. // eslint-disable-next-line no-empty diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 578a06d61a83..7f3d8a3e0542 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -63,6 +63,7 @@ #include "mozilla/dom/ChildSHistory.h" #include "mozilla/dom/nsCSPContext.h" #include "mozilla/dom/LoadURIOptionsBinding.h" +#include "mozilla/dom/nsMixedContentBlocker.h" #include "mozilla/net/ReferrerPolicy.h" #include "mozilla/net/UrlClassifierFeatureFactory.h" @@ -5583,7 +5584,8 @@ nsDocShell::GetAllowMixedContentAndConnectionData( // aRootHasSecureConnection should be false. nsCOMPtr<nsIURI> rootUri = rootPrincipal->GetURI(); if (nsContentUtils::IsSystemPrincipal(rootPrincipal) || !rootUri || - !SchemeIsHTTPS(rootUri)) { + (!SchemeIsHTTPS(rootUri) && + !nsMixedContentBlocker::IsPotentiallyTrustworthyOnion(rootUri))) { *aRootHasSecureConnection = false; } diff --git a/security/manager/ssl/nsSecureBrowserUIImpl.cpp b/security/manager/ssl/nsSecureBrowserUIImpl.cpp index 2aba013650f0..ea1dfca20b6b 100644 --- a/security/manager/ssl/nsSecureBrowserUIImpl.cpp +++ b/security/manager/ssl/nsSecureBrowserUIImpl.cpp @@ -9,6 +9,7 @@ #include "mozilla/Logging.h" #include "mozilla/Unused.h" #include "mozilla/dom/Document.h" +#include "mozilla/dom/nsMixedContentBlocker.h" #include "nsContentUtils.h" #include "nsIChannel.h" #include "nsDocShell.h" @@ -246,8 +247,8 @@ static nsresult URICanBeConsideredSecure( return rv; } - nsAutoCString host; - bool isOnion = NS_SUCCEEDED(innermostURI->GetHost(host)) && StringEndsWith(host, NS_LITERAL_CSTRING(".onion")); + bool isOnion = + nsMixedContentBlocker::IsPotentiallyTrustworthyOnion(innermostURI); canBeConsideredSecure = isHttps || isOnion; @@ -314,24 +315,35 @@ nsresult nsSecureBrowserUIImpl::UpdateStateAndSecurityInfo(nsIChannel* channel, if (NS_FAILED(rv)) { return rv; } - // If the security state is STATE_IS_INSECURE, the TLS handshake never - // completed. Don't set any further state. - if (mState == STATE_IS_INSECURE) { - return NS_OK; + // Skip setting some state if mState == STATE_IS_INSECURE (TLS handshake + // never completed). But do not return in that case, since a + // STATE_IS_INSECURE can still be changed later to STATE_IS_SECURE if it's + // routed over tor (.onion). + if (mState != STATE_IS_INSECURE) { + mTopLevelSecurityInfo = securityInfo; + MOZ_LOG(gSecureBrowserUILog, LogLevel::Debug, + (" set mTopLevelSecurityInfo")); + bool isEV; + rv = mTopLevelSecurityInfo->GetIsExtendedValidation(&isEV); + if (NS_FAILED(rv)) { + return rv; + } + if (isEV) { + MOZ_LOG(gSecureBrowserUILog, LogLevel::Debug, (" is EV")); + mState |= STATE_IDENTITY_EV_TOPLEVEL; + } } + } - mTopLevelSecurityInfo = securityInfo; - MOZ_LOG(gSecureBrowserUILog, LogLevel::Debug, - (" set mTopLevelSecurityInfo")); - bool isEV; - rv = mTopLevelSecurityInfo->GetIsExtendedValidation(&isEV); - if (NS_FAILED(rv)) { - return rv; - } - if (isEV) { - MOZ_LOG(gSecureBrowserUILog, LogLevel::Debug, (" is EV")); - mState |= STATE_IDENTITY_EV_TOPLEVEL; + // any protocol routed over tor is secure + if ((mState & STATE_IS_SECURE) == 0) { + if (nsMixedContentBlocker::IsPotentiallyTrustworthyOnion(uri)) { + MOZ_LOG(gSecureBrowserUILog, LogLevel::Debug, (" URI is onion")); + mState = STATE_IS_SECURE; } + } + + if (mState != STATE_IS_INSECURE) { // Proactively check for mixed content in case GetState() is never called // (this can happen when loading from the BF cache). CheckForMixedContent();

1 0

[tor-browser-build/master] Bug 30460: Update TOPL Project to Use Android Toolchain (Firefox 68)
by gk＠torproject.org 11 Oct '19

11 Oct '19

commit 7fc43b5e228232caede87b571777e4a0448780d4 Author: sisbell <shane.isbell(a)gmail.com> Date: Fri Oct 11 13:33:08 2019 -0700 Bug 30460: Update TOPL Project to Use Android Toolchain (Firefox 68) --- projects/tor-onion-proxy-library/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index 41cc815..0b949a3 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -17,6 +17,8 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz # Patch projects cd /var/tmp/build/[% project %]-[% c('version') %] +# Gradle patch provided so that when generating a gradle dependency list, the +# build will pull down the correct android tool versions patch -p1 < $rootdir/gradle.patch patch -p1 < $rootdir/canceldormant.patch

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 26690: Port padlock states for .onion services to mobile
by gk＠torproject.org 11 Oct '19

11 Oct '19

commit 89acb810aa0f622316b43812bb07cb56eb9c9377 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 30 13:10:29 2019 +0200 fixup! Bug 26690: Port padlock states for .onion services to mobile --- mobile/android/chrome/content/browser.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index fc66e8b4f23e..b1921562e53d 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -6770,6 +6770,12 @@ var IdentityHandler = { */ getIdentityData: function() { let result = {}; + + // Even if the connection is secure, it may not have a certificate + if (!this._lastSecInfo) { + return result; + } + let cert = this._lastSecInfo.serverCert; // Human readable name of Subject @@ -6933,7 +6939,7 @@ var IdentityHandler = { result.host = this.getEffectiveHost(); result.isOnionHost = this.isOnionHost(); - result.hasCert = !!this._lastStatus; + result.hasCert = !!this._lastSecInfo; // Don't show identity data for pages with an unknown identity or if any // mixed content is loaded (mixed display content is loaded by default).

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 13543: Spoof smooth and powerEfficient for Media Capabilities
by gk＠torproject.org 11 Oct '19

11 Oct '19

commit 990e3caf34672b64f30db79f585903b8ce4f88d6 Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Oct 10 15:08:12 2019 +0200 Bug 13543: Spoof smooth and powerEfficient for Media Capabilities --- dom/media/mediacapabilities/MediaCapabilities.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dom/media/mediacapabilities/MediaCapabilities.cpp b/dom/media/mediacapabilities/MediaCapabilities.cpp index cef653fd686a..148e2136ed2a 100644 --- a/dom/media/mediacapabilities/MediaCapabilities.cpp +++ b/dom/media/mediacapabilities/MediaCapabilities.cpp @@ -282,6 +282,11 @@ already_AddRefed<Promise> MediaCapabilities::DecodingInfo( if (aValue.IsReject()) { p = CapabilitiesPromise::CreateAndReject( std::move(aValue.RejectValue()), __func__); + } else if (nsContentUtils:: + ShouldResistFingerprinting()) { + p = CapabilitiesPromise::CreateAndResolve( + MediaCapabilitiesInfo(true, true, true), + __func__); } else { MOZ_ASSERT(config->IsVideo()); nsAutoCString reason;

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31607: App menu items stop working on macOS
by gk＠torproject.org 11 Oct '19

11 Oct '19

commit 1da04ce775a4994924a2c8154fb1f76c663a5eff Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Oct 3 10:53:43 2019 -0400 Bug 31607: App menu items stop working on macOS Avoid re-creating the hidden window, since this causes the nsMenuBarX object that is associated with the app menu to be freed (which in turn causes all of the app menu items to stop working). More detail: There should only be one hidden window. XREMain::XRE_mainRun() contains an explicit call to create the hidden window and that is the normal path by which it is created. However, when Tor Launcher's wizard/progress window is opened during startup, a hidden window is created earlier as a side effect of calls to nsAppShellService::GetHiddenWindow(). Then, when XREMain::XRE_mainRun() creates its hidden window, the original one is freed which also causes the app menu's nsMenuBarX object which is associated with that window to be destroyed. When that happens, the menuGroupOwner property within each Cocoa menu items's MenuItemInfo object is cleared. This breaks the link that is necessary for NativeMenuItemTarget's menuItemHit method to dispatch a menu item event. --- xpfe/appshell/nsAppShellService.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xpfe/appshell/nsAppShellService.cpp b/xpfe/appshell/nsAppShellService.cpp index b09534c8841d..cb76f1ab45d5 100644 --- a/xpfe/appshell/nsAppShellService.cpp +++ b/xpfe/appshell/nsAppShellService.cpp @@ -85,6 +85,10 @@ NS_IMPL_ISUPPORTS(nsAppShellService, nsIAppShellService, nsIObserver) NS_IMETHODIMP nsAppShellService::CreateHiddenWindow() { + if (mHiddenWindow) { + return NS_OK; + } + return CreateHiddenWindowHelper(false); }

1 0

[torbutton/master] Bug 32041: Replace = with real hamburguer icon ≡
by gk＠torproject.org 11 Oct '19

11 Oct '19

commit 9a16e4bad1453e530a1308db7450b2e617bd5b58 Author: emma peel <emmapeel(a)torproject.org> Date: Fri Oct 11 11:59:27 2019 +0000 Bug 32041: Replace = with real hamburguer icon ≡ --- chrome/locale/en-US/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/locale/en-US/browserOnboarding.properties b/chrome/locale/en-US/browserOnboarding.properties index 7acfe2eb..8068b6c8 100644 --- a/chrome/locale/en-US/browserOnboarding.properties +++ b/chrome/locale/en-US/browserOnboarding.properties @@ -51,7 +51,7 @@ onboarding.tour-tor-update.prefix-updated=Updated onboarding.tour-tor-toolbar=Toolbar onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button. onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. -onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [=] menu. +onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity onboarding.tour-tor-toolbar-update-9.0.next-button=Go to Tor Network

1 0

[tor-browser-build/master] Bug 30665: Get Firefox 68 ESR Working with latest android toolchain
by gk＠torproject.org 11 Oct '19

11 Oct '19

commit a6a151402cef2a1e5ea6b3fbfc7aa6a90d9de507 Author: sisbell <shane.isbell(a)gmail.com> Date: Wed Oct 9 12:24:16 2019 -0700 Bug 30665: Get Firefox 68 ESR Working with latest android toolchain --- projects/firefox/1527534.patch | 139 ------------------------- projects/firefox/android-packages.patch | 10 -- projects/firefox/android-remove-emulator.patch | 23 ---- projects/firefox/build | 10 +- projects/firefox/config | 6 -- 5 files changed, 3 insertions(+), 185 deletions(-) diff --git a/projects/firefox/1527534.patch b/projects/firefox/1527534.patch deleted file mode 100644 index ad8720c..0000000 --- a/projects/firefox/1527534.patch +++ /dev/null @@ -1,139 +0,0 @@ -From dcd5a0e59bef209aa8301a427b749830876cdada Mon Sep 17 00:00:00 2001 -From: Jeff Gilbert <jgilbert(a)mozilla.com> -Date: Tue, 19 Feb 2019 15:43:39 -0800 -Subject: [PATCH] Bug 1527534 - Reuse LoadApitraceLibrary. r=lsalzman a=lizzard - -Differential Revision: https://phabricator.services.mozilla.com/D20418 - -diff --git a/gfx/gl/GLContextProviderEGL.cpp b/gfx/gl/GLContextProviderEGL.cpp -index d91d03aee6a9..f4d8c1f80176 100644 ---- a/gfx/gl/GLContextProviderEGL.cpp -+++ b/gfx/gl/GLContextProviderEGL.cpp -@@ -265,11 +265,8 @@ GLContextEGL::~GLContextEGL() { - } - - bool GLContextEGL::Init() { --#if defined(ANDROID) -- // We can't use LoadApitraceLibrary here because the GLContext -- // expects its own handle to the GL library -- if (!OpenLibrary(APITRACE_LIB)) --#endif -+ mLibrary = LoadApitraceLibrary(); -+ if (!mLibrary) { - if (!OpenLibrary(GLES2_LIB)) { - #if defined(XP_UNIX) - if (!OpenLibrary(GLES2_LIB2)) { -@@ -278,6 +275,7 @@ bool GLContextEGL::Init() { - } - #endif - } -+ } - - SetupLookupFunction(); - if (!InitWithPrefix("gl", true)) return false; -diff --git a/gfx/gl/GLLibraryEGL.cpp b/gfx/gl/GLLibraryEGL.cpp -index fe4bd9811949..ef693e283968 100644 ---- a/gfx/gl/GLLibraryEGL.cpp -+++ b/gfx/gl/GLLibraryEGL.cpp -@@ -63,9 +63,18 @@ static const char* sEGLExtensionNames[] = { - "EGL_ANGLE_device_creation_d3d11", - }; - --#if defined(ANDROID) -+PRLibrary* LoadApitraceLibrary() { -+ const char* path = nullptr; -+ -+#ifdef ANDROID -+ // We only need to explicitly dlopen egltrace -+ // on android as we can use LD_PRELOAD or other tricks -+ // on other platforms. We look for it in /data/local -+ // as that's writeable by all users. -+ path = "/data/local/tmp/egltrace.so"; -+#endif -+ if (!path) return nullptr; - --static PRLibrary* LoadApitraceLibrary() { - // Initialization of gfx prefs here is only needed during the unit tests... - gfxPrefs::GetSingleton(); - if (!gfxPrefs::UseApitrace()) { -@@ -73,7 +82,6 @@ static PRLibrary* LoadApitraceLibrary() { - } - - static PRLibrary* sApitraceLibrary = nullptr; -- - if (sApitraceLibrary) return sApitraceLibrary; - - nsAutoCString logFile; -@@ -87,20 +95,19 @@ static PRLibrary* LoadApitraceLibrary() { - nsAutoCString logPath; - logPath.AppendPrintf("%s/%s", getenv("GRE_HOME"), logFile.get()); - -+#ifndef XP_WIN // Windows is missing setenv and forbids PR_LoadLibrary. - // apitrace uses the TRACE_FILE environment variable to determine where - // to log trace output to - printf_stderr("Logging GL tracing output to %s", logPath.get()); - setenv("TRACE_FILE", logPath.get(), false); - -- printf_stderr("Attempting load of %s\n", APITRACE_LIB); -- -- sApitraceLibrary = PR_LoadLibrary(APITRACE_LIB); -+ printf_stderr("Attempting load of %s\n", path); -+ sApitraceLibrary = PR_LoadLibrary(path); -+#endif - - return sApitraceLibrary; - } - --#endif // ANDROID -- - #ifdef XP_WIN - // see the comment in GLLibraryEGL::EnsureInitialized() for the rationale here. - static PRLibrary* LoadLibraryForEGLOnWindows(const nsAString& filename) { -diff --git a/gfx/gl/GLLibraryEGL.h b/gfx/gl/GLLibraryEGL.h -index 069a2f0908d7..3f200bf76b3f 100644 ---- a/gfx/gl/GLLibraryEGL.h -+++ b/gfx/gl/GLLibraryEGL.h -@@ -18,18 +18,6 @@ - #include <bitset> - #include <vector> - --#ifdef ANDROID --// We only need to explicitly dlopen egltrace --// on android as we can use LD_PRELOAD or other tricks --// on other platforms. We look for it in /data/local --// as that's writeable by all users --// --// This should really go in GLLibraryEGL.cpp but we currently reference --// APITRACE_LIB in GLContextProviderEGL.cpp. Further refactoring --// will come in subsequent patches on Bug 732865 --#define APITRACE_LIB "/data/local/tmp/egltrace.so" --#endif -- - #if defined(MOZ_X11) - #define EGL_DEFAULT_DISPLAY ((EGLNativeDisplayType)mozilla::DefaultXDisplay()) - #else -@@ -49,6 +37,7 @@ class DataSourceSurface; - namespace gl { - - class GLContext; -+PRLibrary* LoadApitraceLibrary(); - - void BeforeEGLCall(const char* funcName); - void AfterEGLCall(const char* funcName); -diff --git a/gfx/thebes/gfxPrefs.h b/gfx/thebes/gfxPrefs.h -index b2e094672b59..fae5bec1e78e 100644 ---- a/gfx/thebes/gfxPrefs.h -+++ b/gfx/thebes/gfxPrefs.h -@@ -433,9 +433,7 @@ class gfxPrefs final { - SmoothScrollMSDPhysicsRegularSpringConstant, int32_t, 1000); - - DECL_GFX_PREF(Once, "gfx.android.rgb16.force", AndroidRGB16Force, bool, false); --#if defined(ANDROID) - DECL_GFX_PREF(Once, "gfx.apitrace.enabled", UseApitrace, bool, false); --#endif - #if defined(RELEASE_OR_BETA) - // "Skip" means this is locked to the default value in beta and release. - DECL_GFX_PREF(Skip, "gfx.blocklist.all", BlocklistAll, int32_t, 0); --- -2.20.1 - diff --git a/projects/firefox/android-packages.patch b/projects/firefox/android-packages.patch deleted file mode 100644 index 3c70b41..0000000 --- a/projects/firefox/android-packages.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/python/mozboot/mozboot/android-packages.txt b/python/mozboot/mozboot/android-packages.txt -index ac947a72f410..1a9aa21cb5d8 100644 ---- a/python/mozboot/mozboot/android-packages.txt -+++ b/python/mozboot/mozboot/android-packages.txt -@@ -1,5 +1,3 @@ - platform-tools - build-tools;27.0.3 - platforms;android-28 --emulator --docs diff --git a/projects/firefox/android-remove-emulator.patch b/projects/firefox/android-remove-emulator.patch deleted file mode 100644 index 9499983..0000000 --- a/projects/firefox/android-remove-emulator.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/build/moz.configure/android-sdk.configure b/build/moz.configure/android-sdk.configure -index a8ecc617850d..0a58597e2646 100644 ---- a/build/moz.configure/android-sdk.configure -+++ b/build/moz.configure/android-sdk.configure -@@ -87,10 +87,6 @@ def android_platform_tools(sdk_root): - tools) - - --@depends(android_sdk_root) --def android_emulator_path(sdk_root): -- return [os.path.join(sdk_root, 'emulator')] -- - - @template - def check_android_tools(tool, tool_dir): -@@ -108,7 +104,6 @@ def check_android_tools(tool, tool_dir): - - check_android_tools('zipalign', android_build_tools) - check_android_tools('adb', android_platform_tools) --check_android_tools('emulator', android_emulator_path) - - set_config('ANDROID_SDK_ROOT', android_sdk_root) - set_config('ANDROID_TOOLS', android_tools) diff --git a/projects/firefox/build b/projects/firefox/build index 7903bd3..456aa07 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -56,10 +56,6 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig export ASAN_OPTIONS="detect_leaks=0" [% END -%] -[% IF c("var/android-armv7") -%] - cp /var/tmp/dist/android-toolchain/android-ndk/arm/lib64/libclang.so.6 /var/tmp/dist/android-toolchain/android-ndk/arm/lib64/libclang.so -[% END -%] - [% IF c("var/android") %] gradle_repo=/var/tmp/dist/gradle-dependencies export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo" @@ -71,9 +67,9 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig # Move Android library dependencies so they will be included in the apk during the build cp $rootdir/[% c('input_files_by_name/topl') %]/* mobile/android/app cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* mobile/android/app - # Apply patches - patch -p1 < $rootdir/android-packages.patch - patch -p1 < $rootdir/android-remove-emulator.patch + # Move emulator to location that firefox build expects + mkdir /var/tmp/dist/android-toolchain/android-sdk-linux/emulator + cp /var/tmp/dist/android-toolchain/android-sdk-linux/tools/emulator /var/tmp/dist/android-toolchain/android-sdk-linux/emulator # Prepare building the multi-locale .apk including our own strings mkdir -p /var/tmp/dist/locales diff --git a/projects/firefox/config b/projects/firefox/config index 9da579a..63d2652 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -179,15 +179,9 @@ input_files: - project: tor-onion-proxy-library name: topl enable: '[% c("var/android") %]' - - filename: android-packages.patch - enable: '[% c("var/android") %]' - - filename: android-remove-emulator.patch - enable: '[% c("var/android") %]' - project: firefox-locale-bundle name: firefox-locale-bundle enable: '[% c("var/android") %]' - project: tba-translation name: tba-translation enable: '[% c("var/android") %]' - - filename: 1527534.patch - enable: '[% c("var/android") %]'

1 0

[tor-browser-build/master] Add missing item to Changelog
by gk＠torproject.org 11 Oct '19

11 Oct '19

commit a116493b811c499dd4ff9cf8cec18db458b4b738 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 11 06:51:48 2019 +0000 Add missing item to Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 3499f94..519e228 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -116,6 +116,7 @@ Tor Browser 9.0a6 -- September 4 2019 * Android * Bug 31010: Rebase mobile patches for Fennec 68 * Bug 31010: Don't use addTrustedTab() on mobile + * Bug 30607: Support Tor Browser running on Android Q * Build System: * All Platforms: * Bug 30585: Provide standalone clang 8 project across all platforms

1 0

[tor-browser-spec/master] Update notes based on GeKo's comments.
by mikeperry＠torproject.org 11 Oct '19

11 Oct '19

commit d25eeb661b9d4975a1a7868f07d333b5332d39dd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 10 19:13:10 2019 -0500 Update notes based on GeKo's comments. --- audits/FF68_NETWORK_AUDIT | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/audits/FF68_NETWORK_AUDIT b/audits/FF68_NETWORK_AUDIT index f8965cb..93b0c9a 100644 --- a/audits/FF68_NETWORK_AUDIT +++ b/audits/FF68_NETWORK_AUDIT @@ -155,8 +155,9 @@ _SOCKET + Looks benign and also not new UDPSocket - - XXX: devtools debugger discovery still uses it + - devtools debugger discovery still uses it - ./devtools/shared/discovery/discovery.js + + Disabled via pref in #18546 + webrtc moved code + dom.udpsocket.enabled still false - fallback multicastDNS uses it (not new) @@ -167,14 +168,15 @@ TCPSocket SocketTransport + IOactivityMonitor, NetworkActivityMonitor? (old) - - XXX: presentation control service? I think this is old but moved + - presentation control service? I think this is old but moved - dom/presentation/PresentationTCPSessionTransport.cpp - - App to app service.. + + Patched - Dashboard - netwerk/base/Dashboard.cpp + Only examine opened sockets and cached DNS - - XXX: Roku control (old) + - Roku control (old) - ./toolkit/modules/secondscreen/RokuApp.jsm + + patched - NetworkConnectivityService?? This looks new - ./netwerk/base/NetworkConnectivityService.cpp + Uses DNS service and nsIChannels.. Proxy safe @@ -228,7 +230,7 @@ Android Java calls + ch.boye.httpclientandroidlib.impl.client.* (look for execute() calls) + BaseResource.java (is this proxied? Who calls this?) + Lots of consumers.. - - XXX: Patch going back in: https://bugs.torproject.org/31934 + + Patch going back in: https://bugs.torproject.org/31934 + leanplum (disabled) + Adjust SDK uses execute directly + https://bugs.torproject.org/25906 disabled

1 0