- tbb-commits - lists.torproject.org

[tor-browser-build/maint-8.0] Bug 27182: set mar_compression to xz for 8.0.1 release
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit e16754013b11c941efe92f19ff2b041fffca8906 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 3 11:47:03 2018 +0200 Bug 27182: set mar_compression to xz for 8.0.1 release --- projects/release/update_responses_config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index d1ed52f..8cac04c 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -48,6 +48,7 @@ versions: win64: minSupportedOSVersion: 6.1 [% IF c("var/release") -%] + mar_compression: xz mar_compression: bzip2 [% ELSE -%] mar_compression: xz

1 0

[tor-browser-build/maint-8.0] Bug 27179: update mar_compression
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit 8955afc1fb84a191268219b7f4c28050585b791a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 17 11:21:22 2018 +0200 Bug 27179: update mar_compression Set mar_compression to xz for the alpha, and bzip2 for the stable. --- projects/release/update_responses_config.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 90fbc3a..d1ed52f 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -47,10 +47,11 @@ versions: minSupportedOSVersion: 6.1 win64: minSupportedOSVersion: 6.1 -[% IF ! c("var/release") -%] - mar_compression: xz -[% END -%] +[% IF c("var/release") -%] mar_compression: bzip2 +[% ELSE -%] +mar_compression: xz +[% END -%] htaccess_rewrite_rules: alpha: | # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory

1 0

[tor-browser-build/maint-8.0] Merge remote-tracking branch 'boklm/bug_27182' into maint-8.0
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit 80410afe4226a0a20feb5f9470e33ae31f1e9f8d Merge: eea6a6a e167540 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 6 10:17:42 2018 +0000 Merge remote-tracking branch 'boklm/bug_27182' into maint-8.0 projects/release/update_responses_config.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

1 0

[tor-browser-build/master] Bug 26411: Stop using old MAR format in the second esr60-based stable release
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit 12d52de1efe093b75a434a10ff0fb8f48fec2858 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 29 17:43:32 2018 +0200 Bug 26411: Stop using old MAR format in the second esr60-based stable release --- Makefile | 6 +++--- projects/tor-browser/build | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index b667960..4c21a83 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ signtag-alpha: submodule-update incrementals-release: submodule-update $(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals tools/update-responses/download_missing_versions release - MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals release + tools/update-responses/gen_incrementals release $(rbm) build release --step hash_incrementals --target release incrementals-alpha: submodule-update @@ -132,9 +132,9 @@ update_responses-alpha: submodule-update dmg2mar-release: submodule-update $(rbm) build release --step update_responses_config --target release --target signed - MAR_OLD_FORMAT=1 $(rbm) build release --step dmg2mar --target release --target signed + $(rbm) build release --step dmg2mar --target release --target signed tools/update-responses/download_missing_versions release - CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals release + CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release dmg2mar-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target signed diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 7211841..4c228a9 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -274,11 +274,6 @@ popd cd $distdir [% IF c("var/build_mar") -%] - [% IF c("var/release") -%] - # Let's use the bzip2 format for now so that users can update to the first - # esr60-based Tor Browser. - export MAR_OLD_FORMAT=1 - [% END -%] # Create full MAR file and compressed package. MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.mar MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "$TBDIR"

1 0

[tor-browser-build/maint-8.0] Bug 26411: Stop using old MAR format in the second esr60-based stable release
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit eea6a6af8765bf1781515fb813a6860ece96fee5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 29 17:43:32 2018 +0200 Bug 26411: Stop using old MAR format in the second esr60-based stable release --- Makefile | 6 +++--- projects/tor-browser/build | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index b667960..4c21a83 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ signtag-alpha: submodule-update incrementals-release: submodule-update $(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals tools/update-responses/download_missing_versions release - MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals release + tools/update-responses/gen_incrementals release $(rbm) build release --step hash_incrementals --target release incrementals-alpha: submodule-update @@ -132,9 +132,9 @@ update_responses-alpha: submodule-update dmg2mar-release: submodule-update $(rbm) build release --step update_responses_config --target release --target signed - MAR_OLD_FORMAT=1 $(rbm) build release --step dmg2mar --target release --target signed + $(rbm) build release --step dmg2mar --target release --target signed tools/update-responses/download_missing_versions release - CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals release + CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release dmg2mar-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target signed diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 5456ad1..219f622 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -266,11 +266,6 @@ popd cd $distdir [% IF c("var/build_mar") -%] - [% IF c("var/release") -%] - # Let's use the bzip2 format for now so that users can update to the first - # esr60-based Tor Browser. - export MAR_OLD_FORMAT=1 - [% END -%] # Create full MAR file and compressed package. MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.mar MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "$TBDIR"

1 0

[tor-browser-build/master] Fix typo in Changelog
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit ad725d869fda953775dc889d40f8a96a8391ff07 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 6 10:03:01 2018 +0000 Fix typo in Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 693a713..7c33834 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -36,7 +36,7 @@ Tor Browser 8.5a1 -- September 5 2018 * Bug 27221: Purge startup cache if Tor Browser version changed * Bug 26049: Reduce delay for showing update prompt to 1 hour * Bug 25405: Cannot use Moat if a meek bridge is configured - * Bug 27268+27257+27262+26603 : Preferences clean-up + * Bug 27268+27257+27262+26603: Preferences clean-up * Windows * Bug 26381: Work around endless loop during page load and about:tor not loading * Bug 27411: Fix broken security slider and NoScript interaction on Windows

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 27400 - Target Android API 26
by gk＠torproject.org 05 Sep '18

05 Sep '18

commit 641dea421ec41553993b92d79a98394ae541f476 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue Sep 4 21:59:41 2018 +0000 Bug 27400 - Target Android API 26 --- old-configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/old-configure.in b/old-configure.in index b740691ab080..6ee9edb5b551 100644 --- a/old-configure.in +++ b/old-configure.in @@ -2084,7 +2084,7 @@ dnl ======================================================== case "$MOZ_BUILD_APP" in mobile/android) - MOZ_ANDROID_SDK(23, 23, 26.0.2, 26.0.0 26.0.0-dev 25.3.2 25.3.1) + MOZ_ANDROID_SDK(26, 26, 26.0.2, 26.0.0 26.0.0-dev 25.3.2 25.3.1) ;; esac

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 27472 - Export MOZILLA_OFFICIAL during Android build
by gk＠torproject.org 05 Sep '18

05 Sep '18

commit bd090e4ef466374ca3c231efa350159f7c0ab96c Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Sep 5 13:38:09 2018 +0000 Bug 27472 - Export MOZILLA_OFFICIAL during Android build --- .mozconfig-android | 1 + 1 file changed, 1 insertion(+) diff --git a/.mozconfig-android b/.mozconfig-android index efcb1c5415c2..45270689fbcd 100755 --- a/.mozconfig-android +++ b/.mozconfig-android @@ -1,6 +1,7 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 ac_add_options --enable-optimize ac_add_options --enable-official-branding

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 27473 - Change app name on Android for Alpha version
by gk＠torproject.org 05 Sep '18

05 Sep '18

commit 3abcd666a37fcf11c3ba01cd628ccd086be5de37 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Sep 5 14:00:01 2018 +0000 Bug 27473 - Change app name on Android for Alpha version --- mobile/android/branding/torbrowser/configure.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/android/branding/torbrowser/configure.sh b/mobile/android/branding/torbrowser/configure.sh index 79b7e718cbfd..5e2dbfc15cf9 100644 --- a/mobile/android/branding/torbrowser/configure.sh +++ b/mobile/android/branding/torbrowser/configure.sh @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -ANDROID_PACKAGE_NAME=org.torproject.torbrowser -MOZ_APP_DISPLAYNAME="Tor Browser for Android" +ANDROID_PACKAGE_NAME=org.torproject.torbrowser_alpha +MOZ_APP_DISPLAYNAME="Tor Browser for Android (Alpha)" MOZ_UPDATER= MOZ_ANDROID_ANR_REPORTER=

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 1479311 - Don't attempt finding and highlighting a tab's base domain within a javascript: URL. r=snorp
by gk＠torproject.org 05 Sep '18

05 Sep '18

commit 4b66110d0704227ee7e90b7adb092da2d3bf0ac5 Author: Jan Henning <jh+bugzilla(a)buttercookie.de> Date: Fri Aug 3 20:58:46 2018 +0200 Bug 1479311 - Don't attempt finding and highlighting a tab's base domain within a javascript: URL. r=snorp MozReview-Commit-ID: DzE0UJfMcCI --HG-- extra : rebase_source : 2a9bcc74447a8a2862aa3c753f7bd30e1d0361dc --- .../src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java b/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java index f7f237eab1cc..9e8e1041027a 100644 --- a/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java +++ b/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java @@ -335,7 +335,7 @@ public class ToolbarDisplayLayout extends ThemedLinearLayout { } int index = url.indexOf(baseDomain); - if (index == -1) { + if (index == -1 || url.startsWith("javascript:")) { setTitle(url); return; }

1 0

[tor-browser-build/master] Release preparations for 8.5a1
by gk＠torproject.org 03 Sep '18

03 Sep '18

commit f237614a4a08f3fa575cb06f0cdd69006a117b8f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 3 09:35:52 2018 +0000 Release preparations for 8.5a1 Version bumps --- projects/firefox/config | 4 ++-- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- rbm.conf | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 124de7a..8ebbd4f 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build3' +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 gpg_keyring: torbutton.gpg @@ -9,7 +9,7 @@ gpg_keyring: torbutton.gpg var: firefox_platform_version: 60.2.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' - torbrowser_branch: 8.0 + torbrowser_branch: 8.5 torbrowser_update_channel: alpha copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 19f16bb..c5ddc0a 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.16.3 +version: 0.2.16.4 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index aeea5e0..c1a3878 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.3.9 +version: 0.3.4.7-rc git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 5cc88e4..cbbbf64 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0' - torbrowser_build: 'build5' + torbrowser_version: '8.5a1' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 7.5.6 + - 8.0a10 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Updating changelog for 8.5a1; typo fixes
by gk＠torproject.org 03 Sep '18

03 Sep '18

commit b58707432f5120b1627964dfdea8feefbe605871 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 3 09:33:13 2018 +0000 Updating changelog for 8.5a1; typo fixes --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 55 ++++++++++++++++++++-- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c46f139..693a713 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,50 @@ +Tor Browser 8.5a1 -- September 5 2018 + * All platforms + * Update Firefox to 60.2.0esr + * Update Tor to 0.3.4.7-rc + * Update OpenSSL to 1.0.2p + * Update Torbutton to 2.0.6 + * Bug 27401: Start listening for NoScript before it loads + * Bug 27276: Adapt to new NoScript messaging protocol + * Bug 26884: Use Torbutton to provide security slider on mobile + * Bug 26962: Circuit display onboarding + * Bug 26520: Fix sec slider/NoScript for TOR_SKIP_LAUNCH=1 + * Bug 26490: Remove the security slider notification + * Bug 27301: Improve about:tor behavior and appearance + * Bug 27097: Add text for Tor News signup widget + * Bug 27214: Improve the onboarding text + * Translations update + * Update Tor Launcher to 0.2.16.4 + * Bug 25405: Cannot use Moat if a meek bridge is configured + * Bug 27392: Update Moat URLs + * Translations update + * Update HTTPS Everywhere to 2018.8.22 + * Update NoScript to 10.1.9.1 + * Bug 26962: New feature onboarding + * Bug 27403: The onboarding bubble is not always displayed + * Bug 27283: Fix first-party isolation for UI tour + * Bug 27213: Update about:tbupdate to new (about:tor) layout + * Bug 26670: Make canvas permission prompt respect first-party isolation + * Bug 26561: .onion images are not displayed + * Bug 21787: Spoof en-US for date picker + * Bug 21607: Disable WebVR for now until it is properly audited + * Bug 21549: Disable wasm for now until it is properly audited + * Bug 26614: Disable Web Authentication API until it is properly audited + * Bug 27281: Enable Reader View mode again + * Bug 26114: Don't expose navigator.mozAddonManager to websites + * Bug 26048: Fix potentially confusing "restart to update" message + * Bug 27221: Purge startup cache if Tor Browser version changed + * Bug 26049: Reduce delay for showing update prompt to 1 hour + * Bug 25405: Cannot use Moat if a meek bridge is configured + * Bug 27268+27257+27262+26603 : Preferences clean-up + * Windows + * Bug 26381: Work around endless loop during page load and about:tor not loading + * Bug 27411: Fix broken security slider and NoScript interaction on Windows + * Build System + * All Platforms + * Bug 27061: Enable verification of langpacks checksums + * Bug 27178+27179: Add support for xz compression in mar files + Tor Browser 8.0 -- September 5 2018 * All platforms * Update Firefox to 60.2.0esr @@ -131,13 +178,13 @@ Tor Browser 8.0 -- September 5 2018 * Bug 20283: Tor Browser should run without a `/proc` filesystem. * Bug 26354: Set SSE2 support as minimal requirement for Tor Browser 8 * Build System - * All + * All Platforms * Bug 26362+26410: Use old MAR format for first ESR60-based stable * Bug 27020: RBM build fails with runc version 1.0.1 * Bug 26949: Use GitHub repository for STIX * Bug 26773: Add --verbose to the ./mach build flag for firefox * Bug 26319: Don't package up Tor Browser in the `mach package` step - * Bug 27178: add support for xz compression in mar files + * Bug 27178: Add support for xz compression in mar files * Clean up * Windows * Bug 26203: Adapt tor-browser-build/tor-browser for Windows @@ -232,7 +279,7 @@ Tor Browser 8.0a10 -- August 20 2018 * Bug 26951+18022: Fix execdesktop argument passing * Bug 26795: Bump snowflake to 6077141f4a for bug 25600 * Build System - * All + * All Platforms * Bug 26410: Stop using old MAR format in the alpha series * Bug 27020: RBM build fails with runc version 1.0.1 * Bug 26949: Use GitHub repository for STIX @@ -303,7 +350,7 @@ Tor Browser 8.0a9 -- June 27 2018 * Bug 22242: Remove RUNPATH in Linux binaries embedded by selfrando * Bug 26354: Set SSE2 support as minimal requirement for Tor Browser 8 * Build System - * All + * All Platforms * Bug 26362: Use old MAR format for first ESR60-based alpha * Clean up * Windows

1 0

[tor-browser-build/master] Bug 25405: cannot use Moat if a meek bridge is configured
by gk＠torproject.org 03 Sep '18

03 Sep '18

commit 98da9295f4f97a022c7131de7234893d0a6293de Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Mar 26 21:10:44 2018 +0000 Bug 25405: cannot use Moat if a meek bridge is configured When doing Moat things, use a separate profile for the secondary browser (instead of trying to use the main meek helper profile). --- projects/tor-browser/build | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 5456ad1..7211841 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -34,6 +34,7 @@ touch "$GENERATEDPREFSPATH" EXTSPATH=TorBrowser/Data/Browser/profile.default/extensions TORCONFIGPATH=TorBrowser/Data/Tor MEEKPROFILEPATH=TorBrowser/Data/Browser/profile.meek-http-helper + MOATPROFILEPATH=TorBrowser/Data/Browser/profile.moat-http-helper mkdir -p "$TBDIR/TorBrowser/Data/Browser/Caches" [% END %] @@ -144,6 +145,13 @@ cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> "$TBDIR/$MEEKPROFILEPATH/u popd [% END %] +# For platforms for which we need to ship a Moat helper profile in addition +# to a meek one, create it by duplicating the meek one that we just finished +# creating. +if [ ! -z "$MOATPROFILEPATH" ]; then + cp -pR $TBDIR/$MEEKPROFILEPATH $TBDIR/$MOATPROFILEPATH +fi + [% IF ! c("var/multi_lingual") %] echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$GENERATEDPREFSPATH" [% END %]

1 0

[tor-launcher/master] Version bump for 0.2.16.4
by gk＠torproject.org 03 Sep '18

03 Sep '18

commit ca35ed6bfbc779d51e62caca5b342b4d7290abea Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 3 09:00:25 2018 +0000 Version bump for 0.2.16.4 --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index bb5ab52..fc8dc41 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.16.3</em:version> + <em:version>0.2.16.4</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-launcher/master] Translations update
by gk＠torproject.org 03 Sep '18

03 Sep '18

commit 8a28a3cfa0e8dfa9ec031c298c789388fcd4693a Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 3 08:59:11 2018 +0000 Translations update --- src/chrome/locale/hi/network-settings.dtd | 66 ++++++++-------- src/chrome/locale/hi/torlauncher.properties | 114 ++++++++++++++-------------- src/chrome/locale/ru/network-settings.dtd | 8 +- 3 files changed, 94 insertions(+), 94 deletions(-) diff --git a/src/chrome/locale/hi/network-settings.dtd b/src/chrome/locale/hi/network-settings.dtd index 702a1fb..35916b5 100644 --- a/src/chrome/locale/hi/network-settings.dtd +++ b/src/chrome/locale/hi/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "टोर संजाल व्यवस्था"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.default "टोर से कनेक्ट करें"> <!ENTITY torsettings.wizard.title.configure "टोर संजाल व्यवस्था"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.connecting "एक कनेक्शन की स्थापना">  <!ENTITY torlauncher.localePicker.title "टोर विचरक भाषा "> @@ -9,54 +9,54 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> -<!ENTITY torSettings.configure "Configure"> +<!ENTITY torSettings.connectPrompt "टोर से कनेक्ट करने के लिए "कनेक्ट" पर क्लिक करें।"> +<!ENTITY torSettings.configurePrompt "नेटवर्क सेटिंग्स को समायोजित करने के लिए "कॉन्फ़िगर करें" पर क्लिक करें यदि आप ऐसे देश में हैं जो सेंसर टोर (जैसे मिस्र, चीन, तुर्की) या यदि आप किसी ऐसे निजी नेटवर्क से कनेक्ट हो रहे हैं जिसके लिए प्रॉक्सी की आवश्यकता है।"> +<!ENTITY torSettings.configure "कॉन्फ़िगर"> <!ENTITY torSettings.connect "जोड़ें">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.startingTor "टोर शुरू करने की प्रतीक्षा कर रहा है ..."> +<!ENTITY torsettings.restartTor "टोर पुनरारंभ करें"> +<!ENTITY torsettings.reconfigTor "पुन: कॉन्फ़िगर"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "आपने टोर ब्रिड्जस को कॉन्फ़िगर किया है या आपने स्थानीय प्रॉक्सी सेटिंग्स   दर्ज की हैं। टोर नेटवर्क से सीधा कनेक्शन बनाने के लिए, इन सेटिंग्स को हटा दिया जाना चाहिए।"> +<!ENTITY torsettings.discardSettings.proceed "सेटिंग्स हटाएँ और कनेक्ट करें"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.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.checkbox "मैं इंटरनेट से कनेक्ट करने के लिए प्रॉक्सी का उपयोग करता हूं"> +<!ENTITY torsettings.useProxy.type "प्रॉक्सी प्रकार:"> +<!ENTITY torsettings.useProxy.type.placeholder "प्रॉक्सी प्रकार का चयन करें"> <!ENTITY torsettings.useProxy.address "पता :"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> +<!ENTITY torsettings.useProxy.address.placeholder "IP पता या मेजबाननाम"> <!ENTITY torsettings.useProxy.port "पोर्ट/द्वार :"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.username "उपयोगकर्ता नाम"> +<!ENTITY torsettings.useProxy.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"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.firewall.checkbox "यह कंप्यूटर फ़ायरवॉल के माध्यम से जाता है जो केवल कुछ पोर्ट्स के कनेक्शन की अनुमति देता है..."> +<!ENTITY torsettings.firewall.allowedPorts "अनुमति प्राप्त पोर्ट्स "> +<!ENTITY torsettings.useBridges.checkbox "टोर मेरे देश में सेंसर किया गया है"> +<!ENTITY torsettings.useBridges.default "एक अंतर्निर्मित पुल का चयन करें"> +<!ENTITY torsettings.useBridges.default.placeholder "एक पुल का चयन करें"> +<!ENTITY torsettings.useBridges.bridgeDB "Torproject.org से एक पुल का अनुरोध करें"> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder "छवि से अक्षर दर्ज करें"> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "एक नई चुनौती प्राप्त करें"> <!ENTITY torsettings.useBridges.captchaSubmit "जमा करें"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.custom "एक पुल प्रदान करें जो मुझे पता है"> +<!ENTITY torsettings.useBridges.label "एक विश्वसनीय स्रोत से पुल जानकारी दर्ज करें।"> <!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> +<!ENTITY torsettings.copyLog "क्लिपबोर्ड पर टोर लॉग कॉपी करें"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> +<!ENTITY torsettings.proxyHelpTitle "प्रॉक्सी मदद"> +<!ENTITY torsettings.proxyHelp1 "किसी कंपनी, स्कूल या विश्वविद्यालय नेटवर्क   से कनेक्ट करते समय स्थानीय प्रॉक्सी की आवश्यकता हो सकती है। यदि आप सुनिश्चित नहीं हैं कि प्रॉक्सी की आवश्यकता है, तो किसी अन्य ब्राउज़र में इंटरनेट सेटिंग्स देखें या अपने सिस्टम की नेटवर्क सेटिंग्स जांचें।"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelpTitle "ब्रिज रिले सहायता"> +<!ENTITY torsettings.bridgeHelp1 "पुल असूचीबद्ध रिले हैं जो टोर नेटवर्क   से कनेक्शन को अवरुद्ध करना अधिक कठिन बनाते हैं। सेंसरशिप से बचने के लिए प्रत्येक प्रकार का पुल एक अलग विधि का उपयोग करता है।   Obfs वाले लोग आपके ट्रैफ़िक को यादृच्छिक शोर की तरह दिखते हैं, और नम्र लोग आपके ट्रैफिक को टोर के बजाय उस सेवा से कनेक्ट करने की तरह दिखते हैं।"> +<!ENTITY torsettings.bridgeHelp2 "कुछ देशों में कुछ पुल काम करते हैं, लेकिन अन्य   नहीं, क्योंकि कुछ देशों ने टोर को अवरुद्ध करने का प्रयास किया है। यदि आप अनिश्चित हैं कि आपके देश में कौन से पुल काम करते हैं, तो torproject.org/about/contact.html#support पर जाएं">  <!ENTITY torprogress.pleaseWait "कुछ देर रुकिए। हम टोर की संजाल से जुड़ रहे हैं। कुछ मिनट लग सकते हैं।"> diff --git a/src/chrome/locale/hi/torlauncher.properties b/src/chrome/locale/hi/torlauncher.properties index 8bda3da..d530ccb 100644 --- a/src/chrome/locale/hi/torlauncher.properties +++ b/src/chrome/locale/hi/torlauncher.properties @@ -1,78 +1,78 @@ ### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher +torlauncher.error_title=टोर लॉन्चर -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_exited_during_startup=टोर स्टार्टअप के दौरान बाहर निकला। यह आपकी torrc फ़ाइल में त्रुटि, आपके सिस्टम पर टोर या किसी अन्य प्रोग्राम में एक बग, या दोषपूर्ण हार्डवेयर के कारण हो सकता है। जब तक आप अंतर्निहित समस्या को ठीक नहीं करते हैं और टोर को पुनरारंभ नहीं करते हैं, तो Tor ब्राउज़र शुरू नहीं होगा। +torlauncher.tor_exited=टोर अप्रत्याशित रूप से बाहर निकला। यह टोर में एक बग, आपके सिस्टम पर एक और प्रोग्राम, या दोषपूर्ण हार्डवेयर के कारण हो सकता है। जब तक आप टोर को पुनरारंभ नहीं करते हैं, तो टोर ब्राउज़र किसी भी वेबसाइट तक नहीं पहुंच पाएगा। अगर समस्या बनी रहती है, तो कृपया समर्थन टीम में अपने टोर लॉग की एक प्रति भेजें। +torlauncher.tor_exited2=टॉर को पुनरारंभ करना आपके ब्राउज़र टैब को बंद नहीं करेगा। +torlauncher.tor_controlconn_failed=टोर कंट्रोल पोर्ट से कनेक्ट नहीं हो सका। +torlauncher.tor_failed_to_start=टोर शुरू होने में विफल रहा। +torlauncher.tor_control_failed=टोर पर नियंत्रण करने में विफल +torlauncher.tor_bootstrap_failed=टोर नेटवर्क कनेक्शन स्थापित करने में विफल रहा। +torlauncher.tor_bootstrap_failed_details=%1$S विफल रहा (%2$S) -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. -torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.unable_to_start_tor=टोर शुरू करने में असमर्थ\n\n%S +torlauncher.tor_missing=Tor exe फ़ाइल गुम है। +torlauncher.torrc_missing=Torrc फ़ाइल गुम है और बनाया नहीं जा सका। +torlauncher.datadir_missing=टोर डेटा निर्देशिका मौजूद नहीं है और बनाया नहीं जा सका। +torlauncher.password_hash_missing=हैश पासवर्ड प्राप्त करने में विफल। -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.failed_to_get_settings=टोर सेटिंग्स को पुनः प्राप्त करने में असमर्थ।\n\n%S +torlauncher.failed_to_save_settings=टोर सेटिंग्स को सहेजने में असमर्थ।\n\n%S +torlauncher.ensure_tor_is_running=कृपया सुनिश्चित करें कि टोर चल रहा है। -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_proxy_addr_missing=इंटरनेट का उपयोग करने के लिए प्रॉक्सी का उपयोग करने के लिए आपको टोर को कॉन्फ़िगर करने के लिए आपको एक आईपी पता या होस्टनाम और पोर्ट नंबर दोनों निर्दिष्ट करना होगा। +torlauncher.error_proxy_type_missing=आपको प्रॉक्सी प्रकार का चयन करना होगा। +torlauncher.error_bridges_missing=आपको एक या अधिक पुल निर्दिष्ट करना होगा। +torlauncher.error_default_bridges_type_missing=आपको प्रदान किए गए पुलों के लिए एक परिवहन प्रकार का चयन करना होगा। +torlauncher.error_bridgedb_bridges_missing=कृपया एक पुल का अनुरोध करें। +torlauncher.error_bridge_bad_default_type=कोई भी पुल नहीं है जिसमें परिवहन प्रकार %S उपलब्ध है। कृपया अपनी सेटिंग्स को समायोजित करें। -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(चीन में काम करता है) +torlauncher.bridge_suffix.meek-azure=(चीन में काम करता है) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=एक पुल का अनुरोध करें ... +torlauncher.request_a_new_bridge=एक नए पुल का अनुरोध करें ... +torlauncher.contacting_bridgedb=BridgeDB से संपर्क किया जा रहा है।कृपया प्रतीक्षा करें। +torlauncher.captcha_prompt=पुल का अनुरोध करने के लिए कैप्चा को हल करें। +torlauncher.bad_captcha_solution=समाधान सही नहीं है। कृपया पुन: प्रयास करें। +torlauncher.unable_to_get_bridge=BridgeDB से पुल प्राप्त करने में असमर्थ।\n\n% S +torlauncher.no_meek=यह ब्राउज़र मीक के लिए कॉन्फ़िगर नहीं किया गया है, जो पुलों को प्राप्त करने के लिए आवश्यक है। +torlauncher.no_bridges_available=इस समय कोई पुल उपलब्ध नहीं है। माफ़ कीजिये। torlauncher.connect=जोड़ें -torlauncher.restart_tor=Restart Tor +torlauncher.restart_tor=टोर पुनरारंभ करें torlauncher.quit=छोड़ें torlauncher.quit_win=बाहर torlauncher.done=सम्पन्न -torlauncher.forAssistance=For assistance, contact %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance=सहायता के लिए, %S से संपर्क करें +torlauncher.forAssistance2=सहायता के लिए, %S पर जाएं -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=कॉपी कॉपी करें। %S टोर लॉग संदेश टेक्स्ट एडिटर या ईमेल संदेश में चिपकने के लिए तैयार हैं। -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory -torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information +torlauncher.bootstrapStatus.conn_dir=एक रिले निर्देशिका से कनेक्ट कर रहा है +torlauncher.bootstrapStatus.handshake_dir=एक एन्क्रिप्टेड निर्देशिका कनेक्शन स्थापित किया जा रहा है +torlauncher.bootstrapStatus.requesting_status=नेटवर्क की स्थिति को पुनः प्राप्त करना +torlauncher.bootstrapStatus.loading_status=नेटवर्क स्थिति लोड हो रहा है +torlauncher.bootstrapStatus.loading_keys=प्राधिकरण प्रमाण पत्र लोड हो रहा है +torlauncher.bootstrapStatus.requesting_descriptors=रिले जानकारी का अनुरोध +torlauncher.bootstrapStatus.loading_descriptors=रिले जानकारी लोड हो रहा है torlauncher.bootstrapStatus.conn_or=टोर संजाल से जुड़ रहा है -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! +torlauncher.bootstrapStatus.handshake_or=एक टोर सर्किट की स्थापना की जा रही है +torlauncher.bootstrapStatus.done=टोर नेटवर्क से जुड़ा हुआ है! torlauncher.bootstrapWarning.done=सम्पन्न -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.connectrefused=कनेक्शन नहीं हो सका +torlauncher.bootstrapWarning.misc=कई तरह का +torlauncher.bootstrapWarning.resourcelimit=अपर्याप्त संसाधन +torlauncher.bootstrapWarning.identity=पहचान विसंगति +torlauncher.bootstrapWarning.timeout=कनेक्शन का समय समाप्त +torlauncher.bootstrapWarning.noroute=मेजबान करने के लिए कोई रास्ता नहीं +torlauncher.bootstrapWarning.ioerror=पढ़ें / लिखें त्रुटि +torlauncher.bootstrapWarning.pt_missing=प्लग करने लायक परिवहन लापता -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=सर्वर से कनेक्शन खो गया था। +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=सर्वर से संपर्क स्थापित नही हो सका। +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=प्रॉक्सी से कनेक्ट नहीं हो सका। diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd index 85d3a07..6e047e6 100644 --- a/src/chrome/locale/ru/network-settings.dtd +++ b/src/chrome/locale/ru/network-settings.dtd @@ -36,9 +36,9 @@ <!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 "Мой сетевой экран позволяет мне подключиться только к определённым портам"> -<!ENTITY torsettings.firewall.allowedPorts "Разрешённые порты:"> -<!ENTITY torsettings.useBridges.checkbox "Tor запрещён в моей стране"> +<!ENTITY torsettings.firewall.checkbox "Мой сетевой экран позволяет мне подключиться только к определенным портам"> +<!ENTITY torsettings.firewall.allowedPorts "Разрешенные порты:"> +<!ENTITY torsettings.useBridges.checkbox "Tor запрещен в моей стране"> <!ENTITY torsettings.useBridges.default "Выбрать встроенный мост"> <!ENTITY torsettings.useBridges.default.placeholder "выбор моста"> <!ENTITY torsettings.useBridges.bridgeDB "Запросить мост от torproject.org"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.bridgeHelpTitle "Помощь по ретрансляторам типа мост"> <!ENTITY torsettings.bridgeHelp1 "Мосты - это незарегистрированные реле, которые затрудняют блокировку соединений с сетью Tor.&#160 Каждый тип моста использует отличный от других метод, чтобы избежать блокировки цезорами. Обходные устройства делают ваш трафик похожим на случайный шум и имитируют то, что он подключается к этой службе вместо Tor."> -<!ENTITY torsettings.bridgeHelp2 "Из-за того, как именно страны пытаются блокировать Tor, определённые мосты работают в одних странах, но не работают в других.  Если вы не уверены в том, какие мосты сработает в вашей стране, посетите torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp2 "Из-за того, как именно страны пытаются блокировать Tor, определенные мосты работают в одних странах, но не работают в других.  Если вы не уверены в том, какие мосты сработает в вашей стране, посетите torproject.org/about/contact.html#support">  <!ENTITY torprogress.pleaseWait "Пожалуйста, подождите, пока мы установим подключение к сети Tor.  Это может занять несколько минут.">

1 0

[tor-launcher/master] Bug 25405: cannot use Moat if a meek bridge is configured
by gk＠torproject.org 03 Sep '18

03 Sep '18

commit a5791ec33537b5efefb5c64c240e48d9ce1c8721 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 6 15:39:11 2018 -0500 Bug 25405: cannot use Moat if a meek bridge is configured When doing Moat things, use a separate profile for the secondary browser (instead of trying to use the main meek helper profile). This is accomplished by setting a TOR_BROWSER_MEEK_PROFILE environment variable which meek-client-torbrowser uses to get the profile path if it is set. --- src/modules/tl-bridgedb.jsm | 9 +++++++-- src/modules/tl-util.jsm | 19 +++++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/modules/tl-bridgedb.jsm b/src/modules/tl-bridgedb.jsm index 339cb39..8b7a1d6 100644 --- a/src/modules/tl-bridgedb.jsm +++ b/src/modules/tl-bridgedb.jsm @@ -224,17 +224,22 @@ _MoatRequestor.prototype = } let ptStateDir = TorLauncherUtil.getTorFile("tordatadir", false); - if (!ptStateDir) + let meekHelperProfileDir = TorLauncherUtil.getTorFile("pt-profiles-dir", + true); + if (!ptStateDir || !meekHelperProfileDir) { let msg = TorLauncherUtil.getLocalizedString("datadir_missing"); return Promise.reject(new Error(msg)); } ptStateDir.append("pt_state"); // Match what tor uses. + meekHelperProfileDir.appendRelativePath("profile.moat-http-helper"); + let envAdditions = { TOR_PT_MANAGED_TRANSPORT_VER: "1", TOR_PT_STATE_LOCATION: ptStateDir.path, TOR_PT_EXIT_ON_STDIN_CLOSE: "1", - TOR_PT_CLIENT_TRANSPORTS: this.kTransport }; + TOR_PT_CLIENT_TRANSPORTS: this.kTransport, + TOR_BROWSER_MEEK_PROFILE: meekHelperProfileDir.path }; if (this.mLocalProxyURL) envAdditions.TOR_PT_PROXY = this.mLocalProxyURL; diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 292f88b..36abeaa 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -561,6 +561,8 @@ let TorLauncherUtil = // Public path = "Tor\\torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; + else if ("pt-profiles-dir" == aTorFileType) + path = "Tor\\PluggableTransports"; } else if (this.isMac) { @@ -574,6 +576,8 @@ let TorLauncherUtil = // Public path = "Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; + else if ("pt-profiles-dir" == aTorFileType) + path = "Tor/PluggableTransports"; else if (isIPC) path = "Tor/" + ipcFileName; } @@ -589,6 +593,8 @@ let TorLauncherUtil = // Public path = "Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Tor"; + else if ("pt-profiles-dir" == aTorFileType) + path = "Tor/PluggableTransports"; else if (isIPC) path = "Tor/" + ipcFileName; } @@ -606,7 +612,9 @@ let TorLauncherUtil = // Public path = "Data\\Tor\\torrc"; else if ("tordatadir" == aTorFileType) path = "Data\\Tor"; - } + else if ("pt-profiles-dir" == aTorFileType) + path = "Data\\Browser"; + } else // Linux, Mac OS and others. { // This block is also used for the non-TorBrowser-Data/ case. @@ -620,6 +628,8 @@ let TorLauncherUtil = // Public path = "Data/Tor/torrc"; else if ("tordatadir" == aTorFileType) path = "Data/Tor"; + else if ("pt-profiles-dir" == aTorFileType) + path = "Data/Browser"; else if (isIPC) path = "Data/Tor/" + ipcFileName; } @@ -662,10 +672,15 @@ let TorLauncherUtil = // Public { try { - if ("tordatadir" == aTorFileType) + if (("tordatadir" == aTorFileType) || + ("pt-profiles-dir" == aTorFileType)) + { torFile.create(torFile.DIRECTORY_TYPE, 0o700); + } else + { torFile.create(torFile.NORMAL_FILE_TYPE, 0o600); + } } catch (e) {

1 0

[tor-browser-build/master] Bug 27179: update mar_compression
by gk＠torproject.org 03 Sep '18

03 Sep '18

commit 8955afc1fb84a191268219b7f4c28050585b791a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 17 11:21:22 2018 +0200 Bug 27179: update mar_compression Set mar_compression to xz for the alpha, and bzip2 for the stable. --- projects/release/update_responses_config.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 90fbc3a..d1ed52f 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -47,10 +47,11 @@ versions: minSupportedOSVersion: 6.1 win64: minSupportedOSVersion: 6.1 -[% IF ! c("var/release") -%] - mar_compression: xz -[% END -%] +[% IF c("var/release") -%] mar_compression: bzip2 +[% ELSE -%] +mar_compression: xz +[% END -%] htaccess_rewrite_rules: alpha: | # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory

1 0

[tor-browser-build/master] Pick up new tor-browser tag and use build5 for 8.0
by gk＠torproject.org 02 Sep '18

02 Sep '18

commit 346bf3bd582ea9a16f99358e892f204df4295515 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 2 17:09:11 2018 +0000 Pick up new tor-browser tag and use build5 for 8.0 --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + rbm.conf | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 1a94f2d..124de7a 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build3' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 477845b..c46f139 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -108,6 +108,7 @@ Tor Browser 8.0 -- September 5 2018 * Bug 26874: Fix UNC path restrictions failure in Tor Browser 8.0a9 * Bug 12968: Enable HEASLR in Windows x86_64 builds * Bug 26381: Work around endless loop during page load and about:tor not loading + * Bug 27411: Fix broken security slider and NoScript interaction on Windows * Bug 22581: Fix shutdown crash * Bug 25266: PT config should include full names of executable files * Bug 26304: Update zlib to version 1.2.11 diff --git a/rbm.conf b/rbm.conf index d99460d..5cc88e4 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0' - torbrowser_build: 'build4' + torbrowser_build: 'build5' torbrowser_incremental_from: - 7.5.6 project_name: tor-browser

1 0

[tor-browser/tor-browser-60.2.0esr-8.0-1] Bug 27411: Security Slider breaks on Windows
by gk＠torproject.org 02 Sep '18

02 Sep '18

commit 124fa904c4b2b24b86429ebc3448cd9114d5e4dc Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 2 17:04:54 2018 +0000 Bug 27411: Security Slider breaks on Windows Our workaround for bug 26520 does not work for Windows users as on Windows WebExtension background scripts are running in a different process. To get Tor Browser 8 out we disable the separate process for the time being while working on a better fix. --- browser/app/profile/firefox.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 48f69652d982..2d0dad38ebae 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -76,11 +76,11 @@ pref("extensions.geckoProfiler.getSymbolRules", "localBreakpad,remoteBreakpad"); pref("extensions.webextensions.base-content-security-policy", "script-src 'self' https://* moz-extension: blob: filesystem: 'unsafe-eval' 'unsafe-inline'; object-src 'self' https://* moz-extension: blob: filesystem:;"); pref("extensions.webextensions.default-content-security-policy", "script-src 'self'; object-src 'self';"); -#if defined(XP_WIN) -pref("extensions.webextensions.remote", true); -#elif defined(XP_MACOSX) && !defined(RELEASE_OR_BETA) -pref("extensions.webextensions.remote", true); -#endif +//#if defined(XP_WIN) +//pref("extensions.webextensions.remote", true); +//#elif defined(XP_MACOSX) && !defined(RELEASE_OR_BETA) +//pref("extensions.webextensions.remote", true); +//#endif // Extensions that should not be flagged as legacy in about:addons pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},testpilot@cliqz.com,@testpilot-containers,jid1-NeEaf3sAHdKHPA@jetpack,@activity-streams,pulse@mozilla.com,@testpilot-addon,@min-vid,tabcentertest1@mozilla.com,snoozetabs@mozilla.com,speaktome@mozilla.com,hoverpad@mozilla.com");

1 0

[tor-browser-build/master] Pick up new tor-browser and torbutton tags for build4
by gk＠torproject.org 01 Sep '18

01 Sep '18

commit 1ef1b0636c223549bf04b015e20c00040bb1da44 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 1 20:44:16 2018 +0000 Pick up new tor-browser and torbutton tags for build4 --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 +++- projects/torbutton/config | 2 +- rbm.conf | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 0ce5a37..1a94f2d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index acc278e..477845b 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -4,7 +4,7 @@ Tor Browser 8.0 -- September 5 2018 * Update Tor to 0.3.3.9 * Update OpenSSL to 1.0.2p * Update Libevent to 2.1.8 - * Update Torbutton to 2.0.5 + * Update Torbutton to 2.0.6 * Bug 26960: Implement new about:tor start page * Bug 26961: Implement new user onboarding * Bug 26962: Circuit display onboarding @@ -13,6 +13,7 @@ Tor Browser 8.0 -- September 5 2018 * Bug 26321: Move 'New Identity', 'New Circuit' to File, hamburger menus * Bug 26100: Adapt Torbutton to Firefox 60 ESR * Bug 26520: Fix sec slider/NoScript for TOR_SKIP_LAUNCH=1 + * Bug 27401: Start listening for NoScript before it loads * Bug 26430: New Torbutton icon * Bug 24309: Move circuit display to the identity popup * Bug 26884: Use Torbutton to provide security slider on mobile @@ -50,6 +51,7 @@ Tor Browser 8.0 -- September 5 2018 * Bug 27082: Enable a limited UITour for user onboarding * Bug 26961: New user onboarding * Bug 26962: New feature onboarding + * Bug 27403: The onboarding bubble is not always displayed * Bug 27283: Fix first-party isolation for UI tour * Bug 27213: Update about:tbupdate to new (about:tor) layout * Bug 14952+24553: Enable HTTP2 and AltSvc diff --git a/projects/torbutton/config b/projects/torbutton/config index ebceca7..f076b8f 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.0.5 +version: 2.0.6 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index d694f1d..d99460d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0' - torbrowser_build: 'build3' + torbrowser_build: 'build4' torbrowser_incremental_from: - 7.5.6 project_name: tor-browser

1 0

[torbutton/master] Release preparations for 2.0.6
by gk＠torproject.org 01 Sep '18

01 Sep '18

commit 8e70b5f35f59ba6bbb563fbef2a4853c4d657580 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 1 20:37:47 2018 +0000 Release preparations for 2.0.6 Version bump and CHANGELOG update --- src/CHANGELOG | 3 +++ src/install.rdf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 3494e98a..c9f24cbd 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +2.0.6 + * Bug 27401: Start listening for NoScript before it loads + 2.0.5 * Bug 26962: Circuit display onboarding * Bug 26520: Fix sec slider/NoScript for TOR_SKIP_LAUNCH=1 diff --git a/src/install.rdf b/src/install.rdf index e64cde33..a92cd651 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>2.0.5</em:version> + <em:version>2.0.6</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser/tor-browser-60.2.0esr-8.0-1] fixup! squash! Bug 26961: New user onboarding.
by gk＠torproject.org 01 Sep '18

01 Sep '18

commit 839cc4bd054821fe7e4c093f0a05986b83491985 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 1 20:20:51 2018 +0000 fixup! squash! Bug 26961: New user onboarding. Arthur suggested to make the onboarding bubble visible on displays with less than 960px width available, so we choose 200px instead. --- browser/extensions/onboarding/content/onboarding.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js index dd776b3edf93..9d03a6fc82d8 100644 --- a/browser/extensions/onboarding/content/onboarding.js +++ b/browser/extensions/onboarding/content/onboarding.js @@ -23,8 +23,8 @@ const BRAND_SHORT_NAME = Services.strings const PROMPT_COUNT_PREF = "browser.onboarding.notification.prompt-count"; const NOTIFICATION_FINISHED_PREF = "browser.onboarding.notification.finished"; const ONBOARDING_DIALOG_ID = "onboarding-overlay-dialog"; -const ONBOARDING_MIN_WIDTH_PX = 960; -const SPEECH_BUBBLE_MIN_WIDTH_PX = 960; +const ONBOARDING_MIN_WIDTH_PX = 200; +const SPEECH_BUBBLE_MIN_WIDTH_PX = 200; const SPEECH_BUBBLE_NEWTOUR_STRING_ID = "onboarding.overlay-icon-tooltip2"; const SPEECH_BUBBLE_UPDATETOUR_STRING_ID = "onboarding.overlay-icon-tooltip-updated2"; const ICON_STATE_WATERMARK = "watermark";

1 0

[tor-browser/tor-browser-60.2.0esr-8.0-1] squash! Bug 26961: New user onboarding.
by gk＠torproject.org 01 Sep '18

01 Sep '18

commit cd00a313475584c0a4b94eaea5171428b993ce5b Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Sat Sep 1 14:51:12 2018 -0400 squash! Bug 26961: New user onboarding. Also fix bug 27403: the onboarding bubble is not always displayed. --- browser/extensions/onboarding/bootstrap.js | 6 +++++- browser/extensions/onboarding/content/onboarding.js | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/browser/extensions/onboarding/bootstrap.js b/browser/extensions/onboarding/bootstrap.js index 4bc6d468dce9..0762249ba1e9 100644 --- a/browser/extensions/onboarding/bootstrap.js +++ b/browser/extensions/onboarding/bootstrap.js @@ -14,7 +14,11 @@ XPCOMUtils.defineLazyModuleGetters(this, { const {PREF_STRING, PREF_BOOL, PREF_INT} = Ci.nsIPrefBranch; -const BROWSER_READY_NOTIFICATION = "browser-delayed-startup-finished"; +// In Tor Browser we initialize onboarding upon "final-ui-startup" instead +// of waiting for "browser-delayed-startup-finished"; otherwise, on first +// run the onboarding frame script's "onload" listener is installed too +// late to detect that about:tor is loaded. +const BROWSER_READY_NOTIFICATION = "final-ui-startup"; const BROWSER_SESSION_STORE_NOTIFICATION = "sessionstore-windows-restored"; const PREF_WHITELIST = [ ["browser.onboarding.enabled", PREF_BOOL], diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js index 1f46abdb722d..dd776b3edf93 100644 --- a/browser/extensions/onboarding/content/onboarding.js +++ b/browser/extensions/onboarding/content/onboarding.js @@ -642,7 +642,11 @@ class Onboarding { } _resizeUI() { - this._windowWidth = this._window.document.body.getBoundingClientRect().width; + // In Tor Browser we check against innerWidth instead of against the + // body's bounding rect because about:tor keeps its body hidden until + // the Tor status is known, and the bounding rect is zero while the + // body is hidden. + this._windowWidth = this._window.innerWidth; if (this._windowWidth < ONBOARDING_MIN_WIDTH_PX) { // Don't show the overlay UI before we get to a better, responsive design. this.destroy();

1 0

[tor-browser/tor-browser-60.2.0esr-8.0-1] Revert "fixup! Bug 26961: New user onboarding."
by gk＠torproject.org 01 Sep '18

01 Sep '18

commit c79bb726065ce296d567a6c9ac58b37b7d750318 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 1 20:29:42 2018 +0000 Revert "fixup! Bug 26961: New user onboarding." This reverts commit 8b50d3f2f1bb5ce04ebf3a91ff701059fedb2da2. --- browser/extensions/onboarding/content/onboarding.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js index 4212e305a505..1f46abdb722d 100644 --- a/browser/extensions/onboarding/content/onboarding.js +++ b/browser/extensions/onboarding/content/onboarding.js @@ -23,8 +23,8 @@ const BRAND_SHORT_NAME = Services.strings const PROMPT_COUNT_PREF = "browser.onboarding.notification.prompt-count"; const NOTIFICATION_FINISHED_PREF = "browser.onboarding.notification.finished"; const ONBOARDING_DIALOG_ID = "onboarding-overlay-dialog"; -const ONBOARDING_MIN_WIDTH_PX = 200; -const SPEECH_BUBBLE_MIN_WIDTH_PX = 200; +const ONBOARDING_MIN_WIDTH_PX = 960; +const SPEECH_BUBBLE_MIN_WIDTH_PX = 960; const SPEECH_BUBBLE_NEWTOUR_STRING_ID = "onboarding.overlay-icon-tooltip2"; const SPEECH_BUBBLE_UPDATETOUR_STRING_ID = "onboarding.overlay-icon-tooltip-updated2"; const ICON_STATE_WATERMARK = "watermark"; @@ -629,7 +629,6 @@ class Onboarding { tour_type: this._tourType, }); - this._resizeUI(); this._window.addEventListener("beforeunload", this); this._window.addEventListener("unload", this); this._window.addEventListener("resize", this); @@ -643,7 +642,7 @@ class Onboarding { } _resizeUI() { - this._windowWidth = this._window.innerWidth; + this._windowWidth = this._window.document.body.getBoundingClientRect().width; if (this._windowWidth < ONBOARDING_MIN_WIDTH_PX) { // Don't show the overlay UI before we get to a better, responsive design. this.destroy();

1 0

[tor-browser/tor-browser-60.2.0esr-8.0-1] fixup! Bug 26961: New user onboarding.
by gk＠torproject.org 01 Sep '18

01 Sep '18

commit 8b50d3f2f1bb5ce04ebf3a91ff701059fedb2da2 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat Sep 1 12:00:35 2018 -0700 fixup! Bug 26961: New user onboarding. --- browser/extensions/onboarding/content/onboarding.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js index 1f46abdb722d..4212e305a505 100644 --- a/browser/extensions/onboarding/content/onboarding.js +++ b/browser/extensions/onboarding/content/onboarding.js @@ -23,8 +23,8 @@ const BRAND_SHORT_NAME = Services.strings const PROMPT_COUNT_PREF = "browser.onboarding.notification.prompt-count"; const NOTIFICATION_FINISHED_PREF = "browser.onboarding.notification.finished"; const ONBOARDING_DIALOG_ID = "onboarding-overlay-dialog"; -const ONBOARDING_MIN_WIDTH_PX = 960; -const SPEECH_BUBBLE_MIN_WIDTH_PX = 960; +const ONBOARDING_MIN_WIDTH_PX = 200; +const SPEECH_BUBBLE_MIN_WIDTH_PX = 200; const SPEECH_BUBBLE_NEWTOUR_STRING_ID = "onboarding.overlay-icon-tooltip2"; const SPEECH_BUBBLE_UPDATETOUR_STRING_ID = "onboarding.overlay-icon-tooltip-updated2"; const ICON_STATE_WATERMARK = "watermark"; @@ -629,6 +629,7 @@ class Onboarding { tour_type: this._tourType, }); + this._resizeUI(); this._window.addEventListener("beforeunload", this); this._window.addEventListener("unload", this); this._window.addEventListener("resize", this); @@ -642,7 +643,7 @@ class Onboarding { } _resizeUI() { - this._windowWidth = this._window.document.body.getBoundingClientRect().width; + this._windowWidth = this._window.innerWidth; if (this._windowWidth < ONBOARDING_MIN_WIDTH_PX) { // Don't show the overlay UI before we get to a better, responsive design. this.destroy();

1 0