April 2017 - tor-commits - lists.torproject.org

[sandboxed-tor-browser/master] Bug 21927: Remove the ability to install/update the hardened bundle.
by yawning＠torproject.org 12 Apr '17

12 Apr '17

commit dc0ca5edeea0c9e17b94444cd3d941502ac1d57f Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed Apr 12 17:59:54 2017 +0000 Bug 21927: Remove the ability to install/update the hardened bundle. This removes the `hardened` bundle from install/update related metadata assets. New installs will no longer provide the user the option to install the `hardened` channel, and the update check will fail due to lack of an update URL. --- ChangeLog | 1 + data/installer/urls.json | 12 ++++-------- data/ui/channels.json | 2 +- data/ui/locales.json | 3 +-- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5331f4f..20cae09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ Changes in version 0.0.4 - UNRELEASED: + * Bug 21927: Remove the ability to install/update the hardened bundle. * Bug 21244: Update the MAR signing key for 7.0. * Bug 21536: Remove asn's scramblesuit bridge from Tor Browser. * Fix compilation with Go 1.8. diff --git a/data/installer/urls.json b/data/installer/urls.json index bbfcdeb..7223654 100644 --- a/data/installer/urls.json +++ b/data/installer/urls.json @@ -1,22 +1,18 @@ { "downloadsURLs": { "release": "https://aus1.torproject.org/torbrowser/update_2/release/downloads.json", - "alpha": "https://aus1.torproject.org/torbrowser/update_2/alpha/downloads.json", - "hardened": "https://aus1.torproject.org/torbrowser/update_2/hardened/downloads.json" + "alpha": "https://aus1.torproject.org/torbrowser/update_2/alpha/downloads.json" }, "downloadsOnions": { "release": "http://x3nelbld33llasqv.onion/torbrowser/update_2/release/downloads.json", - "alpha": "http://x3nelbld33llasqv.onion/torbrowser/update_2/alpha/downloads.json", - "hardened": "http://x3nelbld33llasqv.onion/torbrowser/update_2/hardened/downloads.json" + "alpha": "http://x3nelbld33llasqv.onion/torbrowser/update_2/alpha/downloads.json" }, "updateURLs": { "release": "https://aus1.torproject.org/torbrowser/update_2/release", - "alpha": "https://aus1.torproject.org/torbrowser/update_2/alpha", - "hardened": "https://aus1.torproject.org/torbrowser/update_2/hardened" + "alpha": "https://aus1.torproject.org/torbrowser/update_2/alpha" }, "updateOnions": { "release": "http://x3nelbld33llasqv.onion/torbrowser/update_2/release", - "alpha": "http://x3nelbld33llasqv.onion/torbrowser/update_2/alpha", - "hardened": "http://x3nelbld33llasqv.onion/torbrowser/update_2/hardened" + "alpha": "http://x3nelbld33llasqv.onion/torbrowser/update_2/alpha" } } diff --git a/data/ui/channels.json b/data/ui/channels.json index 8e78f46..5dfbd9f 100644 --- a/data/ui/channels.json +++ b/data/ui/channels.json @@ -1,3 +1,3 @@ { - "linux64": [ "release", "alpha", "hardened" ] + "linux64": [ "release", "alpha" ] } diff --git a/data/ui/locales.json b/data/ui/locales.json index ec48d2b..42adfac 100644 --- a/data/ui/locales.json +++ b/data/ui/locales.json @@ -1,5 +1,4 @@ { "release": [ "en-US", "ar", "de", "es-ES", "fa", "fr", "it", "ja", "ko", "nl", "pl", "pt-PT", "ru", "tr", "vi", "zh-CN" ], - "alpha": [ "en-US", "ar", "de", "es-ES", "fa", "fr", "it", "ja", "ko", "nl", "pl", "pt-PT", "ru", "tr", "vi", "zh-CN" ], - "hardened": [ "ALL"] + "alpha": [ "en-US", "ar", "de", "es-ES", "fa", "fr", "it", "ja", "ko", "nl", "pl", "pt-PT", "ru", "tr", "vi", "zh-CN" ] }

1 0

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 12 Apr '17

12 Apr '17

commit 7ead3b56d2efde3e00c30c50cac4997532d2a41a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 12 15:48:12 2017 +0000 Update translations for tails-greeter-2_completed --- es/es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es/es.po b/es/es.po index 83859a6..f512127 100644 --- a/es/es.po +++ b/es/es.po @@ -243,7 +243,7 @@ msgstr "Activada (predeterminado) " #: ../data/greeter.ui.h:49 msgid "_Network Connection" -msgstr "_Conexión de red" +msgstr "Conexiones de red" #: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:382 msgid "Direct (default)" @@ -251,7 +251,7 @@ msgstr "Directa (predeterminado) " #: ../data/greeter.ui.h:51 msgid "_Windows Camouflage" -msgstr "_Camuflaje como Windows" +msgstr "Camuflar como Windows" #: ../tailsgreeter/gui.py:388 msgid "Bridge & Proxy" @@ -291,7 +291,7 @@ msgstr "Cerrar " #: ../tailsgreeter/gui.py:721 msgid "_Start Tails" -msgstr "_Iniciar Tails" +msgstr "Iniciar Tails " #. Translators: translate to default:RTL if your language #. is written from right to left

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 12 Apr '17

12 Apr '17

commit 8076b11c3a5258b23f34e298967dd3e3369cafbc Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 12 15:48:07 2017 +0000 Update translations for tails-greeter-2 --- es/es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es/es.po b/es/es.po index 83859a6..f512127 100644 --- a/es/es.po +++ b/es/es.po @@ -243,7 +243,7 @@ msgstr "Activada (predeterminado) " #: ../data/greeter.ui.h:49 msgid "_Network Connection" -msgstr "_Conexión de red" +msgstr "Conexiones de red" #: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:382 msgid "Direct (default)" @@ -251,7 +251,7 @@ msgstr "Directa (predeterminado) " #: ../data/greeter.ui.h:51 msgid "_Windows Camouflage" -msgstr "_Camuflaje como Windows" +msgstr "Camuflar como Windows" #: ../tailsgreeter/gui.py:388 msgid "Bridge & Proxy" @@ -291,7 +291,7 @@ msgstr "Cerrar " #: ../tailsgreeter/gui.py:721 msgid "_Start Tails" -msgstr "_Iniciar Tails" +msgstr "Iniciar Tails " #. Translators: translate to default:RTL if your language #. is written from right to left

1 0

[tor-browser/tor-browser-45.8.0esr-6.5-2] Bug 21795: Fix github.com crashes on Windows
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit fd67e2869611a961893a868fa0891cf4ded173eb Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 12 11:15:40 2017 +0000 Bug 21795: Fix github.com crashes on Windows This is https://bugzilla.mozilla.org/show_bug.cgi?id=1351278 --- js/src/jit/IonBuilder.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/js/src/jit/IonBuilder.cpp b/js/src/jit/IonBuilder.cpp index 9e70e24..34520b3 100644 --- a/js/src/jit/IonBuilder.cpp +++ b/js/src/jit/IonBuilder.cpp @@ -6366,7 +6366,12 @@ IonBuilder::jsop_funapply(uint32_t argc) if (argument->type() != MIRType_MagicOptimizedArguments) { // Optimize fun.apply(self, array) if the length is sane and there are no holes. TemporaryTypeSet* objTypes = argument->resultTypeSet(); - if (native && native->isNative() && native->native() == fun_apply && +#ifdef XP_WIN + bool opt = false; +#else + bool opt = true; +#endif + if (opt && native && native->isNative() && native->native() == fun_apply && objTypes && objTypes->getKnownClass(constraints()) == &ArrayObject::class_ && !objTypes->hasObjectFlags(constraints(), OBJECT_FLAG_LENGTH_OVERFLOW) &&

1 0

[tor-launcher/master] Bug 21920: Don't show locale selection dialog
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit afb9893b7626ce819d7b2b571a847d44277971f6 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 12 10:23:38 2017 +0000 Bug 21920: Don't show locale selection dialog The locale selection dialog was one of the features we included in the hardened series. It is not needed on the alpha or stable channel. We therefore disable it, keeping the code as we might be able to resue it for #17400 later on. --- src/modules/tl-util.jsm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 2f8d14e..0d33267 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -290,7 +290,10 @@ let TorLauncherUtil = // Public get shouldPromptForLocale() { - const kPrefPromptForLocale = "extensions.torlauncher.prompt_for_locale"; + // We are not supporting locale selection on the alpha/stable channel + // right now. Thus, no prompt for the user. + return false; + /* const kPrefPromptForLocale = "extensions.torlauncher.prompt_for_locale"; try { const kEnvSkipLocalePrompt = "TOR_SKIP_LOCALE_PROMPT"; @@ -301,7 +304,7 @@ let TorLauncherUtil = // Public return ("1" != env.get(kEnvSkipLocalePrompt)); } catch(e) {} - return this.getBoolPref(kPrefPromptForLocale, true); + return this.getBoolPref(kPrefPromptForLocale, true); */ }, get shouldShowNetworkSettings()

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 12 Apr '17

12 Apr '17

commit 276347819c5f252d9cf4b22b81c748f094e0cb96 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 12 12:46:13 2017 +0000 Update translations for tor-launcher-network-settings_completed --- ar/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ar/network-settings.dtd b/ar/network-settings.dtd index 73be5a2..a20acd8 100644 --- a/ar/network-settings.dtd +++ b/ar/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "إعدادات الشبكة"> +<!ENTITY torsettings.dialog.title "إعدادات شبكة تور">  <!ENTITY torlauncher.localePicker.title "لغة متصفح تور">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 12 Apr '17

12 Apr '17

commit ed945b712307a0716545df6aee2f478a080880e9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 12 12:46:07 2017 +0000 Update translations for tor-launcher-network-settings --- ar/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ar/network-settings.dtd b/ar/network-settings.dtd index 73be5a2..a20acd8 100644 --- a/ar/network-settings.dtd +++ b/ar/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "إعدادات الشبكة"> +<!ENTITY torsettings.dialog.title "إعدادات شبكة تور">  <!ENTITY torlauncher.localePicker.title "لغة متصفح تور">

1 0

[tor-browser-build/master] Update tor-browser.git commit
by boklm＠torproject.org 12 Apr '17

12 Apr '17

commit 2603af6dee70233dcc30f8717ee48a2b0121ff04 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 12 10:57:28 2017 +0200 Update tor-browser.git commit --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 7e685e7..0b8995b 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -2,7 +2,7 @@ version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' ## There is no signed tag yet, so we use a fixed commit -git_hash: 47fa36dc780f4962102205b390e18ce9ef74b1b9 +git_hash: 4c6219dc621d139cd39e8aaca578dd69b9c063d0 #git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' #tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 21907: Fix runtime error on CentOS 6
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit 4c6219dc621d139cd39e8aaca578dd69b9c063d0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 10 16:07:23 2017 +0200 Bug 21907: Fix runtime error on CentOS 6 In Mozilla bug 1324780, support for building with glib 2.28 (the version available in CentOS 6) was added. However we are building on Debian Wheezy which has glib 2.32. We fix that by backing out all glib > 2.28 code paths. --- gfx/harfbuzz/src/hb-glib.cc | 41 ----------------------------------------- gfx/harfbuzz/src/hb-glib.h | 5 ----- 2 files changed, 46 deletions(-) diff --git a/gfx/harfbuzz/src/hb-glib.cc b/gfx/harfbuzz/src/hb-glib.cc index 2b91b5b..0971ca2 100644 --- a/gfx/harfbuzz/src/hb-glib.cc +++ b/gfx/harfbuzz/src/hb-glib.cc @@ -33,7 +33,6 @@ #include "hb-unicode-private.hh" -#if !GLIB_CHECK_VERSION(2,29,14) static const hb_script_t glib_script_to_script[] = { @@ -155,14 +154,10 @@ glib_script_to_script[] = HB_SCRIPT_SORA_SOMPENG, HB_SCRIPT_TAKRI }; -#endif hb_script_t hb_glib_script_to_script (GUnicodeScript script) { -#if GLIB_CHECK_VERSION(2,29,14) - return (hb_script_t) g_unicode_script_to_iso15924 (script); -#else if (likely ((unsigned int) script < ARRAY_LENGTH (glib_script_to_script))) return glib_script_to_script[script]; @@ -170,15 +165,11 @@ hb_glib_script_to_script (GUnicodeScript script) return HB_SCRIPT_INVALID; return HB_SCRIPT_UNKNOWN; -#endif } GUnicodeScript hb_glib_script_from_script (hb_script_t script) { -#if GLIB_CHECK_VERSION(2,29,14) - return g_unicode_script_from_iso15924 (script); -#else unsigned int count = ARRAY_LENGTH (glib_script_to_script); for (unsigned int i = 0; i < count; i++) if (glib_script_to_script[i] == script) @@ -188,7 +179,6 @@ hb_glib_script_from_script (hb_script_t script) return G_UNICODE_SCRIPT_INVALID_CODE; return G_UNICODE_SCRIPT_UNKNOWN; -#endif } @@ -243,10 +233,6 @@ hb_glib_unicode_compose (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_codepoint_t *ab, void *user_data HB_UNUSED) { -#if GLIB_CHECK_VERSION(2,29,12) - return g_unichar_compose (a, b, ab); -#endif - /* We don't ifdef-out the fallback code such that compiler always * sees it and makes sure it's compilable. */ @@ -280,10 +266,6 @@ hb_glib_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_codepoint_t *b, void *user_data HB_UNUSED) { -#if GLIB_CHECK_VERSION(2,29,12) - return g_unichar_decompose (ab, a, b); -#endif - /* We don't ifdef-out the fallback code such that compiler always * sees it and makes sure it's compilable. */ @@ -339,10 +321,6 @@ hb_glib_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_codepoint_t *decomposed, void *user_data HB_UNUSED) { -#if GLIB_CHECK_VERSION(2,29,12) - return g_unichar_fully_decompose (u, true, decomposed, HB_UNICODE_MAX_DECOMPOSITION_LEN); -#endif - /* If the user doesn't have GLib >= 2.29.12 we have to perform * a round trip to UTF-8 and the associated memory management dance. */ gchar utf8[6]; @@ -381,22 +359,3 @@ hb_glib_get_unicode_funcs (void) return const_cast<hb_unicode_funcs_t *> (&_hb_glib_unicode_funcs); } - -#if GLIB_CHECK_VERSION(2,31,10) -/** - * hb_glib_blob_create: - * - * Since: 0.9.38 - **/ -hb_blob_t * -hb_glib_blob_create (GBytes *gbytes) -{ - gsize size = 0; - gconstpointer data = g_bytes_get_data (gbytes, &size); - return hb_blob_create ((const char *) data, - size, - HB_MEMORY_MODE_READONLY, - g_bytes_ref (gbytes), - (hb_destroy_func_t) g_bytes_unref); -} -#endif diff --git a/gfx/harfbuzz/src/hb-glib.h b/gfx/harfbuzz/src/hb-glib.h index 5f04183..4adbd7c 100644 --- a/gfx/harfbuzz/src/hb-glib.h +++ b/gfx/harfbuzz/src/hb-glib.h @@ -46,11 +46,6 @@ hb_glib_script_from_script (hb_script_t script); HB_EXTERN hb_unicode_funcs_t * hb_glib_get_unicode_funcs (void); -#if GLIB_CHECK_VERSION(2,31,10) -HB_EXTERN hb_blob_t * -hb_glib_blob_create (GBytes *gbytes); -#endif - HB_END_DECLS #endif /* HB_GLIB_H */

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 1352305 - Part 1: Making the XULWindow will not be enforecd to be rounded dimensions if it is
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit 9ee872b57e55ae672a30f087cf55bccef18f3646 Author: Tim Huang <tihuang(a)mozilla.com> Date: Mon Apr 10 11:03:22 2017 -0700 Bug 1352305 - Part 1: Making the XULWindow will not be enforecd to be rounded dimensions if it is a window without a primary content when fingerprinting resistance is enabled. r?ehsan This patch making the nsXULWindow::ForceRoundedDimensions() will only be called when this window is a window which has a primary content when fingerprinting resistance is enabled. This will fix the problem that dialog windows are incorrectly resized after fingerprinting resistance is enabled. MozReview-Commit-ID: 6WD6c38CTPv --- xpfe/appshell/nsXULWindow.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xpfe/appshell/nsXULWindow.cpp b/xpfe/appshell/nsXULWindow.cpp index a24318a..604c41a 100644 --- a/xpfe/appshell/nsXULWindow.cpp +++ b/xpfe/appshell/nsXULWindow.cpp @@ -1129,8 +1129,13 @@ void nsXULWindow::OnChromeLoaded() int32_t specWidth = -1, specHeight = -1; bool gotSize = false; + bool isContent = false; - if (nsContentUtils::ShouldResistFingerprinting()) { + GetHasPrimaryContent(&isContent); + + // If this window has a primary content and fingerprinting resistance is + // enabled, we enforce this window to rounded dimensions. + if (isContent && nsContentUtils::ShouldResistFingerprinting()) { ForceRoundedDimensions(); } else if (!mIgnoreXULSize) { gotSize = LoadSizeFromXUL(specWidth, specHeight);

1 0