June 2018 - tbb-commits - lists.torproject.org

[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] 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 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] 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