- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 26450: disable dependency on firefox-langpacks in testbuild
by gk＠torproject.org 29 Jun '18

29 Jun '18

commit 88ff6003f2d8b45aca111e2f7cfcce3837fe5414 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 22 00:09:30 2018 +0200 Bug 26450: disable dependency on firefox-langpacks in testbuild When the list of locales is empty (testbuild), we don't need the firefox-langpacks. --- projects/tor-browser/config | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 820755c..13c550d 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -47,6 +47,7 @@ input_files: name: tor - project: firefox-langpacks name: firefox-langpacks + enable: '[% c("var/locales").size %]' - project: tor-launcher name: tor-launcher - project: torbutton

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_26410'
by gk＠torproject.org 29 Jun '18

29 Jun '18

commit 660007aa541e3c8cc4fda2776e8a277fdbc74915 Merge: c2f11e3 2846221 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 29 11:29:06 2018 +0000 Merge remote-tracking branch 'boklm/bug_26410' Makefile | 6 +++--- projects/tor-browser/build | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-)

1 0

[tor-browser-build/master] Bug 26410: Stop using old MAR format in the next esr60-based alpha
by gk＠torproject.org 29 Jun '18

29 Jun '18

commit 2846221abfaeb05837e7d4a2056741df555dbd5e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jun 28 14:29:24 2018 +0200 Bug 26410: Stop using old MAR format in the next esr60-based alpha However we keep setting MAR_OLD_FORMAT=1 on the stable release for now. --- Makefile | 6 +++--- projects/tor-browser/build | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 3b5c2d9..b667960 100644 --- a/Makefile +++ b/Makefile @@ -119,7 +119,7 @@ incrementals-release: submodule-update incrementals-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals tools/update-responses/download_missing_versions alpha - MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals alpha + tools/update-responses/gen_incrementals alpha $(rbm) build release --step hash_incrementals --target alpha update_responses-release: submodule-update @@ -138,9 +138,9 @@ dmg2mar-release: submodule-update dmg2mar-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target signed - MAR_OLD_FORMAT=1 $(rbm) build release --step dmg2mar --target alpha --target signed + $(rbm) build release --step dmg2mar --target alpha --target signed tools/update-responses/download_missing_versions alpha - CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals alpha + CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha submodule-update: git submodule update --init diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 0c3e583..50fdc30 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -264,9 +264,11 @@ popd cd $distdir [% IF c("var/build_mar") -%] - # 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 + [% 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 HTTPS Everywhere version in the changelog
by boklm＠torproject.org 29 Jun '18

29 Jun '18

commit c2f11e3720f2a5429f4cd32af73b94d655002712 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 29 12:32:39 2018 +0200 Fix HTTPS Everywhere version in the changelog Reported in a comment on the blog: https://blog.torproject.org/comment/275985#comment-275985 --- 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 5f52bbe..516e81f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -20,7 +20,7 @@ Tor Browser 8.0a9 -- June 27 2018 * Bug 20890: Increase control port connection timeout * Bug 20628: Add more locales to Tor Browser * Translations update - * Update HTTPS Everywhere to 2018.6.13 + * Update HTTPS Everywhere to 2018.6.21 * Update NoScript to 10.1.8.2 * Bug 25543: Rebase Tor Browser patches for ESR60 * Bug 23247: Show security state of .onions

1 0

[torbutton/master] Bug 26500: Reposition circuit display relay icon for RTL locales
by gk＠torproject.org 27 Jun '18

27 Jun '18

commit b61ed65010816c8ceb4361dbd02a278347dca91b Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Jun 25 11:37:47 2018 -0700 Bug 26500: Reposition circuit display relay icon for RTL locales It seems -moz-locale-dir(rtl) works in XUL; dir(rtl) does not. --- src/chrome/skin/tor-circuit-display.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index c9e682a..ed17f91 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -21,7 +21,7 @@ and lines drawn between them to represent Tor network inter-relay connections. width: 100%; } -#circuit-display-content:dir(rtl) { +#circuit-display-content:-moz-locale-dir(rtl) { background-position: calc(100% - 1em) 1em; }

1 0

[tor-browser-build/master] Add newline at the end of projects/release/update_responses_config.yml
by boklm＠torproject.org 27 Jun '18

27 Jun '18

commit 7a338d60a3106b70d411a6ebd1095bf3bc6862f4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jun 27 22:11:42 2018 +0200 Add newline at the end of projects/release/update_responses_config.yml --- projects/release/update_responses_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 0c49fe1..92c2203 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -46,4 +46,4 @@ versions: win32: minSupportedOSVersion: 6.1 win64: - minSupportedOSVersion: 6.1 \ No newline at end of file + minSupportedOSVersion: 6.1

1 0

[tor-browser-build/master] Bug 26319: Don't package up the whole Tor Browser in the `mach package` step
by gk＠torproject.org 27 Jun '18

27 Jun '18

commit 8d1c4c396034b2ab0b7c55982e1900236f5031a6 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Jun 22 15:51:51 2018 -0400 Bug 26319: Don't package up the whole Tor Browser in the `mach package` step This commit sets `mach build stage-package` instead of `mach package` in the Firefox build; this helps us to use the useful properties of `mach package` but avoids creating the final DMG or EXE during the Firefox build which we don't want as we do that later when building Tor Browser. We no longer need to patch `installer.py` (bug 26205) but we still need the patch for the uninstaller otherwise the Firefox build fails trying to find the required NSIS files. The no-dmg.patch for macOS is also not required and is removed (bug 24632). --- projects/firefox/build | 6 +----- projects/firefox/config | 2 -- projects/firefox/no-dmg.patch | 29 -------------------------- projects/firefox/nsis-uninstall.patch | 39 +++++------------------------------ 4 files changed, 6 insertions(+), 70 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index e6fa41c..1921f53 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -138,16 +138,12 @@ fi patch -p1 < $rootdir/1467041.patch [% END -%] -[% IF c("var/osx") %] - patch -p1 < $rootdir/no-dmg.patch -[% END -%] - rm -f configure rm -f js/src/configure ./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts ./mach build -./mach package +./mach build stage-package [% IF c("var/osx") %] cp -a obj-macos/dist/firefox/* $distdir diff --git a/projects/firefox/config b/projects/firefox/config index 303ca0d..3284ed4 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -93,8 +93,6 @@ input_files: enable: '[% c("var/selfrando") %]' - filename: fix-info-plist.py enable: '[% c("var/osx") %]' - - filename: no-dmg.patch - enable: '[% c("var/osx") %]' - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll sha256sum: 8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 enable: '[% c("var/windows-i686") %]' diff --git a/projects/firefox/no-dmg.patch b/projects/firefox/no-dmg.patch deleted file mode 100644 index 1e722af..0000000 --- a/projects/firefox/no-dmg.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7204fc9191a55dbbd3b94ee2d64ece8d9910cf23 Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Thu, 31 May 2018 19:15:18 +0000 -Subject: [PATCH] Don't create a .dmg yet - - -diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk -index 8ace9703a160..82df89d1f431 100644 ---- a/toolkit/mozapps/installer/upload-files.mk -+++ b/toolkit/mozapps/installer/upload-files.mk -@@ -216,14 +216,7 @@ ifeq ($(MOZ_PKG_FORMAT),DMG) - - _ABS_MOZSRCDIR = $(shell cd $(MOZILLA_DIR) && pwd) - PKG_DMG_SOURCE = $(MOZ_PKG_DIR) -- INNER_MAKE_PACKAGE = \ -- $(call py_action,make_dmg, \ -- $(if $(MOZ_PKG_MAC_DSSTORE),--dsstore '$(MOZ_PKG_MAC_DSSTORE)') \ -- $(if $(MOZ_PKG_MAC_BACKGROUND),--background '$(MOZ_PKG_MAC_BACKGROUND)') \ -- $(if $(MOZ_PKG_MAC_ICON),--icon '$(MOZ_PKG_MAC_ICON)') \ -- --volume-name '$(MOZ_APP_DISPLAYNAME)' \ -- '$(PKG_DMG_SOURCE)' '$(PACKAGE)' \ -- ) -+ INNER_MAKE_PACKAGE = true - INNER_UNMAKE_PACKAGE = \ - $(call py_action,unpack_dmg, \ - $(if $(MOZ_PKG_MAC_DSSTORE),--dsstore '$(MOZ_PKG_MAC_DSSTORE)') \ --- -2.17.0 - diff --git a/projects/firefox/nsis-uninstall.patch b/projects/firefox/nsis-uninstall.patch index 765ef67..60e4e3d 100644 --- a/projects/firefox/nsis-uninstall.patch +++ b/projects/firefox/nsis-uninstall.patch @@ -1,14 +1,13 @@ -From 4ef264b601ac92a0b385c40bd011ef94618a176a Mon Sep 17 00:00:00 2001 +From e338a77c64c0afb72e857c7daa63346d35ad3891 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue, 12 Jun 2018 21:58:24 -0400 Subject: [PATCH 1/1] Bug 26205: Don't build the uninstaller for Windows during Firefox compilation --- - browser/Makefile.in | 4 ---- - browser/installer/Makefile.in | 4 ---- - .../mozbuild/mozbuild/repackaging/installer.py | 17 +---------------- - 3 files changed, 1 insertion(+), 24 deletions(-) + browser/Makefile.in | 4 ---- + browser/installer/Makefile.in | 4 ---- + 2 files changed, 8 deletions(-) diff --git a/browser/Makefile.in b/browser/Makefile.in index 2eb9e708f68e..0c9442183942 100644 @@ -40,34 +39,6 @@ index 1bf11252ee06..dee6d5434106 100644 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) MOZ_PKG_MAC_DSSTORE=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/dsstore MOZ_PKG_MAC_BACKGROUND=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/background.png -diff --git a/python/mozbuild/mozbuild/repackaging/installer.py b/python/mozbuild/mozbuild/repackaging/installer.py -index 9b49eb555153..1e6f6e73c3d8 100644 ---- a/python/mozbuild/mozbuild/repackaging/installer.py -+++ b/python/mozbuild/mozbuild/repackaging/installer.py -@@ -27,22 +27,7 @@ def repackage_installer(topsrcdir, tag, setupexe, package, output, package_name, - tmpdir = tempfile.mkdtemp() - old_cwd = os.getcwd() - try: -- if package: -- z = zipfile.ZipFile(package) -- z.extractall(tmpdir) -- z.close() -- -- # Copy setup.exe into the root of the install dir, alongside the -- # package. -- shutil.copyfile(setupexe, mozpath.join(tmpdir, mozpath.basename(setupexe))) -- -- # archive_exe requires us to be in the directory where the package is -- # unpacked (the tmpdir) -- os.chdir(tmpdir) -- -- sfx_package = mozpath.join(topsrcdir, sfx_stub) -- -- archive_exe(package_name, tag, sfx_package, output) -+ pass - - finally: - os.chdir(old_cwd) -- -2.17.1 +2.18.0.rc2

1 0

[tor-browser-build/master] Bug 26515: Update Tor Browser blog post URLs
by gk＠torproject.org 27 Jun '18

27 Jun '18

commit 7bace2c620e8ba1f31bcf70deee366c383401022 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jun 27 09:47:03 2018 +0200 Bug 26515: Update Tor Browser blog post URLs --- projects/release/update_responses_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 9f33424..0c49fe1 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -29,7 +29,7 @@ versions: releases_dir: [% path(c('output_dir')) %]/unsigned [% END -%] platformVersion: [% pc('firefox', 'var/firefox_platform_version') %] - detailsURL: https://blog.torproject.org/tor-browser-[% c("var/torbrowser_version") FILTER remove('\.') %]-released + detailsURL: https://blog.torproject.org/new-release-tor-browser-[% c("var/torbrowser_version") FILTER remove('\.') %] incremental_from: [% FOREACH v IN c("var/torbrowser_incremental_from") -%] - [% v %]

1 0

[tor-browser-build/master] Bug 26355: Make sure only Windows users on Windows7+ are trying to use Tor Browser based on ESR60 (tor-browser-build)
by boklm＠torproject.org 27 Jun '18

27 Jun '18

commit 2b04f4ee916a43a70c436a52c83205eda5f38648 Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Jun 21 17:12:13 2018 -0700 Bug 26355: Make sure only Windows users on Windows7+ are trying to use Tor Browser based on ESR60 (tor-browser-build) Edited the update_responses generation script to require version 6.1 of Windows (Windows 7) to get updates --- projects/release/update_responses_config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 6861124..9f33424 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -43,3 +43,7 @@ versions: minSupportedOSVersion: 13.0.0 osx64: minSupportedOSVersion: 13.0.0 + win32: + minSupportedOSVersion: 6.1 + win64: + minSupportedOSVersion: 6.1 \ No newline at end of file

1 0

[tor-browser-build/master] Bug 26489: fix .app directory name in tools/dmg2mar
by gk＠torproject.org 26 Jun '18

26 Jun '18

commit 1633185de3336351f47cb66b99903ef70b04d6ff Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 25 14:41:39 2018 +0200 Bug 26489: fix .app directory name in tools/dmg2mar Add the whitespace in "Tor Browser.app". --- tools/dmg2mar | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/dmg2mar b/tools/dmg2mar index 51d6acb..9b98956 100755 --- a/tools/dmg2mar +++ b/tools/dmg2mar @@ -36,9 +36,10 @@ use Parallel::ForkManager; use Cwd; # If the application is not TorBrowser (for instance, TorMessenger) -# set the application name in the TOR_APPNAME_BUNDLE_OSX and in -# the TOR_APPNAME_MARFILE environment variables -my $appname = $ENV{TOR_APPNAME_BUNDLE_OSX} // 'TorBrowser'; +# set the application name in the TOR_APPNAME_BUNDLE_OSX, +# TOR_APPNAME_DMGFILE and TOR_APPNAME_MARFILE environment variables +my $appname = $ENV{TOR_APPNAME_BUNDLE_OSX} // 'Tor Browser'; +my $appname_dmg = $ENV{TOR_APPNAME_DMGFILE} // 'TorBrowser'; my $appname_mar = $ENV{TOR_APPNAME_MARFILE} // 'tor-browser'; sub exit_error { @@ -95,7 +96,7 @@ sub get_dmg_files_from_sha256sums { foreach my $line (read_file('sha256sums-unsigned-build.txt')) { my (undef, $filename) = split ' ', $line; chomp $filename; - next unless $filename =~ m/^$appname-(.+)-osx64_(.+)\.dmg$/; + next unless $filename =~ m/^$appname_dmg-(.+)-osx64_(.+)\.dmg$/; push @files, { filename => $filename, version => $1, lang => $2 }; } return @files;

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_26489'
by gk＠torproject.org 26 Jun '18

26 Jun '18

commit 5d5401f7a0831702d913d5e469f70954c5796edb Merge: ce2f13c 1633185 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 26 19:30:03 2018 +0000 Merge remote-tracking branch 'boklm/bug_26489' tools/dmg2mar | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

1 0

[tor-browser-build/master] Bug 26496: Set MAR_OLD_FORMAT=1 in dmg2mar
by boklm＠torproject.org 25 Jun '18

25 Jun '18

commit ce2f13cfa3a98c01e0f1417c5f9017fbda3d148a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 25 17:56:31 2018 +0200 Bug 26496: Set MAR_OLD_FORMAT=1 in dmg2mar --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 80e9983..3b5c2d9 100644 --- a/Makefile +++ b/Makefile @@ -132,13 +132,13 @@ update_responses-alpha: submodule-update dmg2mar-release: submodule-update $(rbm) build release --step update_responses_config --target release --target signed - $(rbm) build release --step dmg2mar --target release --target signed + MAR_OLD_FORMAT=1 $(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 dmg2mar-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target signed - $(rbm) build release --step dmg2mar --target alpha --target signed + MAR_OLD_FORMAT=1 $(rbm) build release --step dmg2mar --target alpha --target signed tools/update-responses/download_missing_versions alpha CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals alpha

1 0

[tor-browser-build/master] Prepare build3
by gk＠torproject.org 24 Jun '18

24 Jun '18

commit e8c4d33d024cf1f3a3b0f560541f5424e563ca69 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jun 24 21:18:26 2018 +0000 Prepare build3 We pick up fix for Windows bustage and a macOS reproducibility issue. Moreover an update Torbutton version with a new icon gets included, too. --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 ++++- projects/torbutton/config | 2 +- rbm.conf | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 1ceda50..5f52bbe 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -4,8 +4,9 @@ Tor Browser 8.0a9 -- June 27 2018 * Update Tor to 0.3.4.2-alpha * Update Libevent to 2.1.8 * Update Binutils to 2.26.1 - * Update Torbutton to 2.0 + * Update Torbutton to 2.0.1 * Bug 26100: Adapt Torbutton to Firefox 60 ESR + * Bug 26430: New Torbutton icon * Bug 24309: Move circuit display to the identity popup * Bug 26128: Adapt security slider to the WebExtensions version of NoScript * Bug 23247: Show security state of .onions @@ -70,6 +71,7 @@ Tor Browser 8.0a9 -- June 27 2018 * Bug 23561: Fix nsis builds for Windows 64 * Bug 23231: Remove our STL Wrappers workaround for Windows 64bit * Bug 26370: Don't copy msvcr100.dll and libssp-0.dll twice + * Bug 26476: Work around Tor Browser crashes due to fix for bug 1467041 * Bug 18287: Use SHA-2 signature for Tor Browser setup executables * OS X * Bug 24632: Update macOS toolchain for ESR 60 @@ -78,6 +80,7 @@ Tor Browser 8.0a9 -- June 27 2018 * Bug 26003: Clean up our mozconfig-osx-x86_64 file * Bug 26195: Use new cctools in our macosx-toolchain project * Bug 25975: Get a rust cross-compiler for macOS + * Bug 26475: Disable Stylo to make macOS build reproducible * Linux * Bug 26073: Patch tor-browser-build for transition to ESR 60 * Bug 25540: Stop building and distributing sandboxed tor browser diff --git a/projects/torbutton/config b/projects/torbutton/config index 0791953..ba53944 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.0 +version: 2.0.1 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 67ac46d..31aae9e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0a9' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 8.0a8 project_name: tor-browser

1 0

[tor-browser-build/master] Bug 26476: Work around Windows Tor Browser bustage
by gk＠torproject.org 24 Jun '18

24 Jun '18

commit 43cefe3afeb58e7416f7b1e508c8a251b12efb72 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jun 24 19:42:50 2018 +0000 Bug 26476: Work around Windows Tor Browser bustage --- projects/firefox/1464084.patch | 73 ++++++++++++++++++++++++++++++++++++++++++ projects/firefox/1467041.patch | 23 +++++++++++++ projects/firefox/build | 2 ++ projects/firefox/config | 4 +++ 4 files changed, 102 insertions(+) diff --git a/projects/firefox/1464084.patch b/projects/firefox/1464084.patch new file mode 100644 index 0000000..524cb7f --- /dev/null +++ b/projects/firefox/1464084.patch @@ -0,0 +1,73 @@ +From 1a1cc016c8f6ff83ea057ee6fe6838b89c382210 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Sun, 24 Jun 2018 19:36:35 +0000 +Subject: [PATCH 1/2] Revert "Bug 1464084 - Don't export + std::thread::_M_start_thread symbols with --enable-stdcxx-compat. r=froydnj, + a=RyanVM" + +This reverts commit 655e5f1d95e0d5ecd037f36dbe533372130e5621. + +diff --git a/build/unix/stdc++compat/hide_std.ld b/build/unix/stdc++compat/hide_std.ld +deleted file mode 100644 +index 4b3400b0f327..000000000000 +--- a/build/unix/stdc++compat/hide_std.ld ++++ /dev/null +@@ -1,5 +0,0 @@ +-hidden { +- local: +- # std::thread::_M_start_thread(...) +- _ZNSt6thread15_M_start_thread*; +-}; +diff --git a/build/unix/stdc++compat/moz.build b/build/unix/stdc++compat/moz.build +index 4444d0c4f297..20517a1caef5 100644 +--- a/build/unix/stdc++compat/moz.build ++++ b/build/unix/stdc++compat/moz.build +@@ -23,5 +23,3 @@ COMPILE_FLAGS['CLANG_PLUGIN'] = [] + + DEFINES['MOZ_LIBSTDCXX_VERSION'] = CONFIG['MOZ_LIBSTDCXX_TARGET_VERSION'] + HOST_DEFINES['MOZ_LIBSTDCXX_VERSION'] = CONFIG['MOZ_LIBSTDCXX_HOST_VERSION'] +- +-OS_LIBS += ['-Wl,--version-script,%s/hide_std.ld' % SRCDIR] +diff --git a/python/mozbuild/mozbuild/action/generate_symbols_file.py b/python/mozbuild/mozbuild/action/generate_symbols_file.py +index bf1ae917a2d0..f118060f47cf 100644 +--- a/python/mozbuild/mozbuild/action/generate_symbols_file.py ++++ b/python/mozbuild/mozbuild/action/generate_symbols_file.py +@@ -42,8 +42,6 @@ def generate_symbols_file(output, *args): + + symbols = [s.strip() for s in pp.out.getvalue().splitlines() if s.strip()] + +- libname, ext = os.path.splitext(os.path.basename(output.name)) +- + if buildconfig.substs['OS_TARGET'] == 'WINNT': + # A def file is generated for MSVC link.exe that looks like the + # following: +@@ -68,13 +66,14 @@ def generate_symbols_file(output, *args): + # those platforms, and to DATA on Windows, so that the "DATA" part + # is, in fact, part of the symbol name as far as the symbols variable + # is concerned. ++ libname, ext = os.path.splitext(os.path.basename(output.name)) + assert ext == '.def' + output.write('LIBRARY %s\nEXPORTS\n %s\n' + % (libname, '\n '.join(symbols))) + elif buildconfig.substs['GCC_USE_GNU_LD']: + # A linker version script is generated for GNU LD that looks like the + # following: +- # liblibrary.so { ++ # { + # global: + # symbol1; + # symbol2; +@@ -82,8 +81,8 @@ def generate_symbols_file(output, *args): + # local: + # *; + # }; +- output.write('%s {\nglobal:\n %s;\nlocal:\n *;\n};' +- % (libname, ';\n '.join(symbols))) ++ output.write('{\nglobal:\n %s;\nlocal:\n *;\n};' ++ % ';\n '.join(symbols)) + elif buildconfig.substs['OS_TARGET'] == 'Darwin': + # A list of symbols is generated for Apple ld that simply lists all + # symbols, with an underscore prefix. +-- +2.17.1 + diff --git a/projects/firefox/1467041.patch b/projects/firefox/1467041.patch new file mode 100644 index 0000000..a31e2e0 --- /dev/null +++ b/projects/firefox/1467041.patch @@ -0,0 +1,23 @@ +From 8d940fed5975400910c29037a6c575260d3caa22 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Sun, 24 Jun 2018 19:37:55 +0000 +Subject: [PATCH 2/2] Revert "Bug 1467041 - Default to --enable-release when + milestone is beta/release. r=froydnj, a=RyanVM" + +This reverts commit b1f09cd8f4a1abf13f85a2353ac1b9711200b0e5. + +diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure +index 67007c8dcf7c..a1e443019748 100755 +--- a/build/moz.configure/toolchain.configure ++++ b/build/moz.configure/toolchain.configure +@@ -1387,7 +1387,6 @@ imply_option('--enable-release', mozilla_official) + imply_option('--enable-release', depends_if('MOZ_AUTOMATION')(lambda x: True)) + + js_option('--enable-release', +- default=milestone.is_release_or_beta, + help='Build with more conservative, release engineering-oriented ' + 'options. This may slow down builds.') + +-- +2.17.1 + diff --git a/projects/firefox/build b/projects/firefox/build index f023c6d..e6fa41c 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -134,6 +134,8 @@ fi [% IF c("var/windows") %] patch -p1 < $rootdir/nsis-uninstall.patch + patch -p1 < $rootdir/1464084.patch + patch -p1 < $rootdir/1467041.patch [% END -%] [% IF c("var/osx") %] diff --git a/projects/firefox/config b/projects/firefox/config index 51dc04a..303ca0d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -106,6 +106,10 @@ input_files: enable: '[% c("var/windows") %]' - filename: nsis-uninstall.patch enable: '[% c("var/windows") %]' + - filename: 1464084.patch + enable: '[% c("var/windows") %]' + - filename: 1467041.patch + enable: '[% c("var/windows") %]' - project: rust name: rust - project: llvm

1 0

[torbutton/master] Release preparations for 2.0.1
by gk＠torproject.org 24 Jun '18

24 Jun '18

commit 8aebbf6d39ce38785f1aac8e8c4ec6cfe31b3309 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jun 24 20:34:17 2018 +0000 Release preparations for 2.0.1 Version bump and CHANGELOG update --- src/CHANGELOG | 3 ++- src/install.rdf | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index b5fdb75..f1cd4cd 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,5 +1,6 @@ -2.0 +2.0.1 * Bug 26100: Adapt Torbutton to Firefox 60 ESR + * Bug 26430: New Torbutton icon * Bug 24309: Move circuit display to the identity popup * Bug 26128: Adapt security slider to the WebExtensions version of NoScript * Bug 23247: Show security state of .onions diff --git a/src/install.rdf b/src/install.rdf index d4de4ba..233fe1f 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</em:version> + <em:version>2.0.1</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>

1 0

[torbutton/master] Bug 26430 - New torbutton icons
by gk＠torproject.org 24 Jun '18

24 Jun '18

commit 32e63d587ac4de0f47ef13db8625a474d0492d34 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Jun 22 09:31:09 2018 -0700 Bug 26430 - New torbutton icons Icon design by Antonela Debiasi. Switching our torbutton icons to SVG allows us get high quality for any size, including retina screens. Also, SVGs should scale to the correct image size, which means I think #8941 can be closed. In any case, the "iconsize" attribute has been dropped by Mozilla; see https://bugzilla.mozilla.org/show_bug.cgi?id=1430128 Blinking of update warning is implemented with a CSS animation. --- src/chrome/skin/tor-16.png | Bin 711 -> 0 bytes src/chrome/skin/tor-24.png | Bin 1433 -> 0 bytes src/chrome/skin/tor-disabled-16.png | Bin 5536 -> 0 bytes src/chrome/skin/tor-disabled-24.png | Bin 5990 -> 0 bytes src/chrome/skin/tor-enabled-16.png | Bin 915 -> 0 bytes src/chrome/skin/tor-enabled-24.png | Bin 1588 -> 0 bytes src/chrome/skin/tor-update-16.gif | Bin 1304 -> 0 bytes src/chrome/skin/tor-update-24.gif | Bin 1732 -> 0 bytes src/chrome/skin/torbutton-update-needed.svg | 11 +++++ src/chrome/skin/torbutton.css | 69 ++++++++-------------------- src/chrome/skin/torbutton.svg | 9 ++++ 11 files changed, 40 insertions(+), 49 deletions(-) diff --git a/src/chrome/skin/tor-16.png b/src/chrome/skin/tor-16.png deleted file mode 100644 index b85043f..0000000 Binary files a/src/chrome/skin/tor-16.png and /dev/null differ diff --git a/src/chrome/skin/tor-24.png b/src/chrome/skin/tor-24.png deleted file mode 100644 index a498806..0000000 Binary files a/src/chrome/skin/tor-24.png and /dev/null differ diff --git a/src/chrome/skin/tor-disabled-16.png b/src/chrome/skin/tor-disabled-16.png deleted file mode 100644 index f749377..0000000 Binary files a/src/chrome/skin/tor-disabled-16.png and /dev/null differ diff --git a/src/chrome/skin/tor-disabled-24.png b/src/chrome/skin/tor-disabled-24.png deleted file mode 100644 index c083748..0000000 Binary files a/src/chrome/skin/tor-disabled-24.png and /dev/null differ diff --git a/src/chrome/skin/tor-enabled-16.png b/src/chrome/skin/tor-enabled-16.png deleted file mode 100644 index d48a8b0..0000000 Binary files a/src/chrome/skin/tor-enabled-16.png and /dev/null differ diff --git a/src/chrome/skin/tor-enabled-24.png b/src/chrome/skin/tor-enabled-24.png deleted file mode 100644 index c8b932f..0000000 Binary files a/src/chrome/skin/tor-enabled-24.png and /dev/null differ diff --git a/src/chrome/skin/tor-update-16.gif b/src/chrome/skin/tor-update-16.gif deleted file mode 100644 index d006458..0000000 Binary files a/src/chrome/skin/tor-update-16.gif and /dev/null differ diff --git a/src/chrome/skin/tor-update-24.gif b/src/chrome/skin/tor-update-24.gif deleted file mode 100644 index 72591a8..0000000 Binary files a/src/chrome/skin/tor-update-24.gif and /dev/null differ diff --git a/src/chrome/skin/torbutton-update-needed.svg b/src/chrome/skin/torbutton-update-needed.svg new file mode 100644 index 0000000..73f819e --- /dev/null +++ b/src/chrome/skin/torbutton-update-needed.svg @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <g id="Icon---Tor---Update" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="Tor-Button-Icon" transform="translate(2.000000, 1.000000)" fill="#0C0C0D"> + <path d="M8.27206791,6.27905236 C7.88283063,6.53485117 6.37928571,7.48491742 6.38222311,7.48303971 C5.92467564,7.77552366 5.55774616,8.01739321 5.22956304,8.24495813 C4.62774003,8.66226724 4.1902024,9.01032507 3.90524298,9.30237927 C2.34845165,10.8521114 1.86583368,12.1863028 2.03292037,14.2840468 C2.17744778,16.6290092 3.98280543,18.7226974 6.62789966,19.5725823 C7.66430091,19.8978216 8.64783036,20 10.3045058,20 C12.4566798,20 14.4305353,19.426444 15.7257727,18.390024 C17.1602235,17.2499732 18,15.5258216 18,13.7581121 C18,11.9676824 17.2065463,10.2463814 15.7919239,9.00433992 C15.0624549,8.37501782 14.1112169,7.77509114 12.728283,7.03810567 C11.4758566,6.39901667 10.3718516,5.26209475 9.95586156,3.83344263 C9.74417905,4.87665258 9.16812751,5.7299448 8.27206791,6.27905236 Z M17.1048177,7.49557522 C18.9563878,9.1179941 20,11.3893805 20,13.7581121 C20,16.1268437 18.889058,18.4306785 16.9701581,19.9557522 C15.1859178,21.3834808 12.6947145,22 10.3045058,22 C8.8232498,22 7.47 665339,21.9351032 6.02906225,21.480826 C2.69623613,20.4100295 0.238697687,17.6843658 0.0367082257,14.4070796 C-0.165281236,11.8761062 0.440687149,9.92920354 2.49424667,7.88495575 C3.53785889,6.81415929 5.69241315,5.58112094 7.1736692,4.60766962 C7.91429722,4.15339233 8.68859016,2.79056047 7.20733411,0.227138643 L7.5103183,0 L11.9204215,1.75221239 C11.3144532,3.63421829 13.0650285,4.96460177 13.637332,5.25663717 C14.9165986,5.9380531 16.1285353,6.6519174 17.1048177,7.49557522 Z" id="Border" fill-rule="nonzero"></path> + <path d="M10,5.80000019 C10.3632315,6.90320629 11.2333653,7.78038283 12.2159038,8.28105702 C13.3397544,8.87914153 14.1127842,9.36599897 14.7055922,9.87671162 C15.8551945,10.8846633 16.5,12.2815477 16.5,13.7345319 C16.5,15.1690781 15.81755,16.5682758 14.6518339,17.4934592 C13.5992506,18.3345433 11.9951837,18.8000002 10.2462051,18.8000002 C10.1620472,18.8000002 10.0800269,18.7996762 10,18.7990042 L10,5.80000019 Z" id="Half-Content"></path> + </g> + <polygon id="Triangle" fill="#0C0C0D" points="7 11 13 23 1 23"></polygon> + <path d="M13.6929417,21.0118641 C14.0028183,21.6319873 13.9694684,22.3683526 13.6048048,22.957926 C13.2401412,23.5474994 12.5961777,23.9061872 11.9029417,23.9058641 L1.99794165,23.9058641 C1.30603325,23.9051512 0.663641796,23.5468644 0.299459428,22.9585541 C-0.0647229393,22.3702439 -0.0989581202,21.6354894 0.208941651,21.0158641 L5.16194165,11.1058641 C5.50066779,10.428136 6.19328022,10 6.95094165,10 C7.70860308,10 8.40121551,10.428136 8.73994165,11.1058641 L13.6929417,21.0118641 Z M5.95094165,13.9058641 L5.95094165,17.9058641 C5.95094165,18.4581489 6.3986569,18.9058641 6.95094165,18.9058641 C7.5032264,18.9058641 7.95094165,18.4581489 7.95094165,17.9058641 L7.95094165,13.9058641 C7.95094165,13.3535794 7.5032264,12.9058641 6.95094165,12.9058641 C6.3986569,12.9058641 5.95094165,13.3535794 5.95094165,13.9058641 Z M6.95094165,22.1558641 C7.64129759,22.1558641 8.20094165,21.59622 8.20094165,20.9058641 C8.20094165,20.2155082 7.64129759,19.6558641 6.95094165,19.6558641 C6.26058571, 19.6558641 5.70094165,20.2155082 5.70094165,20.9058641 C5.70094165,21.59622 6.26058571,22.1558641 6.95094165,22.1558641 Z" id="Shape" fill="#FFE900" fill-rule="nonzero"></path> + </g> +</svg> diff --git a/src/chrome/skin/torbutton.css b/src/chrome/skin/torbutton.css index 5bdcaa6..14166b7 100644 --- a/src/chrome/skin/torbutton.css +++ b/src/chrome/skin/torbutton.css @@ -1,73 +1,44 @@ +@keyframes blink-update { + 0% { + list-style-image: url("chrome://torbutton/skin/torbutton-update-needed.svg"); + } + 100% { + list-style-image: url("chrome://torbutton/skin/torbutton.svg"); + } +} + #torbutton-button { - list-style-image: url("chrome://torbutton/skin/tor-24.png"); + list-style-image: url("chrome://torbutton/skin/torbutton.svg"); } #torbutton-button[tbstatus="on"] { - list-style-image: url("chrome://torbutton/skin/tor-enabled-24.png"); + opacity: 1.0; } #torbutton-button[tbstatus="off"] { - list-style-image: url("chrome://torbutton/skin/tor-disabled-24.png"); + opacity: 0.4; } #torbutton-button[tbUpdateNeeded="true"] { - list-style-image: url("chrome://torbutton/skin/tor-update-24.gif"); -} -toolbar[iconsize="small"] #torbutton-button { - list-style-image: url("chrome://torbutton/skin/tor-16.png"); -} -/* Although the tor-enabled-16.png, tor-disabled-16.png and tor-update-16.gif -indicate that they are 16x16 icons, they have 18x18 pixels in fact. This -leads to resizing the content window's height on start-up on Windows at -least. To guarantee a content window with a multiple of 200x100 we -therefore use only a x16 part of each icon while trying to minimize bad UI -effects until #8941 gets fixed.*/ -toolbar[iconsize="small"] #torbutton-button[tbstatus="on"] { - list-style-image: url("chrome://torbutton/skin/tor-enabled-16.png"); - -moz-image-region: rect(1px, 17px, 17px, 1px); -} -toolbar[iconsize="small"] #torbutton-button[tbstatus="off"] { - list-style-image: url("chrome://torbutton/skin/tor-disabled-16.png"); - -moz-image-region: rect(0px, 18px, 16px, 0px); -} -toolbar[iconsize="small"] #torbutton-button[tbUpdateNeeded="true"] { - list-style-image: url("chrome://torbutton/skin/tor-update-16.gif"); - -moz-image-region: rect(1px, 17px, 17px, 1px); + opacity: 1.0; + animation: blink-update normal 1s infinite ease-in-out; } #torbutton-button-tb { - list-style-image: url("chrome://torbutton/skin/tor-24.png"); + list-style-image: url("chrome://torbutton/skin/torbutton.svg"); } #torbutton-button-tb[tbstatus="on"] { - list-style-image: url("chrome://torbutton/skin/tor-enabled-24.png"); + opacity: 1.0; } #torbutton-button-tb[tbstatus="off"] { - list-style-image: url("chrome://torbutton/skin/tor-disabled-24.png"); -} -toolbar[iconsize="small"] #torbutton-button-tb { - list-style-image: url("chrome://torbutton/skin/tor-16.png"); -} -toolbar[iconsize="small"] #torbutton-button-tb[tbstatus="on"] { - list-style-image: url("chrome://torbutton/skin/tor-enabled-16.png"); -} -toolbar[iconsize="small"] #torbutton-button-tb[tbstatus="off"] { - list-style-image: url("chrome://torbutton/skin/tor-disabled-16.png"); + opacity: 0.4; } #torbutton-button-tb-msg { - list-style-image: url("chrome://torbutton/skin/tor-24.png"); + list-style-image: url("chrome://torbutton/skin/torbutton.svg"); } #torbutton-button-tb-msg[tbstatus="on"] { - list-style-image: url("chrome://torbutton/skin/tor-enabled-24.png"); + opacity: 1.0; } #torbutton-button-tb-msg[tbstatus="off"] { - list-style-image: url("chrome://torbutton/skin/tor-disabled-24.png"); -} -toolbar[iconsize="small"] #torbutton-button-tb-msg { - list-style-image: url("chrome://torbutton/skin/tor-16.png"); -} -toolbar[iconsize="small"] #torbutton-button-tb-msg[tbstatus="on"] { - list-style-image: url("chrome://torbutton/skin/tor-enabled-16.png"); -} -toolbar[iconsize="small"] #torbutton-button-tb-msg[tbstatus="off"] { - list-style-image: url("chrome://torbutton/skin/tor-disabled-16.png"); + opacity: 0.4; } #torbutton-checkForUpdate[tbUpdateNeeded] { diff --git a/src/chrome/skin/torbutton.svg b/src/chrome/skin/torbutton.svg new file mode 100644 index 0000000..518e981 --- /dev/null +++ b/src/chrome/skin/torbutton.svg @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <g id="Icon---Tor-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="Tor-Button-Icon" transform="translate(2.000000, 1.000000)" fill="#0C0C0D"> + <path d="M8.27206791,6.27905236 C7.88283063,6.53485117 6.37928571,7.48491742 6.38222311,7.48303971 C5.92467564,7.77552366 5.55774616,8.01739321 5.22956304,8.24495813 C4.62774003,8.66226724 4.1902024,9.01032507 3.90524298,9.30237927 C2.34845165,10.8521114 1.86583368,12.1863028 2.03292037,14.2840468 C2.17744778,16.6290092 3.98280543,18.7226974 6.62789966,19.5725823 C7.66430091,19.8978216 8.64783036,20 10.3045058,20 C12.4566798,20 14.4305353,19.426444 15.7257727,18.390024 C17.1602235,17.2499732 18,15.5258216 18,13.7581121 C18,11.9676824 17.2065463,10.2463814 15.7919239,9.00433992 C15.0624549,8.37501782 14.1112169,7.77509114 12.728283,7.03810567 C11.4758566,6.39901667 10.3718516,5.26209475 9.95586156,3.83344263 C9.74417905,4.87665258 9.16812751,5.7299448 8.27206791,6.27905236 Z M17.1048177,7.49557522 C18.9563878,9.1179941 20,11.3893805 20,13.7581121 C20,16.1268437 18.889058,18.4306785 16.9701581,19.9557522 C15.1859178,21.3834808 12.6947145,22 10.3045058,22 C8.8232498,22 7.47 665339,21.9351032 6.02906225,21.480826 C2.69623613,20.4100295 0.238697687,17.6843658 0.0367082257,14.4070796 C-0.165281236,11.8761062 0.440687149,9.92920354 2.49424667,7.88495575 C3.53785889,6.81415929 5.69241315,5.58112094 7.1736692,4.60766962 C7.91429722,4.15339233 8.68859016,2.79056047 7.20733411,0.227138643 L7.5103183,0 L11.9204215,1.75221239 C11.3144532,3.63421829 13.0650285,4.96460177 13.637332,5.25663717 C14.9165986,5.9380531 16.1285353,6.6519174 17.1048177,7.49557522 Z" id="Border" fill-rule="nonzero"></path> + <path d="M10,5.80000019 C10.3632315,6.90320629 11.2333653,7.78038283 12.2159038,8.28105702 C13.3397544,8.87914153 14.1127842,9.36599897 14.7055922,9.87671162 C15.8551945,10.8846633 16.5,12.2815477 16.5,13.7345319 C16.5,15.1690781 15.81755,16.5682758 14.6518339,17.4934592 C13.5992506,18.3345433 11.9951837,18.8000002 10.2462051,18.8000002 C10.1620472,18.8000002 10.0800269,18.7996762 10,18.7990042 L10,5.80000019 Z" id="Half-Content"></path> + </g> + </g> +</svg>

1 0

[tor-browser-build/master] Bug 26475: Make macOS bundles based on ESR60 reproducible
by gk＠torproject.org 24 Jun '18

24 Jun '18

commit d9db6035a3e0f0423accb7d6c3b9a2680577436f Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jun 24 11:26:00 2018 +0000 Bug 26475: Make macOS bundles based on ESR60 reproducible We know that Stylo is causing reproducibility issues on macOS, disable it for now. --- projects/firefox/mozconfig-osx-x86_64 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 1e30084..7ff17e1 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -48,6 +48,9 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests +# We need to disable for Stylo right now, as we have reproducibility issues on +# macOS with it enabled, see: #26475. +ac_add_options --disable-stylo # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme # ac_add_options --disable-ctypes

1 0

[tor-browser-build/master] Pick up new tor-browser tag
by gk＠torproject.org 23 Jun '18

23 Jun '18

commit a95236c79eeb8c05d681633249dfcd0e131e97ac Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 23 11:24:01 2018 +0000 Pick up new tor-browser tag Picking up build2 and updating the Changelog --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 13 ++++++++++--- rbm.conf | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 350b4fd..51dc04a 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 7a536da..1ceda50 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -12,9 +12,9 @@ Tor Browser 8.0a9 -- June 27 2018 * Bug 26129: Show our about:tor page on startup * Bug 26235: Hide new unusable items from help menu * Bug 26058: Remove workaround for hiding 'sign in to sync' button - * Bug 20628: Add locales bn-BD, da, he, sv, zh-TW + * Bug 20628: Add locales da, he, sv, and zh-TW * Translations update - * Update Tor Launcher to 0.2.16 + * Update Tor Launcher to 0.2.16.1 * Bug 25750: Update Tor Launcher to make it compatible with Firefox 60 ESR * Bug 20890: Increase control port connection timeout * Bug 20628: Add more locales to Tor Browser @@ -24,13 +24,14 @@ Tor Browser 8.0a9 -- June 27 2018 * Bug 25543: Rebase Tor Browser patches for ESR60 * Bug 23247: Show security state of .onions * Bug 26039: Load our preferences that modify extensions + * Bug 17965: Isolate HPKP and HSTS to URL bar domain * Bug 26365: Add potential AltSvc support * Bug 26045: Add new MAR signing keys * Bug 22564: Hide Firefox Sync * Bug 25090: Disable updater telemetry * Bug 26127: Make sure Torbutton and Tor Launcher are not treated as legacy extensions * Bug 26073: Migrate general.useragent.locale to intl.locale.requested - * Bug 20628: Make Tor Browser available in bn-BD, da, he, sv-SE, and zh-TW + * Bug 20628: Make Tor Browser available in da, he, sv-SE, and zh-TW * Bug 12927: Include Hebrew translation into Tor Browser * Bug 21245: Add danish (da) translation * Windows @@ -40,10 +41,16 @@ Tor Browser 8.0a9 -- June 27 2018 * Bug 26304: Update zlib to version 1.2.11 * OS X * Bug 24052: Backport fix for bug 1412081 for better file:// handling + * Bug 24136: After loading file:// URLs clicking on links is broken on OS X + * Bug 24243: Tor Browser only renders HTML for local pages via file:// + * Bug 24263: Tor Browser does not run extension scripts if loaded via about:debugging * Bug 24632: Disable snowflake for now until its build is fixed * Bug 26438: Remove broken seatbelt profiles * Linux * Bug 24052: Backport fix for bug 1412081 for better file:// handling + * Bug 24136: After loading file:// URLs clicking on links is broken on Linux + * Bug 24243: Tor Browser only renders HTML for local pages via file:// + * Bug 24263: Tor Browser does not run extension scripts if loaded via about:debugging * Bug 26153: Update selfrando to be compatible with Firefox 60 ESR * Bug 22242: Remove RUNPATH in Linux binaries embedded by selfrando * Bug 26354: Set SSE2 support as minimal requirement for Tor Browser 8 diff --git a/rbm.conf b/rbm.conf index d15415e..67ac46d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0a9' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.0a8 project_name: tor-browser

1 0

[tor-browser-build/master] fixup! Bug 26039: <profiledir>/preferences/extension-overrides.js will not be loaded in ESR 60
by gk＠torproject.org 23 Jun '18

23 Jun '18

commit c21b1a526ac1e199990496c234532ed309b6209e Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 23 10:46:30 2018 +0000 fixup! Bug 26039: <profiledir>/preferences/extension-overrides.js will not be loaded in ESR 60 There is no `extension-overrides.js` in a profile direcory anymore. --- projects/tor-browser/build | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 4068eae..0c3e583 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -90,8 +90,6 @@ tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -xf [% c('input_files mkdir -p $SKELETON_TMP_RESOURCES/browser echo "[XRE]" > $SKELETON_TMP_RESOURCES/browser/override.ini echo "EnableProfileMigrator=0" >> $SKELETON_TMP_RESOURCES/browser/override.ini - mkdir -p $SKELETON_TMP_RESOURCES/distribution/preferences - cp -p Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js $SKELETON_TMP_RESOURCES/distribution/preferences mkdir -p $SKELETON_TMP_RESOURCES/TorBrowser/Tor cp -p Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults $SKELETON_TMP_RESOURCES/TorBrowser/Tor/ # Place a copy of the bookmarks.html file at the top. It will be moved into

1 0

[tor-browser-build/master] Merge remote-tracking branch 'sukhe/bug-26186'
by gk＠torproject.org 23 Jun '18

23 Jun '18

commit 552dcb823fa523449d4aa5022e1cf70fe785b8e0 Merge: bff4fd1 6da864e Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 23 10:07:15 2018 +0000 Merge remote-tracking branch 'sukhe/bug-26186' projects/tor-browser/build | 1 - 1 file changed, 1 deletion(-)

1 0

[tor-browser-build/master] Bug 26186: Replace usage of `intl.locale.matchOS` in tor-browser's build script
by gk＠torproject.org 23 Jun '18

23 Jun '18

commit 6da864eb71aa8271b7699023eba373a43a0eeccd Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Jun 22 11:11:09 2018 -0400 Bug 26186: Replace usage of `intl.locale.matchOS` in tor-browser's build script `intl.locale.matchOS` has been deprecated and the new preference is `intl.locale.requested`, which is set by commit 473342eefe. See bug 26073 for more information. --- projects/tor-browser/build | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index f3ed949..cca23c0 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -146,7 +146,6 @@ cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> "$TBDIR/$MEEKPROFILEPATH/u [% IF ! c("var/multi_lingual") %] echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$EXTOVERRIDESPATH" - echo 'pref("intl.locale.matchOS", false);' >> "$EXTOVERRIDESPATH" [% END %] [% IF c("var/linux") %]

1 0

[tor-browser-build/master] bn-BD locale is currently broken in Tor Browser
by gk＠torproject.org 23 Jun '18

23 Jun '18

commit bff4fd1fe7a4e1f105973e9af217b8fefc3db392 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 23 10:01:15 2018 +0000 bn-BD locale is currently broken in Tor Browser --- projects/tor-launcher/config | 2 +- rbm.conf | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index c42e18c..013b897 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.16 +version: 0.2.16.1 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index ae8dc96..d15415e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -52,7 +52,6 @@ var: locale_ja: ja locales: - ar - - bn-BD - da - de - es-ES

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 23 Jun '18

23 Jun '18

commit a0efd2fcd6e945919b46c9204846b14cdcc188bb Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 23 09:45:36 2018 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. We modify the language packs to add our own search engines etc. and therefore breaks Mozilla's signature, see: 26465. Thus, we need to disable the signing requirement for language packs right now. --- 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 dd494b80ebe0..c3d83adf7d43 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -351,6 +351,9 @@ pref("security.family_safety.mode", 0); // Enforce SHA1 deprecation, see: bug 18042. pref("security.pki.sha1_enforcement_level", 2); +// Disable the language pack signing check for now, see: bug 26465 +pref("extensions.langpacks.signatures.required", false); + // Avoid report TLS errors to Mozilla. We might want to repurpose this feature // one day to help detecting bad relays (which is bug 19119). For now we just // hide the checkbox, see bug 22072.

1 0

[tor-launcher/master] Version bump and translation update
by gk＠torproject.org 23 Jun '18

23 Jun '18

commit 78001e61af52485ecfa20e6fe6a34f705ee3d91c Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 23 08:53:30 2018 +0000 Version bump and translation update --- src/chrome/locale/pt/network-settings.dtd | 6 +++--- src/chrome/locale/pt/torlauncher.properties | 28 ++++++++++++++-------------- src/install.rdf | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index b0b6e52..e528c95 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -52,11 +52,11 @@ <!ENTITY torsettings.copyLog "Copiar o Registo do Tor para a Área de Transferência"> <!ENTITY torsettings.proxyHelpTitle "Ajuda de Proxy"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelp1 "é necessário um proxy local quando ligar através de uma rede de empresa, escolar ou universitária. Se não tiver a certeza de como responder a esta questão, verifique as definições da Internet em outro navegador ou verifique as definições de rede do seu sistema para ver se é necessário um proxy."> <!ENTITY torsettings.bridgeHelpTitle "Ajuda da Retransmissão de Ponte"> -<!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.bridgeHelp1 "As pontes são retransmissões não listadas que dificultam o bloqueio de ligações à Rede Tor. Cada tipo de ponte utiliza um método diferente para evitar a censura. Os "obfs" fazem com que o seu tráfego pareça um ruído aleatório, e os pacíficos fazem com que o seu tráfego pareça que está a ligar-se ao serviço, em vez ao Tor."> +<!ENTITY torsettings.bridgeHelp2 "Por causa de como certos países tentam bloquear o Tor, certas pontes funcionam em certos países, mas não em outros. Se não tiver a certeza sobre quais as pontes que funcionam no seu país, visite torproject.org/about/contact.htmupport">  <!ENTITY torprogress.pleaseWait "Por favor, aguarde, enquanto nós estabelecemos uma ligação à rede Tor.  Isto pode demorar alguns minutos."> diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties index d90dca4..dd89633 100644 --- a/src/chrome/locale/pt/torlauncher.properties +++ b/src/chrome/locale/pt/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited_during_startup=O Tor fechou-se durante o arranque. Isto pode ter acontecido devido a erro no seu ficheiro torrc, um erro no Tor ou outro programa no seu sistema, ou falha de hardware. Até que corrija o problema em causa reinicie o Tor, o Tor Browser não irá iniciar. -torlauncher.tor_exited=O Tor encerrou inesperadamente. Isto pode ter acontecido devido a erro dentro do Tor, outro programa no seu sistema ou falha de hardware. Até que reinicie o Tor, o Tor Browser não irá poder aceder a quaisquer sítios da Web. Se o problema persistir, por favor, envie uma cópia do Registo de Eventos do seu Tor para a equipa de suporte. +torlauncher.tor_exited=O Tor fechou.se inesperadamente. Isto pode ter acontecido devido a erro dentro do Tor, outro programa no seu sistema ou falha de hardware. Até que reinicie o Tor, o Tor Browser não irá poder aceder a quaisquer sítios da Web. Se o problema persistir, por favor, envie uma cópia do Registo de Eventos do seu Tor para a equipa de suporte. torlauncher.tor_exited2=Ao reiniciar o Tor não irá fechar os separadores do seu navegador. torlauncher.tor_controlconn_failed=Não foi possível ligar à porta de controlo do Tor. torlauncher.tor_failed_to_start=O Tor não foi iniciado. @@ -15,7 +15,7 @@ torlauncher.tor_bootstrap_failed_details=%1$S falhou (%2$S). torlauncher.unable_to_start_tor=Não é possível iniciar o Tor.\n\n %S torlauncher.tor_missing=O executável do Tor está em falta. torlauncher.torrc_missing=O ficheiro torc está em falta e não foi possível criá-lo. -torlauncher.datadir_missing=A diretoria de dados Tor não existe e não foi possível criá-la. +torlauncher.datadir_missing=A diretoria de dados do Tor não existe e não foi possível criá-la. torlauncher.password_hash_missing=Não foi possível obter a palavra-passe "hashed". torlauncher.failed_to_get_settings=Não é possível obter as configurações do Tor\n\n %S @@ -26,20 +26,20 @@ torlauncher.error_proxy_addr_missing=Deve especificar ambos, um endereço de IP torlauncher.error_proxy_type_missing=Deve selecionar o tipo de proxy. torlauncher.error_bridges_missing=Deve especificar uma ou mais pontes. torlauncher.error_default_bridges_type_missing=Deve selecionar o tipo de transporte para as pontes fornecidas -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. +torlauncher.error_bridgedb_bridges_missing=Por favor, solicite uma ponte. torlauncher.error_bridge_bad_default_type=Não estão disponíveis as pontes fornecidas que têm o tipo de transporte %S. Por favor, ajuste as suas configurações. torlauncher.bridge_suffix.meek-amazon=(funciona na China) torlauncher.bridge_suffix.meek-azure=(funciona na China) -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=Solicite uma Ponte... +torlauncher.request_a_new_bridge=Solicite uma Nova Ponte... +torlauncher.contacting_bridgedb=A contactar BridgeDB. Por favor, aguarde. +torlauncher.captcha_prompt=Resolva o CAPTCHA para solicitar uma ponte. +torlauncher.bad_captcha_solution=A solução não está correta. Por favor, tente novamente. +torlauncher.unable_to_get_bridge=Não é possível obter uma ponte de BridgeDB.\n\n%S +torlauncher.no_meek=Este navegador não está configurado para "meek", que é necessário para obter as pontes. +torlauncher.no_bridges_available=De momento, não estão disponíveis pontes. Desculpe. torlauncher.connect=Ligar torlauncher.restart_tor=Reiniciar o Tor @@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=sem rota para o hospedeiro torlauncher.bootstrapWarning.ioerror=Erro de leitura/gravação torlauncher.bootstrapWarning.pt_missing=transporte de ligação em falta -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=A ligação para o servidor foi perdida. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Não foi possível ligar ao servidor. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Não foi possível ligar ao proxy. diff --git a/src/install.rdf b/src/install.rdf index 011ab5b..5a31473 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</em:version> + <em:version>0.2.16.1</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] Bug 26466: Remove sv-SE from tracking for releases
by gk＠torproject.org 23 Jun '18

23 Jun '18

commit 300d8921fe752e3168e7071bf2506762e96f10d7 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 23 08:44:33 2018 +0000 Bug 26466: Remove sv-SE from tracking for releases sv-SE is essentially not used for Swedish translations. We should fall back to sv. --- src/chrome/locale/sv-SE/network-settings.dtd | 55 -------------------------- src/chrome/locale/sv-SE/torlauncher.properties | 31 --------------- 2 files changed, 86 deletions(-) diff --git a/src/chrome/locale/sv-SE/network-settings.dtd b/src/chrome/locale/sv-SE/network-settings.dtd deleted file mode 100644 index 6ce1473..0000000 --- a/src/chrome/locale/sv-SE/network-settings.dtd +++ /dev/null @@ -1,55 +0,0 @@ -<!ENTITY torsettings.dialog.title ""> - - - -<!ENTITY torsettings.prompt ""> - -<!ENTITY torSettings.yes ""> -<!ENTITY torSettings.no ""> - -<!ENTITY torSettings.firstQuestion ""> -<!ENTITY torSettings.configurePrompt1 ""> -<!ENTITY torSettings.configurePrompt2 ""> -<!ENTITY torSettings.configure ""> -<!ENTITY torSettings.connectPrompt1 ""> -<!ENTITY torSettings.connectPrompt2 ""> -<!ENTITY torSettings.connect ""> - -<!ENTITY torSettings.proxyQuestion ""> - -<!ENTITY torSettings.proxyHelp ""> -<!ENTITY torSettings.enterProxy ""> -<!ENTITY torSettings.firewallQuestion ""> -<!ENTITY torSettings.firewallHelp ""> -<!ENTITY torSettings.enterFirewall ""> -<!ENTITY torSettings.bridgeQuestion ""> - - - -<!ENTITY torsettings.startingTor ""> -<!ENTITY torsettings.restart ""> - -<!ENTITY torsettings.optional ""> - -<!ENTITY torsettings.useProxy.checkbox ""> -<!ENTITY torsettings.useProxy.type ""> -<!ENTITY torsettings.useProxy.address ""> -<!ENTITY torsettings.useProxy.address.placeholder ""> -<!ENTITY torsettings.useProxy.port ""> -<!ENTITY torsettings.useProxy.username ""> -<!ENTITY torsettings.useProxy.password ""> -<!ENTITY torsettings.useProxy.type.socks4 ""> -<!ENTITY torsettings.useProxy.type.socks5 ""> -<!ENTITY torsettings.useProxy.type.http ""> -<!ENTITY torsettings.firewall.checkbox ""> -<!ENTITY torsettings.firewall.allowedPorts ""> -<!ENTITY torsettings.useBridges.checkbox ""> -<!ENTITY torsettings.useBridges.label ""> -<!ENTITY torsettings.useBridges.placeholder ""> - -<!ENTITY torsettings.copyLog ""> -<!ENTITY torsettings.bridgeHelpTitle ""> -<!ENTITY torsettings.bridgeHelp1 ""> -<!ENTITY torsettings.bridgeHelp2 ""> -<!ENTITY torsettings.bridgeHelp3 ""> -<!ENTITY torsettings.bridgeHelp4 ""> diff --git a/src/chrome/locale/sv-SE/torlauncher.properties b/src/chrome/locale/sv-SE/torlauncher.properties deleted file mode 100644 index fcd4d83..0000000 --- a/src/chrome/locale/sv-SE/torlauncher.properties +++ /dev/null @@ -1,31 +0,0 @@ -### Copyright (c) 2013, The Tor Project, Inc. -### See LICENSE for licensing information. - -# torlauncher.error_title=Tor Launcher - -# torlauncher.tor_exited=Tor unexpectedly exited. -# torlauncher.please_restart_app=Please restart this application. -# torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -# torlauncher.tor_failed_to_start=Tor failed to start. -# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%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. -# torlauncher.datadir_missing=The Tor data directory does not exist. -# torlauncher.password_hash_missing=Failed to get hashed password. - -# 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.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.connect=Connect -# torlauncher.quit=Quit -# torlauncher.quit_win=Exit -# torlauncher.done=Done - -# torlauncher.forAssistance=For assistance, contact %S

1 0