- tbb-commits - lists.torproject.org

[tor-launcher/maint-0.2.9] fixup! Bug 13252 - Do not store data in the app bundle
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit 4442562704fc5df803cd0134209e5cacad29cb12 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Mar 25 10:08:15 2016 -0400 fixup! Bug 13252 - Do not store data in the app bundle Mac OS: account for the fact that user data is sometimes stored under ~/Library/Application Support/TorBrowser-Data. --- src/components/tl-process.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 7adb5a7..aba6456 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -801,12 +801,13 @@ TorProcessService.prototype = if (this.mIsUserDataOutsideOfAppDir == undefined) { // Determine if we are using a "side-by-side" data model by checking - // for the existence of the TorBrowser-Data/ directory. + // whether the user profile is outside of the app directory. try { - let f = this._appDir.parent; - f.append("TorBrowser-Data"); - this.mIsUserDataOutsideOfAppDir = f.exists() && f.isDirectory(); + let ds = Cc["@mozilla.org/file/directory_service;1"] + .getService(Ci.nsIProperties); + let profDir = ds.get("ProfD", Ci.nsIFile); + this.mIsUserDataOutsideOfAppDir = !this._appDir.contains(profDir); } catch (e) { @@ -860,14 +861,16 @@ TorProcessService.prototype = }, // get _appDir // Returns an nsIFile that points to the TorBrowser-Data/ directory. + // This function is only used when this._isUserDataOutsideOfAppDir == true. // May throw. get _dataDir() { if (!this.mDataDir) { - let f = this._appDir.parent.clone(); - f.append("TorBrowser-Data"); - this.mDataDir = f; + let ds = Cc["@mozilla.org/file/directory_service;1"] + .getService(Ci.nsIProperties); + let profDir = ds.get("ProfD", Ci.nsIFile); + this.mDataDir = profDir.parent.parent; } return this.mDataDir;

1 0

[tor-launcher/master] Bug 10534: Let's not advertise help desk emails directly
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit 3635ee8a79bc1ef6457250082d3937d7f1633911 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 12 11:27:10 2016 -0400 Bug 10534: Let's not advertise help desk emails directly Do not display the help(a)rt.torproject.org email address (currently, no one is responding to help desk email). In the wizard and network settings window, point users to torproject.org/about/contact.html#support for assistance. --- src/chrome/content/network-settings-overlay.xul | 4 +++- src/chrome/content/network-settings.js | 8 +++++--- src/chrome/locale/en/network-settings.dtd | 2 +- src/chrome/locale/en/torlauncher.properties | 1 + 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index af9ddf9..10751d1 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -118,10 +118,12 @@ <html:div>&torsettings.bridgeHelp3.emailDesc;</html:div> <html:div>&torsettings.bridgeHelp3.emailList;</html:div> </html:li> + </html:ol> </vbox> <panel id="copyLogFeedbackPanel" type="arrow" fade="slow" diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index d145f77..e0d7d1c 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1,4 +1,4 @@ -// Copyright (c) 2015, The Tor Project, Inc. +// Copyright (c) 2016, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -23,7 +23,9 @@ const kPrefDefaultBridgeRecommendedType = "extensions.torlauncher.default_bridge_recommended_type"; const kPrefDefaultBridgeType = "extensions.torlauncher.default_bridge_type"; -const kSupportAddr = "help(a)rt.torproject.org"; +// As of April 2016, no one is responding to help desk email. Hopefully this will change soon. +//const kSupportAddr = "help(a)rt.torproject.org"; +const kSupportURL = "torproject.org/about/contact.html#support"; const kTorProcessReadyTopic = "TorProcessIsReady"; const kTorProcessExitedTopic = "TorProcessExited"; @@ -89,7 +91,7 @@ function initDialogCommon(aHasQuitButton) if (forAssistance) { forAssistance.textContent = TorLauncherUtil.getFormattedLocalizedString( - "forAssistance", [kSupportAddr], 1); + "forAssistance2", [kSupportURL], 1); } if (aHasQuitButton) diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 75ece3b..0d2e9dc 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 0ef4437..6b471a3 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.

1 0

[tor-launcher/maint-0.2.7] Bug 10534: Let's not advertise help desk emails directly
by gk＠torproject.org 21 Apr '16

21 Apr '16

commit 7c51ef35a36ede48dd00d2269d5a953ab150b217 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 12 11:27:10 2016 -0400 Bug 10534: Let's not advertise help desk emails directly Do not display the help(a)rt.torproject.org email address (currently, no one is responding to help desk email). In the wizard and network settings window, point users to torproject.org/about/contact.html#support for assistance. --- src/chrome/content/network-settings-overlay.xul | 4 +++- src/chrome/content/network-settings.js | 8 +++++--- src/chrome/locale/en/network-settings.dtd | 2 +- src/chrome/locale/en/torlauncher.properties | 1 + 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index af9ddf9..10751d1 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -118,10 +118,12 @@ <html:div>&torsettings.bridgeHelp3.emailDesc;</html:div> <html:div>&torsettings.bridgeHelp3.emailList;</html:div> </html:li> + </html:ol> </vbox> <panel id="copyLogFeedbackPanel" type="arrow" fade="slow" diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index e4ebeaa..561f0b4 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1,4 +1,4 @@ -// Copyright (c) 2015, The Tor Project, Inc. +// Copyright (c) 2016, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -19,7 +19,9 @@ const kPrefDefaultBridgeRecommendedType = "extensions.torlauncher.default_bridge_recommended_type"; const kPrefDefaultBridgeType = "extensions.torlauncher.default_bridge_type"; -const kSupportAddr = "help(a)rt.torproject.org"; +// As of April 2016, no one is responding to help desk email. Hopefully this will change soon. +//const kSupportAddr = "help(a)rt.torproject.org"; +const kSupportURL = "torproject.org/about/contact.html#support"; const kTorProcessReadyTopic = "TorProcessIsReady"; const kTorProcessExitedTopic = "TorProcessExited"; @@ -76,7 +78,7 @@ function initDialog() if (forAssistance) { forAssistance.textContent = TorLauncherUtil.getFormattedLocalizedString( - "forAssistance", [kSupportAddr], 1); + "forAssistance2", [kSupportURL], 1); } var cancelBtn = document.documentElement.getButton("cancel"); diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 07d3d09..9939cdb 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -54,7 +54,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 02be756..15d965c 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -36,6 +36,7 @@ torlauncher.quit_win=Exit torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance2=For assistance, visit %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 20 Apr '16

20 Apr '16

commit 08b28fedbf5eb3a57fb1f5a2e38a830366d5f78d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Apr 20 11:12:20 2016 -0400 fixup! TB4: Tor Browser's Firefox preference overrides. Disable the WebGL failIfMajorPerformanceCaveat feature because it can be used as a fingerprinting vector (bug 18603). --- 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 15f7d14..4935bcd 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -101,6 +101,7 @@ pref("privacy.trackingprotection.pbmode.enabled", false); // Fingerprinting pref("webgl.min_capability_mode", true); pref("webgl.disable-extensions", true); +pref("webgl.disable-fail-if-major-performance-caveat", true); pref("dom.battery.enabled", false); // fingerprinting due to differing OS implementations pref("dom.network.enabled",false); // fingerprinting due to differing OS implementations pref("browser.display.max_font_attempts",10);

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 20 Apr '16

20 Apr '16

commit 5d9a6f8007e36a0276f3333fd5bcad2ffe69a2f7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 20 09:35:56 2016 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Disabling additional startup URLs (bug 18848) --- 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 3b859bc..15f7d14 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -8,6 +8,9 @@ pref("browser.search.update", false); pref("browser.rights.3.shown", true); pref("startup.homepage_welcome_url", ""); +pref("startup.homepage_welcome_url.additional", ""); +// Not set Windows 10 users would get a special introduction on first start. +pref("browser.usedOnWindows10", true); // Set a generic, default URL that will be opened in a tab after an update. // Typically, this will not be used; instead, the <update> element within

1 0

[tor-browser-bundle/master] Bug 16224: No need to set BUILD_HOSTNAME anymore
by gk＠torproject.org 20 Apr '16

20 Apr '16

commit aa737d315bab537d94a14d7f2dca16d7b54edc38 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 19 08:58:05 2016 +0000 Bug 16224: No need to set BUILD_HOSTNAME anymore Mozilla got rid of exposing the hostname of the machine that built Firefox in https://bugzilla.mozilla.org/show_bug.cgi?id=1168316. We therefore don't need to set it anymore to avoid reproducibility issues. --- gitian/descriptors/linux/gitian-firefox.yml | 2 +- gitian/descriptors/mac/gitian-firefox.yml | 2 +- gitian/descriptors/windows/gitian-firefox.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index b206bf5..22dcbd4 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -115,7 +115,7 @@ script: | export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" export FAKETIME_SKIP_CMDS="python2.7,bash,make" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build + make $MAKEOPTS -f client.mk build # Packaging is broken with libfaketime enabled, thus we disable it again. See # #12461 comments 11 and 12 for details. export LD_PRELOAD="" diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 601a095..17c4c8b 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -76,7 +76,7 @@ script: | # stall otherwise right at the beginning. See #13877 for details. export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" export FAKETIME_SKIP_CMDS="python2.7,rsync,make" - make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build + make $MAKEOPTS -f client.mk build # make -C obj-macos package INNER_MAKE_PACKAGE=true cp -a obj-macos/dist/firefox/* $INSTDIR diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 7358922..2686c5f 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -100,7 +100,7 @@ script: | # stall otherwise right at the beginning. See #13877 for details. export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" export FAKETIME_SKIP_CMDS="python2.7,make" - make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build + make $MAKEOPTS -f client.mk build # make -C obj-* package INNER_MAKE_PACKAGE=true cp -a obj-*/dist/firefox/* $INSTDIR/Browser/

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] fixup! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit 833436c0e36649d47df22567b23343c76985243a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 31 12:43:33 2016 +0000 fixup! TB3: Tor Browser's official .mozconfigs. Bug 18331: Update .mozconfig for new cross-compiler --- .mozconfig-mac | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/.mozconfig-mac b/.mozconfig-mac index dc77c3b..c5ca087 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -1,28 +1,45 @@ -CROSS_COMPILE=1 +# ld needs libLTO.so from llvm +mk_add_options "export LD_LIBRARY_PATH=$topsrcdir/clang/lib" -SYSROOTDIR="$HOME/build/MacOSX10.7.sdk" -CROSS_PRIVATE_FRAMEWORKS="$SYSROOTDIR/System/Library/PrivateFrameworks" -ROOTDIR="$HOME/build/x-tools/x86_64-apple-darwin10/bin" -TOOLCHAIN_PREFIX="$ROOTDIR/x86_64-apple-darwin10-" +CROSS_CCTOOLS_PATH=$topsrcdir/cctools +CROSS_SYSROOT=$topsrcdir/MacOSX10.7.sdk +CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks +FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT" -FLAGS="-arch x86_64 -isysroot $SYSROOTDIR" -CC="$ROOTDIR/x86_64-apple-darwin10-clang $FLAGS" -CXX="$ROOTDIR/x86_64-apple-darwin10-clang++ $FLAGS" +export CC="$topsrcdir/clang/bin/clang $FLAGS" +export CXX="$topsrcdir/clang/bin/clang++ $FLAGS" +export CPP="$topsrcdir/clang/bin/clang $FLAGS -E" +export LLVMCONFIG=$topsrcdir/clang/bin/llvm-config +export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip" +export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin10- +#TODO: bug 1184202 - would be nice if these could be detected with TOOLCHAIN_PREFIX automatically +export AR=${TOOLCHAIN_PREFIX}ar +export RANLIB=${TOOLCHAIN_PREFIX}ranlib +export STRIP=${TOOLCHAIN_PREFIX}strip +export OTOOL=${TOOLCHAIN_PREFIX}otool +export DSYMUTIL=$topsrcdir/clang/bin/llvm-dsymutil + +export HOST_CC="$topsrcdir/clang/bin/clang" +export HOST_CXX="$topsrcdir/clang/bin/clang++" +export HOST_CPP="$topsrcdir/clang/bin/clang -E" +export HOST_CFLAGS="-g" +export HOST_CXXFLAGS="-g" +export HOST_LDFLAGS="-g" + +ac_add_options --target=x86_64-apple-darwin +ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-macos mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 -ac_add_options --target=x86_64-apple-darwin10 ac_add_options --enable-application=browser ac_add_options --enable-strip ac_add_options --enable-official-branding ac_add_options --enable-optimize ac_add_options --disable-debug -ac_add_options --with-macos-private-frameworks="$CROSS_PRIVATE_FRAMEWORKS" - ac_add_options --enable-tor-browser-data-outside-app-dir ac_add_options --enable-tor-browser-update ac_add_options --enable-update-packaging

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit be482a800166d85c2f52d39f34c1d620abc07c87 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 19 13:31:25 2016 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. We disable Selfsupport and Unified Telemetry (and set another datareporting URL to "data:text/plain,"). This is bug 18738. --- browser/app/profile/000-tor-browser.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 6ec7c26..3b859bc 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -72,6 +72,10 @@ pref("datareporting.policy.dataSubmissionEnabled", false); // Don't fetch a localized remote page that Tor Browser interacts with, see // #16727. And, yes, it is "reportUrl" and not "reportURL". pref("datareporting.healthreport.about.reportUrl", "data:text/plain,"); +// Make sure Selfsupport and Unified Telemetry are really disabled, see: #18738. +pref("datareporting.healthreport.about.reportUrlUnified", "data:text/plain,"); +pref("browser.selfsupport.enabled", false); +pref("toolkit.telemetry.unified", false); pref("security.mixed_content.block_active_content", false); // Disable until https://bugzilla.mozilla.org/show_bug.cgi?id=878890 is patched pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}"); // Don't promote sync pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs with other browsers

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit 60916de81de12775e7d172b0cb46b9d71b3f6736 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 18 13:59:00 2016 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Enforce SHA1 deprecation (bug 18042) --- 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 7d05149..6ec7c26 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -268,6 +268,9 @@ pref("security.tls.unrestricted_rc4_fallback", false); // Enforce certificate pinning, see: https://bugs.torproject.org/16206 pref("security.cert_pinning.enforcement_level", 2); +// Enforce SHA1 deprecation, see: bug 18042. +pref("security.pki.sha1_enforcement_level", 2); + // Workaround for https://bugs.torproject.org/13579. Progress on // `about:downloads` is only shown if the following preference is set to `true` // in case the download panel got removed from the toolbar.

1 0

[tor-browser/tor-browser-45.0.2esr-6.x-1] Bug 13419: Fix ICU cross-compilation for Windows
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit 76b0760ee1315c1d726673d99ecd3f277671132b Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 18 09:27:11 2016 +0000 Bug 13419: Fix ICU cross-compilation for Windows This patch fixes bug 16874 and 18767 as well. --- .mozconfig-mingw | 3 --- build/autoconf/icu.m4 | 4 ---- config/external/icu/Makefile.in | 2 +- intl/icu/source/config/mh-mingw | 4 ++-- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.mozconfig-mingw b/.mozconfig-mingw index 392a910..c40881c 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -18,9 +18,6 @@ ac_add_options --enable-update-packaging ac_add_options --enable-signmar ac_add_options --enable-verify-mar -# ICU seems still to have cross-compiling issues: -# https://bugzilla.mozilla.org/show_bug.cgi?id=1019744#c19 -ac_add_options --without-intl-api # We can't build the sandbox code with mingw-w64: # https://bugzilla.mozilla.org/show_bug.cgi?id=1042426 ac_add_options --disable-sandbox diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4 index 65d10cd..ada0ed6 100644 --- a/build/autoconf/icu.m4 +++ b/build/autoconf/icu.m4 @@ -79,10 +79,6 @@ if test -n "$USE_ICU"; then fi MOZ_ICU_VERSION="$version" - if test "$OS_TARGET" = WINNT; then - MOZ_SHARED_ICU=1 - fi - if test -z "${JS_STANDALONE}" -a -n "${JS_SHARED_LIBRARY}${MOZ_NATIVE_ICU}"; then MOZ_SHARED_ICU=1 fi diff --git a/config/external/icu/Makefile.in b/config/external/icu/Makefile.in index 7781b23..b6a57eb 100644 --- a/config/external/icu/Makefile.in +++ b/config/external/icu/Makefile.in @@ -26,7 +26,7 @@ ifdef USE_ICU else # !MOZ_SHARED_ICU ifeq ($(OS_ARCH),WINNT) ICU_LIB_RENAME = $(foreach libname,$(ICU_LIB_NAMES),\ - cp -p $(DEPTH)/intl/icu/target/lib/s$(libname)$(MOZ_ICU_DBG_SUFFIX).lib $(DEPTH)/intl/icu/target/lib/$(libname)$(MOZ_ICU_DBG_SUFFIX).lib;) + cp -p $(DEPTH)/intl/icu/target/lib/libs$(libname)$(MOZ_ICU_DBG_SUFFIX).a $(DEPTH)/intl/icu/target/lib/lib$(libname)$(MOZ_ICU_DBG_SUFFIX).a;) endif endif # MOZ_SHARED_ICU endif # !MOZ_NATIVE_ICU diff --git a/intl/icu/source/config/mh-mingw b/intl/icu/source/config/mh-mingw index 5e6acad..9559c10 100644 --- a/intl/icu/source/config/mh-mingw +++ b/intl/icu/source/config/mh-mingw @@ -66,13 +66,13 @@ SO_TARGET_VERSION_SUFFIX = endif # Static library prefix and file extension -LIBSICU = lib$(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) +LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) A = a ## An import library is needed for z/OS and MSVC IMPORT_LIB_EXT = .dll.a -LIBPREFIX= +LIBPREFIX=lib # Change the stubnames so that poorly working FAT disks and installation programs can work. # This is also for backwards compatibility.

1 0