- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 40090: NSIS 3.06.1 still needs timestamp patch
by sysrqb＠torproject.org 14 Sep '20

14 Sep '20

commit 8b94652d56490e59fff098abecae02c903794972 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 14 13:49:03 2020 +0000 Bug 40090: NSIS 3.06.1 still needs timestamp patch --- projects/nsis/build | 5 +++++ projects/nsis/config | 1 + projects/nsis/no-insert-timestamp.patch | 27 +++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/projects/nsis/build b/projects/nsis/build index 54287db..41f7c1a 100755 --- a/projects/nsis/build +++ b/projects/nsis/build @@ -8,6 +8,11 @@ tar -C /var/tmp/build -xf nsis-[% c('version') %].tar.bz2 tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %] cd /var/tmp/build/nsis-[% c('version') %]-src +# Adding --no-insert-timestamp to APPEND_LINKFLAGS is not working as it +# is used for both the host and cross-compiled parts, but this option is +# only valid for the Windows linker. Therefore we add it using a patch +# to the cross-compilation part only. Still needed as of 3.06.1, see: #40090. +patch -p1 < $rootdir/no-insert-timestamp.patch [% IF c("var/windows-x86_64") %] # Seems like setting TARGET_ARCH is not enough so we need to patch build.cpp diff --git a/projects/nsis/config b/projects/nsis/config index 36f29e2..f6dd12d 100644 --- a/projects/nsis/config +++ b/projects/nsis/config @@ -17,6 +17,7 @@ input_files: - filename: 'nsis-[% c("version") %].tar.bz2' URL: 'https://downloads.sourceforge.net/nsis/nsis-[% c("version") %]-src.tar.bz2' sha256sum: 9b5d68bf1874a7b393432410c7e8c376f174d2602179883845d2508152153ff0 + - filename: no-insert-timestamp.patch - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - name: zlib diff --git a/projects/nsis/no-insert-timestamp.patch b/projects/nsis/no-insert-timestamp.patch new file mode 100644 index 0000000..8053b82 --- /dev/null +++ b/projects/nsis/no-insert-timestamp.patch @@ -0,0 +1,27 @@ +diff -ur nsis-3.03-src/SCons/Config/gnu nsis-3.03-src.n/SCons/Config/gnu +--- nsis-3.03-src/SCons/Config/gnu 2017-10-06 15:30:20.000000000 -0400 ++++ nsis-3.03-src.n/SCons/Config/gnu 2018-06-17 13:26:05.945495151 -0400 +@@ -102,6 +102,7 @@ + stub_env.Append(LINKFLAGS = ['$NODEFLIBS_FLAG']) # no standard libraries + stub_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align + stub_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file ++stub_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds + + stub_uenv = stub_env.Clone() + stub_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE']) +@@ -142,6 +143,7 @@ + plugin_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file + plugin_env.Append(LINKFLAGS = ['-static-libgcc']) # remove libgcc*.dll dependency + plugin_env.Append(LINKFLAGS = ['-static-libstdc++']) # remove libstdc++*.dll dependency ++plugin_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds + + plugin_uenv = plugin_env.Clone() + plugin_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE']) +@@ -181,6 +183,7 @@ + + util_env.Append(LINKFLAGS = ['-mwindows']) # build windows executables + util_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align ++util_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds + + + conf = FlagsConfigure(util_env)

1 0

[tor-browser-build/master] Pick up fix for #40090 for -build3
by sysrqb＠torproject.org 14 Sep '20

14 Sep '20

commit 7f646713d7fa52f5b69153de6453a293c3a3bb08 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Sep 14 14:24:08 2020 +0000 Pick up fix for #40090 for -build3 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + rbm.conf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index ab3f0cd..b0cdf08 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -21,6 +21,7 @@ Tor Browser 10.0a7 -- September 14 2020 * Bug 40045: Fix complete .mar file creation for dmg2mar [tor-browser-build] * Bug 40065: Bump debootstrap-image ubuntu_version to 20.04.1 [tor-browser-build] * Bug 40087: Deterministically add HTTPS Everywhere into omni.ja + * Bug 40090: NSIS 3.06.1 based builds are not reproducible anymore * Windows * Bug 40052: Bump NSIS to 3.06.1 [tor-browser-build] * Bug 40071: Be explicit about no SEH with mingw-w64 on 32bit systems [tor-browser-build] diff --git a/rbm.conf b/rbm.conf index eaef6c7..a68c101 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '10.0a7' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 10.0a6 project_name: tor-browser

1 0

[tor-browser-build/master] Bug 40088: Use MOZ_BUILD_DATE for extension manifest timestamps
by gk＠torproject.org 14 Sep '20

14 Sep '20

commit 6addbb462522428c8aecbd901510d6a523188686 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 14 08:47:38 2020 +0000 Bug 40088: Use MOZ_BUILD_DATE for extension manifest timestamps --- projects/fenix/build | 14 ++++++++++++++ projects/fenix/config | 1 + 2 files changed, 15 insertions(+) diff --git a/projects/fenix/build b/projects/fenix/build index 806044b..7569250 100644 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -6,6 +6,10 @@ builddir=/var/tmp/build/[% project %] mkdir -p $distdir/[% project %] mkdir -p /var/tmp/build +cat > get-moz-build-date << "EOF" +[% INCLUDE "get-moz-build-date" %] +EOF + [% IF !c("var/fetch_gradle_dependencies") %] [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] # XXX: Make this more generic and not only for geckoview-beta. @@ -45,6 +49,16 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ # not only for geckoview-beta. cp -f $distdir/geckoview/*.aar $gradle_repo/org/mozilla/geckoview/geckoview-beta/$geckoview_version/geckoview-beta-$geckoview_version.aar + eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] [% c("var/torbrowser_version") %]) + if [ -z $MOZ_BUILD_DATE ] + then + echo "MOZ_BUILD_DATE is not set" + exit 1 + else + # We only need a MMddHHmmss format and thus no year. + MOZ_BUILD_DATE=${MOZ_BUILD_DATE:4} + fi + $GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint # XXX We need the build variant in lower case. Do something smarter here. v=[% c("variant") %] diff --git a/projects/fenix/config b/projects/fenix/config index 034714f..64b9620 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -11,6 +11,7 @@ var: fenix_version: '81.1.0b[% c("var/beta_version") %]' beta_version: 1 torbrowser_branch: 10.0 + copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' container: use_container: 1 # This should be updated when the list of gradle dependencies is changed.

1 0

[tor-browser-build/master] Pick up fix for #40087 for -build2
by gk＠torproject.org 13 Sep '20

13 Sep '20

commit ab5f1f6046a62b7f563fff3c30f1420eec5d0b05 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 13 19:35:00 2020 +0000 Pick up fix for #40087 for -build2 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 3 ++- rbm.conf | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 4821e83..ab3f0cd 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -18,8 +18,9 @@ Tor Browser 10.0a7 -- September 14 2020 * Windows + OS X + Linux * Bump Go to 1.14.7 * Bug 40031: Add licenses for kcp-go and smux. [tor-browser-build] - * Bug 40065: Bump debootstrap-image ubuntu_version to 20.04.1 [tor-browser-build] * Bug 40045: Fix complete .mar file creation for dmg2mar [tor-browser-build] + * Bug 40065: Bump debootstrap-image ubuntu_version to 20.04.1 [tor-browser-build] + * Bug 40087: Deterministically add HTTPS Everywhere into omni.ja * Windows * Bug 40052: Bump NSIS to 3.06.1 [tor-browser-build] * Bug 40071: Be explicit about no SEH with mingw-w64 on 32bit systems [tor-browser-build] diff --git a/rbm.conf b/rbm.conf index 7cf5369..eaef6c7 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '10.0a7' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 10.0a6 project_name: tor-browser

1 0

[tor-browser-build/master] Move nightly to torbrowser-all again
by gk＠torproject.org 13 Sep '20

13 Sep '20

commit dcc3631b3191a8f8fb75d98c11ec69e53c3f74e5 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 13 19:31:21 2020 +0000 Move nightly to torbrowser-all again --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 391f5d0..7e2e104 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ alpha-src: submodule-update $(rbm) build release --target alpha --target torbrowser-src nightly: submodule-update - $(rbm) build release --target nightly --target torbrowser-all-desktop + $(rbm) build release --target nightly --target torbrowser-all nightly-android: submodule-update $(rbm) build release --target nightly --target torbrowser-all-android

1 0

[tor-browser-build/master] Bug 40087: Deterministically add HTTPS Everywhere into omni.ja
by gk＠torproject.org 13 Sep '20

13 Sep '20

commit 16fa8c3bf91a9c1a827a7d23be344de599cd10bb Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Sep 13 14:53:01 2020 +0000 Bug 40087: Deterministically add HTTPS Everywhere into omni.ja --- projects/tor-browser/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 33a3f42..1d2e35b 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -81,7 +81,7 @@ pushd $TMP_HTTPS_EVERYWHERE_PATH mkdir -p chrome/torbutton/content/extensions/https-everywhere/ unzip $rootdir/[% c('input_files_by_name/https-everywhere') %] -d chrome/torbutton/content/extensions/https-everywhere/ find . -exec [% c("var/touch") %] {} \; -zip -Xr "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]/omni.ja" chrome/ +find chrome/ | sort | zip -X -@ "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]/omni.ja" popd rm -rf $TMP_HTTPS_EVERYWHERE_PATH

1 0

[tor-browser-build/master] Fix up 10.0a7 Changelog entry
by gk＠torproject.org 12 Sep '20

12 Sep '20

commit 3d60a3b6d6492a07fbb01db4b2ffd53d1e78cf9a Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 12 12:45:13 2020 +0000 Fix up 10.0a7 Changelog entry --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 6f70249..4821e83 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -3,6 +3,7 @@ Tor Browser 10.0a7 -- September 14 2020 * Update Tor Launcher to 0.2.24 * Update NoScript to 11.0.43 * Translations update + * Bug 10394: Let Tor Browser update HTTPS Everywhere * Bug 32017: Use ExtensionStorageIDB again * Bug 40006: Fix new identity for 81 [torbutton] * Bug 40007: Move SecurityPrefs initialization to the StartupObserver component [torbutton]

1 0

[tor-browser-build/master] Bug 40070: Use android-* targets instead of torbrowser-android-* targets
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit d77303e7979ae94006837a38db646966d8b01ae3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 10 20:08:54 2020 +0200 Bug 40070: Use android-* targets instead of torbrowser-android-* targets --- projects/application-services/config | 24 ++++++++++++------------ projects/tor-android-service/config | 8 ++++---- projects/tor-onion-proxy-library/config | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/projects/application-services/config b/projects/application-services/config index 1d9fd79..0560872 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -26,51 +26,51 @@ input_files: - project: fenix-rust name: rust-armv7 target_prepend: - - torbrowser-android-armv7 + - android-armv7 - project: fenix-rust name: rust-aarch64 target_prepend: - - torbrowser-android-aarch64 + - android-aarch64 - project: fenix-rust name: rust-x86 target_prepend: - - torbrowser-android-x86 + - android-x86 - project: fenix-rust name: rust-x86_64 target_prepend: - - torbrowser-android-x86_64 + - android-x86_64 - project: nss name: nss-armv7 target_prepend: - - torbrowser-android-armv7 + - android-armv7 - project: nss name: nss-aarch64 target_prepend: - - torbrowser-android-aarch64 + - android-aarch64 - project: nss name: nss-x86 target_prepend: - - torbrowser-android-x86 + - android-x86 - project: nss name: nss-x86_64 target_prepend: - - torbrowser-android-x86_64 + - android-x86_64 - project: sqlcipher name: sqlcipher-armv7 target_prepend: - - torbrowser-android-armv7 + - android-armv7 - project: sqlcipher name: sqlcipher-aarch64 target_prepend: - - torbrowser-android-aarch64 + - android-aarch64 - project: sqlcipher name: sqlcipher-x86 target_prepend: - - torbrowser-android-x86 + - android-x86 - project: sqlcipher name: sqlcipher-x86_64 target_prepend: - - torbrowser-android-x86_64 + - android-x86_64 - name: python project: python enable: '[% !c("var/fetch_gradle_dependencies") %]' diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index e2bb2db..586bbca 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -25,16 +25,16 @@ input_files: - project: tor name: tor-armv7 target_prepend: - - torbrowser-android-armv7 + - android-armv7 - project: tor name: tor-aarch64 target_prepend: - - torbrowser-android-aarch64 + - android-aarch64 - project: tor name: tor-x86 target_prepend: - - torbrowser-android-x86 + - android-x86 - project: tor name: tor-x86_64 target_prepend: - - torbrowser-android-x86_64 + - android-x86_64 diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index 671e988..2faa752 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -22,35 +22,35 @@ input_files: - project: obfs4 name: obfs4-armv7 target_prepend: - - torbrowser-android-armv7 + - android-armv7 - project: obfs4 name: obfs4-aarch64 target_prepend: - - torbrowser-android-aarch64 + - android-aarch64 - project: obfs4 name: obfs4-x86 target_prepend: - - torbrowser-android-x86 + - android-x86 - project: obfs4 name: obfs4-x86_64 target_prepend: - - torbrowser-android-x86_64 + - android-x86_64 - project: snowflake name: snowflake-armv7 target_prepend: - - torbrowser-android-armv7 + - android-armv7 - project: snowflake name: snowflake-aarch64 target_prepend: - - torbrowser-android-aarch64 + - android-aarch64 - project: snowflake name: snowflake-x86 target_prepend: - - torbrowser-android-x86 + - android-x86 - project: snowflake name: snowflake-x86_64 target_prepend: - - torbrowser-android-x86_64 + - android-x86_64 - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]'

1 0

[tor-browser-build/master] Release preparations for 10.0a7
by sysrqb＠torproject.org 11 Sep '20

11 Sep '20

commit 4338e5ea7c4641dcdcac44120df00fb0af7bebdb Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Sep 11 16:01:45 2020 +0000 Release preparations for 10.0a7 Versions bump and Changelog update --- projects/firefox/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 26 ++++++++++++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor-launcher/config | 2 +- rbm.conf | 6 ++--- 5 files changed, 33 insertions(+), 7 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 41802bc..b0a58fb 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 git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index bc71bc9..6f70249 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,29 @@ +Tor Browser 10.0a7 -- September 14 2020 + * Windows + OS X + Linux + * Update Tor Launcher to 0.2.24 + * Update NoScript to 11.0.43 + * Translations update + * Bug 32017: Use ExtensionStorageIDB again + * Bug 40006: Fix new identity for 81 [torbutton] + * Bug 40007: Move SecurityPrefs initialization to the StartupObserver component [torbutton] + * Bug 40008: Style fixes for 78 [torbutton] + * Bug 40066: Remove default bridge 37.218.240.34 [tor-browser-build] + * Bug 40073: Repack omni.ja to include builtin HTTPS Everywhere [tor-browser-build] + * Bug 40091: Load HTTPS Everywhere as a builtin addon [tor-browser] + * Bug 40102: Fix UI bugs in Tor Browser 10.0 alpha [tor-browser] + * Bug 40109: Playing video breaks after reloading pages [tor-browser] + * Big 40119: Enable v3 extension blocklisting again [tor-browser] + * Build System + * Windows + OS X + Linux + * Bump Go to 1.14.7 + * Bug 40031: Add licenses for kcp-go and smux. [tor-browser-build] + * Bug 40065: Bump debootstrap-image ubuntu_version to 20.04.1 [tor-browser-build] + * Bug 40045: Fix complete .mar file creation for dmg2mar [tor-browser-build] + * Windows + * Bug 40052: Bump NSIS to 3.06.1 [tor-browser-build] + * Bug 40071: Be explicit about no SEH with mingw-w64 on 32bit systems [tor-browser-build] + * Bug 40077: Don't pass --no-insert-timestamp when building Firefox [tor-browser-build] + Tor Browser 10.0a6 -- August 26 2020 * All Platforms * Update HTTPS Everywhere to 2020.08.13 diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 6398323..7c2baba 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -77,9 +77,9 @@ input_files: enable: '[% c("var/snowflake") && ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: d0ade42bee14ea2498cf8868c2d0ef2d5acae563d22cb788b33a86b80e7f7b5e + sha256sum: 79395f62e7df98813847e1ffb28ec33e8271dbf826646b022917d13126a29414 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 95a2f02..91c181e 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.23 +version: 0.2.24 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 9ee4f18..7cf5369 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.0a6' - torbrowser_build: 'build2' + torbrowser_version: '10.0a7' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 10.0a5 + - 10.0a6 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Refresh PGP signing key
by sysrqb＠torproject.org 11 Sep '20

11 Sep '20

commit 93ab39d0d795961cda7ea6837b408c2be929f16f Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Sep 11 19:14:12 2020 +0000 Refresh PGP signing key --- keyring/torbutton.gpg | Bin 132637 -> 135425 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbutton.gpg b/keyring/torbutton.gpg index b587a66..0e93d2e 100644 Binary files a/keyring/torbutton.gpg and b/keyring/torbutton.gpg differ

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb＠torproject.org 11 Sep '20

11 Sep '20

commit d352499161387958b1153e7538cd6773b1352e28 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Sep 11 19:21:55 2020 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 9a3956916b98..c18489972abe 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 9a3956916b9897d668138dd450ad5a8be9d38e02 +Subproject commit c18489972abef8b449ad8b53356cda5e3aea601b

1 0

[tor-browser-build/master] Pick up latest rbm changes
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit af68f984045dd393a5aac9fcd1c880d2d191bfac Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 11 17:21:30 2020 +0000 Pick up latest rbm changes This inclues the build time improvements that landed in #33289 and rbm#40005. --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index c50d8e2..ee2d60d 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit c50d8e22c4fcddc4ed567815b1b0135419c2a53c +Subproject commit ee2d60d8274fe3b88454683eb11b1d76981b6c46

1 0

[rbm/master] Bug 40005: Optimize the config function
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit ee2d60d8274fe3b88454683eb11b1d76981b6c46 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 10 19:03:09 2020 +0200 Bug 40005: Optimize the config function Optimize the config function by reducing the number of calls to config_p. --- lib/RBM.pm | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index c4d5a82..6277de4 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -141,38 +141,47 @@ sub config { my @targets = @{get_targets($project, $options, \@_)}; my @step = ('steps', get_step($project, $options, $config->{step}, \@_)); my $as_array = $options->{as_array}; + my %ok_config = ( HASH => 1, CODE => 1 ); foreach my $path (@_) { + my $config_path = config_p($config, $project, $options, @$path); + next unless $ok_config{ref $config_path}; my @l; - push @l, config_p($config, $project, $options, @$path, "override.$name->[0]") + push @l, config_p($config_path, $project, $options, "override.$name->[0]") if @$name == 1; if (!$as_array) { @l = grep { defined $_ } @l; return $l[0] if @l; } # 1st priority: targets + step matching - foreach my $t (@targets) { - push @l, config_p($config, $project, $options, @$path, @step, 'targets', $t, @$name); - if (!$as_array) { - @l = grep { defined $_ } @l; - return $l[0] if @l; + my $config_step_targets = config_p($config_path, $project, $options, @step, 'targets'); + if ($ok_config{ref $config_step_targets}) { + foreach my $t (@targets) { + push @l, config_p($config_step_targets, $project, $options, $t, @$name); + if (!$as_array) { + @l = grep { defined $_ } @l; + return $l[0] if @l; + } } } # 2nd priority: step maching - push @l, config_p($config, $project, $options, @$path, @step, @$name); + push @l, config_p($config_path, $project, $options, @step, @$name); if (!$as_array) { @l = grep { defined $_ } @l; return $l[0] if @l; } # 3rd priority: target matching - foreach my $t (@targets) { - push @l, config_p($config, $project, $options, @$path, 'targets', $t, @$name); - if (!$as_array) { - @l = grep { defined $_ } @l; - return $l[0] if @l; + my $config_targets = config_p($config_path, $project, $options, 'targets'); + if ($ok_config{ref $config_targets}) { + foreach my $t (@targets) { + push @l, config_p($config_targets, $project, $options, $t, @$name); + if (!$as_array) { + @l = grep { defined $_ } @l; + return $l[0] if @l; + } } } # last priority: no target and no step matching - push @l, config_p($config, $project, $options, @$path, @$name); + push @l, config_p($config_path, $project, $options, @$name); if (!$as_array) { @l = grep { defined $_ } @l; return $l[0] if @l;

1 0

[torbutton/master] Translations update
by sysrqb＠torproject.org 11 Sep '20

11 Sep '20

commit c18489972abef8b449ad8b53356cda5e3aea601b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Sep 11 15:59:14 2020 +0000 Translations update --- chrome/locale/el/torbutton.properties | 72 +++++++++++++++++------------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/chrome/locale/el/torbutton.properties b/chrome/locale/el/torbutton.properties index 828f58b6..0bffb643 100644 --- a/chrome/locale/el/torbutton.properties +++ b/chrome/locale/el/torbutton.properties @@ -72,73 +72,73 @@ onionServices.errorPage.onionSite=Onion σελίδα # Tor SOCKS error 0xF0: onionServices.descNotFound.pageTitle=Σφάλμα φόρτωσης σελίδας Onion onionServices.descNotFound.header=Η σελίδα Onion δεν βρέθηκε -onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.descNotFound=Η πιο πιθανή αιτία είναι ότι η σελίδα onion είναι εκτός σύνδεσης. Επικοινωνήστε με τον διαχειριστή της σελίδας. onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. # Tor SOCKS error 0xF1: onionServices.descInvalid.pageTitle=Σφάλμα φόρτωσης σελίδας Onion -onionServices.descInvalid.header=Onionsite Cannot Be Reached -onionServices.descInvalid=The onionsite is unreachable due an internal error. +onionServices.descInvalid.header=Η σελίδα Onion δεν είναι προσπελάσιμη +onionServices.descInvalid=Η σελίδα Onion δεν είναι προσπελάσιμη λόγω εσωτερικού σφάλματος. onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. # Tor SOCKS error 0xF2: onionServices.introFailed.pageTitle=Σφάλμα φόρτωσης σελίδας Onion -onionServices.introFailed.header=Onionsite Has Disconnected -onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.introFailed.header=Η σελίδα Onion αποσυνδέθηκε +onionServices.introFailed=Η πιο πιθανή αιτία είναι ότι η σελίδα onion είναι εκτός σύνδεσης. Επικοινωνήστε με τον διαχειριστή της σελίδας. onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. # Tor SOCKS error 0xF3: onionServices.rendezvousFailed.pageTitle=Σφάλμα φόρτωσης σελίδας Onion -onionServices.rendezvousFailed.header=Unable to Connect to Onionsite -onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. +onionServices.rendezvousFailed.header=Αδυναμία σύνδεσης στη σελίδα Onion +onionServices.rendezvousFailed=Η σελίδα onion είναι απασχολημένη ή το δίκτυο Tor είναι υπερφορτωμένο. Προσπαθήστε ξανά αργότερα. onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required -onionServices.clientAuthMissing.header=Onionsite Requires Authentication -onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided. +onionServices.clientAuthMissing.pageTitle=Απαιτείται εξουσιοδότηση +onionServices.clientAuthMissing.header=Η σελίδα onion απαιτεί εξουσιοδότηση +onionServices.clientAuthMissing=Η πρόσβαση στη σελίδα onion χρειάζεται ένα κλειδί, αλλά δεν δόθηκε κανένα. onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed -onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed -onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. +onionServices.clientAuthIncorrect.pageTitle=Αποτυχία εξουσιοδότησης +onionServices.clientAuthIncorrect.header=Αποτυχία εξουσιοδότησης σελίδας onion +onionServices.clientAuthIncorrect=Το κλειδί που δόθηκε δεν είναι σωστό ή έχει ανακληθεί. Επικοινωνήστε με τον διαχειριστή της σελίδας onion. onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. # Tor SOCKS error 0xF6: onionServices.badAddress.pageTitle=Σφάλμα φόρτωσης σελίδας Onion -onionServices.badAddress.header=Invalid Onionsite Address -onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. +onionServices.badAddress.header=Άκυρη διεύθυνση σελίδας onion +onionServices.badAddress=Η διεύθυνση της σελίδας onion που καταχωρήθηκε δεν είναι έγκυρη. Παρακαλώ ελέγξτε ότι την έχετε εισάγει σωστά. onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. # Tor SOCKS error 0xF7: onionServices.introTimedOut.pageTitle=Σφάλμα φόρτωσης σελίδας Onion onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out -onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. +onionServices.introTimedOut=Αποτυχία σύνδεσης στη σελίδα onion, πιθανώς εξ' αιτίας κακής σύνδεσης στο δίκτυο. onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description2=%S is requesting that you authenticate. -onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +onionServices.authPrompt.description2=Αίτημα εξουσιοδότησης από %S. +onionServices.authPrompt.keyPlaceholder=Εισάγετε το ιδιωτικό κλειδί σας για αυτή την υπηρεσία onion onionServices.authPrompt.done=Τέλος onionServices.authPrompt.doneAccessKey=d -onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key -onionServices.authPreferences.header=Onion Services Authentication -onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. -onionServices.authPreferences.savedKeys=Saved Keys… -onionServices.authPreferences.dialogTitle=Onion Service Keys -onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPrompt.invalidKey=Παρακαλώ εισάγετε ένα έγκυρο κλειδί (52 χαρακτήρες base32 ή 44 χαρακτήρες base64) +onionServices.authPrompt.failedToSetKey=Αποτυχία παραμετροποίησης του Tor με το κλειδί σας +onionServices.authPreferences.header=Εξουσιοδότηση υπηρεσιών Onion +onionServices.authPreferences.overview=Κάποιες υπηρεσίες onion απαιτούν να ταυτοποιηθείτε με ένα κλειδί (ένα είδος κωδικού), πριν μπορέσετε να τις επισκεφθείτε. +onionServices.authPreferences.savedKeys=Αποθηκευμένα κλειδιά... +onionServices.authPreferences.dialogTitle=Κλειδιά υπηρεσιών Onion +onionServices.authPreferences.dialogIntro=Τα κλειδιά για τις ακόλουθες σελίδες onion είναι αποθηκευμένα στον υπολογιστή σας onionServices.authPreferences.onionSite=Onion σελίδα onionServices.authPreferences.onionKey=Κλειδί onionServices.authPreferences.remove=Απομάκρυνση -onionServices.authPreferences.removeAll=Remove All -onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor -onionServices.authPreferences.failedToRemoveKey=Unable to remove key +onionServices.authPreferences.removeAll=Αφαίρεση όλων +onionServices.authPreferences.failedToGetKeys=Αδυναμία λήψης κλειδιών από το tor +onionServices.authPreferences.failedToRemoveKey=Αδυναμία αφαίρεσης κλειδιού # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=Πάντα να δίνεται προτεραιότητα στα Onion onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=Όχι τώρα onionLocation.notNowAccessKey=n -onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. -onionLocation.tryThis=Try Onion Services -onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… -onionLocation.always=Always -onionLocation.askEverytime=Ask every time -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.description=Υπάρχει μια πιο ιδιωτική και ασφαλής έκδοση αυτής της σελίδας, μέσω του δικτύου Tor και των υπηρεσιών onion. Οι υπηρεσίες onion βοηθούν τους διαχειριστές ιστοσελιδών και τους επισκέπτες τους να παρακάμψουν την παρακολούθηση και τη λογοκρισία. +onionLocation.tryThis=Δοκιμάστε τις υπηρεσίες Onion +onionLocation.onionAvailable=.onion διαθέσιμο +onionLocation.learnMore=Μάθετε περισσότερα... +onionLocation.always=Πάντα +onionLocation.askEverytime=Να ερωτώμαι κάθε φορά +onionLocation.prioritizeOnionsDescription=Να δίνεται προτεραιότητα σε σελίδες .onion όταν είναι γνωστές. onionLocation.onionServicesTitle=Υπηρεσίες Onion

1 0

[tor-launcher/master] Release preparations for 0.2.24
by sysrqb＠torproject.org 11 Sep '20

11 Sep '20

commit c197f33c9d69cd53aaf64585af7b8b6f49660138 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Sep 11 15:57:47 2020 +0000 Release preparations for 0.2.24 Translations update and version bump --- src/chrome/locale/sw/network-settings.dtd | 2 +- src/chrome/locale/zh-TW/torlauncher.properties | 4 ++-- src/install.rdf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chrome/locale/sw/network-settings.dtd b/src/chrome/locale/sw/network-settings.dtd index b227ee0..f5f40bd 100644 --- a/src/chrome/locale/sw/network-settings.dtd +++ b/src/chrome/locale/sw/network-settings.dtd @@ -66,7 +66,7 @@ nenosiri"> <!ENTITY torPreferences.categoryTitle "Tor"> <!ENTITY torPreferences.torSettings "Tor Settings"> <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > -<!ENTITY torPreferences.learnMore "Learn More"> +<!ENTITY torPreferences.learnMore "jifunze zaid"> <!ENTITY torPreferences.bridges "Bridges"> <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> <!ENTITY torPreferences.useBridge "Use a bridge"> diff --git a/src/chrome/locale/zh-TW/torlauncher.properties b/src/chrome/locale/zh-TW/torlauncher.properties index 3a7613c..945d95c 100644 --- a/src/chrome/locale/zh-TW/torlauncher.properties +++ b/src/chrome/locale/zh-TW/torlauncher.properties @@ -15,8 +15,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S 失敗 (%2$S)。 torlauncher.unable_to_start_tor=無法啟動洋蔥路由。\n\n%S torlauncher.tor_missing=洋蔥路由可執行檔遺失。 torlauncher.torrc_missing=洋蔥路由的配置文件遺失而且無法創建。 -torlauncher.datadir_missing=洋蔥路由的資料夾不存在，且無法被創建。 -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.datadir_missing=洋蔥路由的資料目錄不存在，且無法被建立。 +torlauncher.onionauthdir_missing=洋蔥路由的洋蔥驗證目錄不存在，且無法被建立。 torlauncher.password_hash_missing=無法取得雜湊過的密碼。 torlauncher.failed_to_get_settings=無法擷取洋蔥路由設定。\n\n%S diff --git a/src/install.rdf b/src/install.rdf index b0a80cc..772db91 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.23</em:version> + <em:version>0.2.24</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

[rbm/master] OSX -> macOS renaming
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit 197c4c8681cd8df14ae21ce513458396583559f7 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 11 10:54:46 2020 +0000 OSX -> macOS renaming --- lib/RBM/DefaultConfig.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index 974a0e1..a4c1e5c 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -42,7 +42,7 @@ sub lsb_release { my $res = {}; if (-f '/usr/bin/sw_vers') { - # If sw_vers exists, we assume we are on OSX and use it + # If sw_vers exists, we assume we are on macOS and use it my ($stdout, $stderr, $success, $exit_code) = capture_exec('/usr/bin/sw_vers', '-productName'); RBM::exit_error("sw_vers: unknown ProductName")

1 0

[rbm/master] Bug 33289: Optimize the get_target function
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit dab4ae35aeb84ae5273a30f1fbcdcb6b6530f8ad Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 10 13:11:28 2020 +0200 Bug 33289: Optimize the get_target function We also change the behavior of the function: we stop looking after the first definition of a target. This means for example that if a target is defined as an array in rbm.conf, and also defined as a hash in the project's config, then the definition from rbm.conf will be ignored. --- lib/RBM.pm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index b9ad1ad..c4d5a82 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -102,21 +102,17 @@ sub as_array { sub get_target { my ($project, $options, $paths, $target) = @_; - my @res; foreach my $path (@$paths) { foreach my $step ([ 'steps', $config->{step} ], []) { my $z = config_p($config, $project, $options, @$path, @$step, 'targets', $target); next unless $z; - if (ref $z eq 'HASH') { - push @res, $target unless grep { $_ eq $target } @res; - next; - } + return [ $target ] if ref $z eq 'HASH'; my @z = ref $z eq 'ARRAY' ? (@{$z}) : ($z); - push @res, map { @{get_target($project, $options, $paths, $_)} } @z; + return [ map { @{get_target($project, $options, $paths, $_)} } @z ]; } } - return \@res; + return []; } sub get_targets {

1 0

[tor-browser/tor-browser-81.0b2-10.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit 46345ac0bcfaf482aae7e13e16e0abb0f275f334 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 11 09:51:31 2020 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 33fed7848596..9a3956916b98 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 33fed7848596b3da7d0e66309f94fdbdc21d253e +Subproject commit 9a3956916b9897d668138dd450ad5a8be9d38e02

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit a7346bbda23463f5366d6b712be5d34fd98c1457 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 11 09:41:09 2020 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 33fed7848596..9a3956916b98 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 33fed7848596b3da7d0e66309f94fdbdc21d253e +Subproject commit 9a3956916b9897d668138dd450ad5a8be9d38e02

1 0

[torbutton/master] Bug 40008: Style fixes for 78
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit 9a3956916b9897d668138dd450ad5a8be9d38e02 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 8 17:57:06 2020 +0200 Bug 40008: Style fixes for 78 --- chrome/content/tor-circuit-display.js | 2 +- chrome/skin/tor-circuit-display.css | 41 +++++++++++++++++++---------------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js index 1be4571d..4e0088f0 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js @@ -409,7 +409,7 @@ let ensureCorrectPopupDimensions = function () { let stack = document.querySelector("#identity-popup-multiView .panel-viewstack"); let view2 = document.getElementById("identity-popup-mainView"); if (view && stack && view2) { - let newWidth = Math.max(...[...view2.children].map(el => el.clientWidth)) + 10; + let newWidth = Math.max(...[...view2.children].map(el => el.clientWidth)); let newHeight = stack.clientHeight; stack.setAttribute("width", newWidth); view2.style.minWidth = view2.style.maxWidth = newWidth + "px"; diff --git a/chrome/skin/tor-circuit-display.css b/chrome/skin/tor-circuit-display.css index 3c349e0c..35c786ec 100644 --- a/chrome/skin/tor-circuit-display.css +++ b/chrome/skin/tor-circuit-display.css @@ -6,30 +6,36 @@ Each bullet in the circuit node list is supposed to represent a Tor circuit node and lines drawn between them to represent Tor network inter-relay connections. */ +#circuit-display-headline { + margin: 0; +} -#circuit-display-content { +#circuit-display-header { background-image: url(chrome://torbutton/skin/torbutton.svg); - background-position: 1em 1em; background-repeat: no-repeat; - background-size: 24px auto; - background-blend-mode: overlay; - cursor: default; - padding: 0.5em 0px 0.5em; - padding-inline-end: 1em; - padding-inline-start: calc(2em + 24px); - width: 100%; + background-position: 0 50%; + background-size: 16px auto; -moz-context-properties: fill, fill-opacity; fill: currentColor; - fill-opacity: .6; + /* icon indent + 16px icon width + 6px description margin + (total of 12px margin with the native 6px description margin) */ + padding-inline: calc(2em + 22px) 1em; + /* 16px icon width + 12px margin */ + padding-inline-start: 28px; +} + +#circuit-display-header:-moz-locale-dir(rtl) { + background-position-x: right; } -#circuit-display-content:-moz-locale-dir(rtl) { - background-position: calc(100% - 1em) 1em; +#circuit-display-content { + padding-inline: 2em 1em; + padding-block: 1em; } #circuit-reload-content { cursor: default; - padding: 1em 0px 1em; + padding: 0 0 1em; padding-inline-end: 3em; padding-inline-start: calc(2em + 24px); width: 100%; @@ -47,13 +53,10 @@ and lines drawn between them to represent Tor network inter-relay connections. /* Format the circuit node list. */ ul#circuit-display-nodes { - /* font-family: Arial; */ - font-size: 16px; line-height: 26px; - /* color: black;*/ - margin-top: 4px; - margin-bottom: 2px; - padding-inline-start: 4px; + margin-top: 8px; + margin-bottom: 0; + padding-inline-start: 28px; } /* Hide default bullets, and draw our own bullets */

1 0

[tor-browser/tor-browser-81.0b2-10.0-1] fixup! Bug 25658: Replace security slider with security level UI
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit c16217700b7e3537e378d10b7ebc1c1a54f34952 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 7 21:47:56 2020 +0200 fixup! Bug 25658: Replace security slider with security level UI --- browser/components/securitylevel/content/securityLevelPanel.inc.xhtml | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml b/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml index c28456d359f3..4abbb12dd856 100644 --- a/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml +++ b/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml @@ -4,6 +4,7 @@ orient="vertical" level="top" hidden="true" + class="panel-no-padding" onpopupshown="SecurityLevelPanel.onPopupShown(event);" onpopuphidden="SecurityLevelPanel.onPopupHidden(event);" >

1 0

[tor-browser/tor-browser-81.0b2-10.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit 9ba3edb547ca98b74a2e4986e305eb35e27eb37a Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 8 18:02:36 2020 +0200 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- browser/components/controlcenter/content/identityPanel.inc.xhtml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/browser/components/controlcenter/content/identityPanel.inc.xhtml b/browser/components/controlcenter/content/identityPanel.inc.xhtml index fd0399cf2d0f..e32fd66ff16f 100644 --- a/browser/components/controlcenter/content/identityPanel.inc.xhtml +++ b/browser/components/controlcenter/content/identityPanel.inc.xhtml @@ -62,9 +62,12 @@  <hbox id="circuit-display-container" class="identity-popup-section"> - <vbox id="circuit-display-content" flex="1"> - <label id="circuit-display-headline" - class="identity-popup-headline">&torbutton.circuit_display.title;</label> + <vbox id="circuit-display-content" flex="1" role="group" + aria-labelledby="circuit-display-headline"> + <hbox id="circuit-display-header" align="center"> + <label id="circuit-display-headline" + role="heading" aria-level="2">&torbutton.circuit_display.title;</label> + </hbox> <html:ul id="circuit-display-nodes" dir="auto"/> </vbox> <vbox id="circuit-reload-content" flex="1">

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] fixup! Bug 25658: Replace security slider with security level UI
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit 5ff0565d2c039b40384c40869905f51a57453b12 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 7 21:47:56 2020 +0200 fixup! Bug 25658: Replace security slider with security level UI --- browser/components/securitylevel/content/securityLevelPanel.inc.xhtml | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml b/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml index c28456d359f3..4abbb12dd856 100644 --- a/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml +++ b/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml @@ -4,6 +4,7 @@ orient="vertical" level="top" hidden="true" + class="panel-no-padding" onpopupshown="SecurityLevelPanel.onPopupShown(event);" onpopuphidden="SecurityLevelPanel.onPopupHidden(event);" >

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] Merge remote-tracking branch 'gitlab/merge-requests/43' into tor-browser-78.2.0esr-10.0-1
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit 9768956ac3500385a3784d7884a34595dab6b078 Merge: c386fb331223 41a9c483bb08 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 11 09:21:16 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/43' into tor-browser-78.2.0esr-10.0-1 browser/components/controlcenter/content/identityPanel.inc.xhtml | 9 ++++++--- .../securitylevel/content/securityLevelPanel.inc.xhtml | 1 + 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit 41a9c483bb084d5d7bb9e5eb267c5a1374089536 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 8 18:02:36 2020 +0200 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- browser/components/controlcenter/content/identityPanel.inc.xhtml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/browser/components/controlcenter/content/identityPanel.inc.xhtml b/browser/components/controlcenter/content/identityPanel.inc.xhtml index 3e0dc960a6f5..a8edda858e41 100644 --- a/browser/components/controlcenter/content/identityPanel.inc.xhtml +++ b/browser/components/controlcenter/content/identityPanel.inc.xhtml @@ -62,9 +62,12 @@  <hbox id="circuit-display-container" class="identity-popup-section"> - <vbox id="circuit-display-content" flex="1"> - <label id="circuit-display-headline" - class="identity-popup-headline">&torbutton.circuit_display.title;</label> + <vbox id="circuit-display-content" flex="1" role="group" + aria-labelledby="circuit-display-headline"> + <hbox id="circuit-display-header" align="center"> + <label id="circuit-display-headline" + role="heading" aria-level="2">&torbutton.circuit_display.title;</label> + </hbox> <html:ul id="circuit-display-nodes" dir="auto"/> </vbox> <vbox id="circuit-reload-content" flex="1">

1 0