- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][base-browser-102.8.0esr-12.5-1] fixup! Bug 40925: Implemented the Security Level component
by Richard Pospesel (＠richard) 07 Mar '23

07 Mar '23

Richard Pospesel pushed to branch base-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 9a4e12a2 by Richard Pospesel at 2023-03-07T14:14:09+00:00 fixup! Bug 40925: Implemented the Security Level component Use --warning-color variable for the Custom label in the security level popup. (cherry picked from commit 4f7b3857d843dba8ed7e802a66289d33c087a8ac) - - - - - 1 changed file: - browser/components/securitylevel/content/securityLevelPanel.css Changes: ===================================== browser/components/securitylevel/content/securityLevelPanel.css ===================================== @@ -49,7 +49,7 @@ #securityLevel-custom { border-radius: 4px; - background-color: var(--yellow-50); + background-color: var(--warning-color); color: black; padding: 0.4em 0.5em; margin-inline-start: 1em; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9a4e12a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9a4e12a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.5-1] fixup! Bug 40925: Implemented the Security Level component
by Richard Pospesel (＠richard) 07 Mar '23

07 Mar '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 4f7b3857 by Richard Pospesel at 2023-03-06T14:30:53+00:00 fixup! Bug 40925: Implemented the Security Level component Use --warning-color variable for the Custom label in the security level popup. - - - - - 1 changed file: - browser/components/securitylevel/content/securityLevelPanel.css Changes: ===================================== browser/components/securitylevel/content/securityLevelPanel.css ===================================== @@ -49,7 +49,7 @@ #securityLevel-custom { border-radius: 4px; - background-color: var(--yellow-50); + background-color: var(--warning-color); color: black; padding: 0.4em 0.5em; margin-inline-start: 1em; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4f7b385… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4f7b385… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.5-1] fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
by Pier Angelo Vendrame (＠pierov) 06 Mar '23

06 Mar '23

Pier Angelo Vendrame pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: f1ea47b4 by Dan Ballard at 2023-03-06T13:47:51+00:00 fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser update 'make run' to process optional parameter ARGS="..." - - - - - 1 changed file: - tools/torbrowser/Makefile Changes: ===================================== tools/torbrowser/Makefile ===================================== @@ -34,7 +34,7 @@ fat-aar: all: build deploy run: - $(BINARIES)/dev/Browser/start-tor-browser -v + $(BINARIES)/dev/Browser/start-tor-browser -v $(ARGS) jslint: ./jslint.sh $(DEV_ROOT) $(JS) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f1ea47b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f1ea47b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40801: Correct the ExecShell open path on the Windows system-wide installer
by Pier Angelo Vendrame (＠pierov) 06 Mar '23

06 Mar '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: fffda1fd by Pier Angelo Vendrame at 2023-03-06T10:21:29+01:00 Bug 40801: Correct the ExecShell open path on the Windows system-wide installer - - - - - 1 changed file: - projects/browser/windows-installer.nsi Changes: ===================================== projects/browser/windows-installer.nsi ===================================== @@ -240,6 +240,9 @@ ${EndIf} FunctionEnd Function StartBrowser -ExecShell "open" "$INSTDIR/Start [% c('var/Project_Name') %].lnk" +[% IF !system_install_mode -%] + ExecShell "open" "$INSTDIR/Start [% c('var/Project_Name') %].lnk" +[% ELSE -%] + ExecShell "open" "$INSTDIR/[% c('var/exe_name') %].exe" +[% END -%] FunctionEnd - View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40750: Solve rlbox reproducibility problems
by Pier Angelo Vendrame (＠pierov) 06 Mar '23

06 Mar '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 76054058 by Pier Angelo Vendrame at 2023-03-03T18:42:49+01:00 Bug 40750: Solve rlbox reproducibility problems The wasi-sandbox project was not reproducible, because libc.a was filled in a non-deterministic order. Its Makefile contains some wildcards, but adding a sort to them was not enough to build libc.a deterministically. After fixing this problem, Firefox build issue disappears, too. Upstream issue: https://github.com/WebAssembly/wasi-libc/issues/398 - - - - - 4 changed files: - + projects/wasi-sysroot/0001-Sort-the-object-list-passed-to-ar-in-the-Makefile.patch - projects/wasi-sysroot/build - projects/wasi-sysroot/config - rbm.conf Changes: ===================================== projects/wasi-sysroot/0001-Sort-the-object-list-passed-to-ar-in-the-Makefile.patch ===================================== @@ -0,0 +1,36 @@ +From ef21e4f17e104a34e7db89215db567cddd48832d Mon Sep 17 00:00:00 2001 +From: Pier Angelo Vendrame <pierov(a)torproject.org> +Date: Wed, 1 Mar 2023 10:19:50 +0100 +Subject: [PATCH] Sort the object list passed to ar in the Makefile. + +This makes builds reproducible. +--- + Makefile | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index c31e3d7..f350ecb 100644 +--- a/Makefile ++++ b/Makefile +@@ -488,13 +488,13 @@ $(SYSROOT_LIB)/libwasi-emulated-signal.a: $(LIBWASI_EMULATED_SIGNAL_OBJS) $(LIBW + %.a: + @mkdir -p "$(@D)" + # On Windows, the commandline for the ar invocation got too long, so it needs to be split up. +- $(AR) crs $@ $(wordlist 1, 199, $^) +- $(AR) crs $@ $(wordlist 200, 399, $^) +- $(AR) crs $@ $(wordlist 400, 599, $^) +- $(AR) crs $@ $(wordlist 600, 799, $^) ++ $(AR) crs $@ $(wordlist 1, 199, $(sort $^)) ++ $(AR) crs $@ $(wordlist 200, 399, $(sort $^)) ++ $(AR) crs $@ $(wordlist 400, 599, $(sort $^)) ++ $(AR) crs $@ $(wordlist 600, 799, $(sort $^)) + # This might eventually overflow again, but at least it'll do so in a loud way instead of + # silently dropping the tail. +- $(AR) crs $@ $(wordlist 800, 100000, $^) ++ $(AR) crs $@ $(wordlist 800, 100000, $(sort $^)) + + $(MUSL_PRINTSCAN_OBJS): CFLAGS += \ + -D__wasilibc_printscan_no_long_double \ +-- +2.39.2 + ===================================== projects/wasi-sysroot/build ===================================== @@ -28,6 +28,9 @@ mv clang-source llvm-project export LLVM_HOME=$(pwd)/llvm-project tar -xf $rootdir/[% c('input_files_by_name/wasi-libc') %] mv wasi-libc-* wasi-libc +pushd wasi-libc +patch -p1 < "$rootdir/0001-Sort-the-object-list-passed-to-ar-in-the-Makefile.patch" +popd popd # What follows has been copied from Firefox's @@ -53,11 +56,14 @@ cat > 'version.sh' << EOF echo '[% c("abbrev") %]' EOF -# Build wasi-libc, libc++ and libc++abi. +# Build wasi-libc, and re-pack it, to make sure we get a deterministic output. +make PREFIX=/wasi build/wasi-libc.BUILT + +# We need to compile compiler-rt before building libc++ and libc++abi, because +# we need to inject it to Clang. make \ LLVM_PROJ_DIR=$LLVM_HOME \ PREFIX=/wasi \ - build/wasi-libc.BUILT \ build/compiler-rt.BUILT \ NINJA_FLAGS='-j[% c("num_procs") %]' @@ -66,6 +72,7 @@ rtdir="build/llvm/lib/clang/$(ls build/llvm/lib/clang)/lib/wasi" mkdir -p "$rtdir" cp build/compiler-rt/lib/wasi/libclang_rt.builtins-wasm32.a "$rtdir/" +# Now we can finally build libc++ and libc++abi. make \ LLVM_PROJ_DIR=$LLVM_HOME \ PREFIX=/wasi \ ===================================== projects/wasi-sysroot/config ===================================== @@ -33,3 +33,4 @@ input_files: project: wasi-config - name: wasi-libc project: wasi-libc + - filename: '0001-Sort-the-object-list-passed-to-ar-in-the-Makefile.patch' ===================================== rbm.conf ===================================== @@ -170,7 +170,7 @@ var: - zh-rCN - zh-rTW - rlbox: 0 + rlbox: 1 sign_build: '[% ENV.RBM_SIGN_BUILD %]' sign_build_gpg_opts: '[% ENV.RBM_GPG_OPTS %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40798: dmg2mar step also takes care of copying the signed+stabled dmg to the signed directory
by Richard Pospesel (＠richard) 03 Mar '23

03 Mar '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: d536e6ad by Richard Pospesel at 2023-03-03T17:36:14+00:00 Bug 40798: dmg2mar step also takes care of copying the signed+stabled dmg to the signed directory - - - - - 2 changed files: - tools/signing/dmg2mar - tools/signing/gatekeeper-bundling.sh Changes: ===================================== tools/signing/dmg2mar ===================================== @@ -1,8 +1,7 @@ #!/bin/bash -# This script runs `make dmg2mar-release` or `make dmg2mar-alpha`, after -# moving the signed dmg files from the $tbb_version-macos-signed directory -# to the normal signed directory. +# This script runs `make dmg2mar-release` or `make dmg2mar-alpha`, and assumes +# that the final signed dmgs are deployed to the normal signed directory. # It should be run after `gatekeeper-bundling.sh`. set -e @@ -12,19 +11,21 @@ source "$script_dir/functions" cd "$script_dir/../.." +# some initial checks to make sure directories and file counts are as expected... + version=$(./rbm/rbm showconf browser --target alpha --target torbrowser-linux-x86_64 var/torbrowser_version) test "$version" = "$tbb_version" || \ exit_error "Incorrect tor browser version: $version != $tbb_version" -test -d "$macos_signed_dir" || \ - exit_error "$macos_signed_dir does not exist" +test -d "$signed_version_dir" || \ + exit_error "$signed_version_dir does not exist" ProjName=$(ProjectName) nb_locales=$(echo $bundle_locales | wc -w) -nb_bundles=$(ls -1 "$macos_signed_dir/$ProjName"-*.dmg | wc -l) +nb_bundles=$(ls -1 "$signed_version_dir/$ProjName"-*.dmg | wc -l) test "$nb_locales" -eq "$nb_bundles" || \ exit_error "Wrong number of bundles: $nb_locales != $nb_bundles" -mv -vf "$macos_signed_dir"/"$ProjName"-*.dmg "$signed_version_dir"/ +# before building converting the dmg to a mar make $SIGNING_PROJECTNAME-dmg2mar-$tbb_version_type ===================================== tools/signing/gatekeeper-bundling.sh ===================================== @@ -73,5 +73,7 @@ do $script_dir/ddmg.sh $macos_signed_dir/$ProjName-${tbb_version}-macos_$lang.dmg $tmpdir/dmg/ "$Proj_Name" rm -rf "dmg/$Proj_Name.app" done - rm -Rf "$tmpdir" + +# move the signed+stapled dmgs to expected output directory for publishing and mar generation +mv -vf "$macos_signed_dir"/"$ProjName"-*.dmg "$signed_version_dir"/ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40800: Add WebTunnel support for mobile
by Pier Angelo Vendrame (＠pierov) 03 Mar '23

03 Mar '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: c6423475 by Shelikhoo at 2023-03-02T14:04:48+00:00 Bug 40800: Add WebTunnel support for mobile This includes: add webtunnel support to tor-onion-proxy-library Add copy binary for webtunnel mobile update tor-android-service for webtunnel - - - - - 4 changed files: - projects/tor-android-service/config - + projects/tor-onion-proxy-library/0001-Bug-40800-Add-WebTunnel-support.patch - projects/tor-onion-proxy-library/build - projects/tor-onion-proxy-library/config Changes: ===================================== projects/tor-android-service/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 27924bc748044e987c188be854ff1471397cdb6a +git_hash: 0438a9a4ce1548be08dd2df891a38987bb313d22 git_url: https://gitlab.torproject.org/tpo/applications/tor-android-service.git git_submodule: 1 container: ===================================== projects/tor-onion-proxy-library/0001-Bug-40800-Add-WebTunnel-support.patch ===================================== @@ -0,0 +1,74 @@ +From 3a6f835e8089dd15f5cd6487b5cfbdfafe7422f8 Mon Sep 17 00:00:00 2001 +From: Shelikhoo <xiaokangwang(a)outlook.com> +Date: Tue, 14 Feb 2023 16:59:59 +0000 +Subject: [PATCH] add WebTunnel Support + +--- + android/build.gradle | 3 +++ + .../thali/toronionproxy/TorConfigBuilder.java | 19 +++++++++++++++---- + 2 files changed, 18 insertions(+), 4 deletions(-) + +diff --git a/android/build.gradle b/android/build.gradle +index e107e8e..acd92c1 100644 +--- a/android/build.gradle ++++ b/android/build.gradle +@@ -102,6 +102,9 @@ task copyPluggableTransports(type: Copy) { + rename { filename -> + filename.replace 'conjure-client', 'libConjure.so' + } ++ rename { filename -> ++ filename.replace 'webtunnel-client', 'libWebtunnel.so' ++ } + } + + gradle.projectsEvaluated { +diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +index b87993d..5e6d6c5 100644 +--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java ++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +@@ -109,8 +109,8 @@ public final class TorConfigBuilder { + return this; + } + +- public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportObfs, File pluggableTransportSnow, File pluggableTransportConjure) throws IOException { +- if (pluggableTransportObfs == null || pluggableTransportSnow == null || pluggableTransportConjure == null) { ++ public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportObfs, File pluggableTransportSnow, File pluggableTransportConjure, File pluggableTransportWebtunnel) throws IOException { ++ if (pluggableTransportObfs == null || pluggableTransportSnow == null || pluggableTransportConjure == null || pluggableTransportWebtunnel == null) { + return this; + } + +@@ -144,7 +144,17 @@ public final class TorConfigBuilder { + .getCanonicalPath()); + } + +- transportPlugin(pluggableTransportObfs.getCanonicalPath(), pluggableTransportSnow.getCanonicalPath(), pluggableTransportConjure.getCanonicalPath()); ++ if (!pluggableTransportWebtunnel.exists()) { ++ throw new IOException("Webtunnel binary does not exist: " + pluggableTransportWebtunnel ++ .getCanonicalPath()); ++ } ++ ++ if (!pluggableTransportWebtunnel.canExecute()) { ++ throw new IOException("Webtunnel binary is not executable: " + pluggableTransportWebtunnel ++ .getCanonicalPath()); ++ } ++ ++ transportPlugin(pluggableTransportObfs.getCanonicalPath(), pluggableTransportSnow.getCanonicalPath(), pluggableTransportConjure.getCanonicalPath(), pluggableTransportWebtunnel.getCanonicalPath()); + return this; + } + +@@ -511,10 +521,11 @@ public final class TorConfigBuilder { + return transPort(settings.transPort()); + } + +- public TorConfigBuilder transportPlugin(String obfsPath, String snowPath, String conjurePath) { ++ public TorConfigBuilder transportPlugin(String obfsPath, String snowPath, String conjurePath, String webtunnelPath) { + buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(obfsPath).append('\n'); + buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append(" -url https://snowflake-broker.torproject.net.global.prod.fastly.net/ -front cdn.sstatic.net -ice stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478\n"); + buffer.append("ClientTransportPlugin conjure exec ").append(conjurePath).append(" -registerURL https://registration.refraction.network/api\n"); ++ buffer.append("ClientTransportPlugin webtunnel exec ").append(webtunnelPath).append('\n'); + return this; + } + +-- +2.34.1 + ===================================== projects/tor-onion-proxy-library/build ===================================== @@ -25,6 +25,7 @@ patch -p1 < $rootdir/gradle.patch patch -p1 < $rootdir/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch patch -p1 < $rootdir/0001-Bug-30318-Add-snowflake-support.patch patch -p1 < $rootdir/0001-Bug-41361-Add-conjure-support.patch +patch -p1 < $rootdir/0001-Bug-40800-Add-WebTunnel-support.patch [% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%] # Extract tor-expert-bundle @@ -41,14 +42,18 @@ patch -p1 < $rootdir/0001-Bug-41361-Add-conjure-support.patch cp $ptdir/snowflake-client external/pluto/bin/armeabi/ cp $ptdir/conjure-client external/pluto/bin/armeabi-v7a/ cp $ptdir/conjure-client external/pluto/bin/armeabi/ + cp $ptdir/webtunnel-client external/pluto/bin/armeabi-v7a/ + cp $ptdir/webtunnel-client external/pluto/bin/armeabi/ [% ELSIF arch == "aarch64" -%] cp $ptdir/obfs4proxy external/pluto/bin/arm64-v8a/ cp $ptdir/snowflake-client external/pluto/bin/arm64-v8a/ cp $ptdir/conjure-client external/pluto/bin/arm64-v8a/ + cp $ptdir/webtunnel-client external/pluto/bin/arm64-v8a/ [% ELSE -%] cp $ptdir/obfs4proxy external/pluto/bin/[% arch %]/ cp $ptdir/snowflake-client external/pluto/bin/[% arch %]/ cp $ptdir/conjure-client external/pluto/bin/[% arch %]/ + cp $ptdir/webtunnel-client external/pluto/bin/[% arch %]/ [% END -%] [% END -%] ===================================== projects/tor-onion-proxy-library/config ===================================== @@ -41,3 +41,4 @@ input_files: - filename: 0001-Bug-33931-Filter-bridges-in-stream-by-type.patch - filename: 0001-Bug-30318-Add-snowflake-support.patch - filename: 0001-Bug-41361-Add-conjure-support.patch + - filename: 0001-Bug-40800-Add-WebTunnel-support.patch View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.8.0esr-12.5-1] squash! Bug 40002: Remove about:ion
by Richard Pospesel (＠richard) 03 Mar '23

03 Mar '23

Richard Pospesel pushed to branch base-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 79a5cf25 by Pier Angelo Vendrame at 2023-03-03T16:39:33+00:00 squash! Bug 40002: Remove about:ion Bug 41662: Disable about:sync-logs Even though we disable sync by default with `identity.fxaccounts.enabled`, this about: page is still avilable. We could throw an exception on the constructor of the related component, but it would result only in an error in the console, without a visible "this address does not look right" error page. If we fix the issues with MOZ_SERVICES_SYNC, we can restore the component. (cherry picked from commit 46dc11a619ebb28f1d63e3d8fe94015718db992a) - - - - - 1 changed file: - services/sync/components.conf Changes: ===================================== services/sync/components.conf ===================================== @@ -11,10 +11,4 @@ Classes = [ 'jsm': 'resource://services-sync/Weave.jsm', 'constructor': 'WeaveService', }, - { - 'cid': '{d28f8a0b-95da-48f4-b712-caf37097be41}', - 'contract_ids': ['@mozilla.org/network/protocol/about;1?what=sync-log'], - 'jsm': 'resource://services-sync/Weave.jsm', - 'constructor': 'AboutWeaveLog', - }, ] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/79a5cf2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/79a5cf2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.5-1] squash! Bug 40002: Remove about:ion
by Richard Pospesel (＠richard) 03 Mar '23

03 Mar '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 46dc11a6 by Pier Angelo Vendrame at 2023-03-03T14:56:18+01:00 squash! Bug 40002: Remove about:ion Bug 41662: Disable about:sync-logs Even though we disable sync by default with `identity.fxaccounts.enabled`, this about: page is still avilable. We could throw an exception on the constructor of the related component, but it would result only in an error in the console, without a visible "this address does not look right" error page. If we fix the issues with MOZ_SERVICES_SYNC, we can restore the component. - - - - - 1 changed file: - services/sync/components.conf Changes: ===================================== services/sync/components.conf ===================================== @@ -11,10 +11,4 @@ Classes = [ 'jsm': 'resource://services-sync/Weave.jsm', 'constructor': 'WeaveService', }, - { - 'cid': '{d28f8a0b-95da-48f4-b712-caf37097be41}', - 'contract_ids': ['@mozilla.org/network/protocol/about;1?what=sync-log'], - 'jsm': 'resource://services-sync/Weave.jsm', - 'constructor': 'AboutWeaveLog', - }, ] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/46dc11a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/46dc11a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.8.0esr-12.0-1] Bug 18905: Hide unwanted items from help menu
by Richard Pospesel (＠richard) 03 Mar '23

03 Mar '23

Richard Pospesel pushed to branch base-browser-102.8.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 2094f3a4 by Arthur Edelstein at 2023-03-03T12:10:29+00:00 Bug 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option (cherry picked from commit 5ff98c20700d45b9bc57d970ff45c1e6519cd64d) - - - - - 3 changed files: - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-menubar.inc - browser/base/content/browser-safebrowsing.js Changes: ===================================== browser/base/content/appmenu-viewcache.inc.xhtml ===================================== @@ -55,7 +55,8 @@ class="subviewbutton" data-l10n-id="appmenuitem-new-private-window" key="key_privatebrowsing" - command="Tools:PrivateBrowsing"/> + command="Tools:PrivateBrowsing" + hidden="true"/> <toolbarseparator/> <toolbarbutton id="appMenu-new-identity" class="subviewbutton" @@ -179,7 +180,8 @@ <toolbarbutton id="appMenu-restoreSession" data-l10n-id="appmenu-restore-session" class="subviewbutton" - command="Browser:RestoreLastSession"/> + command="Browser:RestoreLastSession" + hidden="true"/> <toolbarseparator/> <toolbarbutton id="appMenuClearRecentHistory" data-l10n-id="appmenu-clear-history" ===================================== browser/base/content/browser-menubar.inc ===================================== @@ -458,6 +458,7 @@ have their strings defined by appmenu-data-l10n-id. --> <menuitem id="menu_openHelp" oncommand="openHelpLink('firefox-help')" + hidden="true" data-l10n-id="menu-get-help" appmenu-data-l10n-id="appmenu-get-help" #ifdef XP_MACOSX @@ -467,14 +468,17 @@ #endif <menuitem id="feedbackPage" oncommand="openFeedbackPage()" + hidden="true" data-l10n-id="menu-help-share-ideas" appmenu-data-l10n-id="appmenu-help-share-ideas"/> <menuitem id="helpSafeMode" oncommand="safeModeRestart();" + hidden="true" data-l10n-id="menu-help-enter-troubleshoot-mode2" appmenu-data-l10n-id="appmenu-help-enter-troubleshoot-mode2"/> <menuitem id="troubleShooting" oncommand="openTroubleshootingPage()" + hidden="true" data-l10n-id="menu-help-more-troubleshooting-info" appmenu-data-l10n-id="appmenu-help-more-troubleshooting-info"/> <menuitem id="help_reportSiteIssue" ===================================== browser/base/content/browser-safebrowsing.js ===================================== @@ -7,6 +7,13 @@ var gSafeBrowsing = { setReportPhishingMenu() { + // tor-browser#18905: hide these menu entries + if ( + !Services.prefs.getBoolPref("browser.safebrowsing.phishing.enabled", true) + ) { + return; + } + // In order to detect whether or not we're at the phishing warning // page, we have to check the documentURI instead of the currentURI. // This is because when the DocShell loads an error page, the View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2094f3a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2094f3a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.0-1] 4 commits: dropme! Bug 10760: Integrate TorButton to TorBrowser core
by Richard Pospesel (＠richard) 03 Mar '23

03 Mar '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 36693159 by Pier Angelo Vendrame at 2023-03-03T10:05:00+01:00 dropme! Bug 10760: Integrate TorButton to TorBrowser core Remove implementation of 18905 from Torbutton - - - - - 5ff98c20 by Arthur Edelstein at 2023-03-03T10:05:33+01:00 Bug 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option - - - - - 777cb20b by Pier Angelo Vendrame at 2023-03-03T10:05:40+01:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bring back the new circuit entries. - - - - - 7de98cbe by Pier Angelo Vendrame at 2023-03-03T10:05:47+01:00 fixup! Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser Move the manual menu entry to the manual commit - - - - - 2 changed files: - browser/base/content/browser-menubar.inc - browser/base/content/browser-safebrowsing.js Changes: ===================================== browser/base/content/browser-menubar.inc ===================================== @@ -461,17 +461,11 @@ <menupopup id="menu_HelpPopup" onpopupshowing="buildHelpMenu();">  -  - <box id="feedbackPage"/> - <box id="helpSafeMode"/> - <box id="menu_HelpPopup_reportPhishingtoolmenu"/> - <box id="menu_HelpPopup_reportPhishingErrortoolmenu"/>  <menuitem id="torBrowserUserManual" oncommand="gBrowser.selectedTab = gBrowser.addTab('about:manual', {triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal()});" label="&aboutTor.torbrowser_user_manual.label;" accesskey="&aboutTor.torbrowser_user_manual.accesskey;"/> -  <menuitem id="menu_openHelp" oncommand="openHelpLink('firefox-help')" hidden="true" @@ -485,8 +479,8 @@ <menuitem id="feedbackPage" oncommand="openFeedbackPage()" hidden="true" - data-l10n-id="menu-help-feedback-page" - appmenu-data-l10n-id="appmenu-help-feedback-page"/> + data-l10n-id="menu-help-share-ideas" + appmenu-data-l10n-id="appmenu-help-share-ideas"/> <menuitem id="helpSafeMode" oncommand="safeModeRestart();" hidden="true" ===================================== browser/base/content/browser-safebrowsing.js ===================================== @@ -7,6 +7,13 @@ var gSafeBrowsing = { setReportPhishingMenu() { + // tor-browser#18905: hide these menu entries + if ( + !Services.prefs.getBoolPref("browser.safebrowsing.phishing.enabled", true) + ) { + return; + } + // In order to detect whether or not we're at the phishing warning // page, we have to check the documentURI instead of the currentURI. // This is because when the DocShell loads an error page, the View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/486cbe… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/486cbe… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.8.0esr-12.0-1] Bug 41659: Add canonical color definitions to base-browser !!! 102.9.0esr...
by Richard Pospesel (＠richard) 02 Mar '23

02 Mar '23

Richard Pospesel pushed to branch base-browser-102.8.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 129b9f62 by Richard Pospesel at 2023-03-02T17:22:43+00:00 Bug 41659: Add canonical color definitions to base-browser !!! 102.9.0esr REBASE NOTE: this commit should appear relatively early in the base-browser branch - - - - - 3 changed files: - + browser/themes/shared/browser-colors.css - browser/themes/shared/browser-shared.css - browser/themes/shared/jar.inc.mn Changes: ===================================== browser/themes/shared/browser-colors.css ===================================== @@ -0,0 +1,97 @@ +:root { + /* photon colors, not all of them are available for whatever reason + in firefox, so here they are */ + + --magenta-50: #ff1ad9; + --magenta-60: #ed00b5; + --magenta-70: #b5007f; + --magenta-80: #7d004f; + --magenta-90: #440027; + + --purple-30: #c069ff; + --purple-40: #ad3bff; + --purple-50: #9400ff; + --purple-60: #8000d7; + --purple-70: #6200a4; + --purple-80: #440071; + --purple-90: #25003e; + + --blue-40: #45a1ff; + --blue-50: #0a84ff; + --blue-50-a30: rgba(10, 132, 255, 0.3); + --blue-60: #0060df; + --blue-70: #003eaa; + --blue-80: #002275; + --blue-90: #000f40; + + --teal-50: #00feff; + --teal-60: #00c8d7; + --teal-70: #008ea4; + --teal-80: #005a71; + --teal-90: #002d3e; + + --green-50: #30e60b; + --green-60: #12bc00; + --green-70: #058b00; + --green-80: #006504; + --green-90: #003706; + + --yellow-50: #ffe900; + --yellow-60: #d7b600; + --yellow-70: #a47f00; + --yellow-80: #715100; + --yellow-90: #3e2800; + + --red-50: #ff0039; + --red-60: #d70022; + --red-70: #a4000f; + --red-80: #5a0002; + --red-90: #3e0200; + + --orange-50: #ff9400; + --orange-60: #d76e00; + --orange-70: #a44900; + --orange-80: #712b00; + --orange-90: #3e1300; + + --grey-10: #f9f9fa; + --grey-10-a10: rgba(249, 249, 250, 0.1); + --grey-10-a20: rgba(249, 249, 250, 0.2); + --grey-10-a40: rgba(249, 249, 250, 0.4); + --grey-10-a60: rgba(249, 249, 250, 0.6); + --grey-10-a80: rgba(249, 249, 250, 0.8); + --grey-20: #ededf0; + --grey-30: #d7d7db; + --grey-40: #b1b1b3; + --grey-50: #737373; + --grey-60: #4a4a4f; + --grey-70: #38383d; + --grey-80: #2a2a2e; + --grey-90: #0c0c0d; + --grey-90-a05: rgba(12, 12, 13, 0.05); + --grey-90-a10: rgba(12, 12, 13, 0.1); + --grey-90-a20: rgba(12, 12, 13, 0.2); + --grey-90-a30: rgba(12, 12, 13, 0.3); + --grey-90-a40: rgba(12, 12, 13, 0.4); + --grey-90-a50: rgba(12, 12, 13, 0.5); + --grey-90-a60: rgba(12, 12, 13, 0.6); + --grey-90-a70: rgba(12, 12, 13, 0.7); + --grey-90-a80: rgba(12, 12, 13, 0.8); + --grey-90-a90: rgba(12, 12, 13, 0.9); + + --ink-70: #363959; + --ink-80: #202340; + --ink-90: #0f1126; + + --white-100: #ffffff; + + /* TODO: Switch to some Firefox variable, once Mozilla adds one for this + color. Matches --warning-icon-bgcolor (but not on the dark theme variant). */ + --warning-color: #ffa436; +} + +@media (prefers-color-scheme: dark) { + :root { + --warning-color: #ffbd4f; + } +} \ No newline at end of file ===================================== browser/themes/shared/browser-shared.css ===================================== @@ -21,6 +21,7 @@ @import url("chrome://browser/skin/ctrlTab.css"); @import url("chrome://browser/skin/customizableui/customizeMode.css"); @import url("chrome://browser/skin/UITour.css"); +@import url("chrome://browser/skin/browser-colors.css"); @namespace html url("http://www.w3.org/1999/xhtml"); ===================================== browser/themes/shared/jar.inc.mn ===================================== @@ -17,6 +17,7 @@ skin/classic/browser/autocomplete.css (../shared/autocomplete.css) skin/classic/browser/blockedSite.css (../shared/blockedSite.css) skin/classic/browser/browser-shared.css (../shared/browser-shared.css) + skin/classic/browser/browser-colors.css (../shared/browser-colors.css) skin/classic/browser/ctrlTab.css (../shared/ctrlTab.css) skin/classic/browser/light-dark-overrides.css (../shared/light-dark-overrides.css) skin/classic/browser/error-pages.css (../shared/error-pages.css) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/129b9f6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/129b9f6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.0-1] 6 commits: fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by Richard Pospesel (＠richard) 02 Mar '23

02 Mar '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: ab9dccd4 by Richard Pospesel at 2023-03-02T12:46:22+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41659: Add canonical color definitions to base-browser - commit removes tor-styles.css browser.xhtml so that the base-browser rebase applies correctly - - - - - 60e29559 by Richard Pospesel at 2023-03-02T16:54:12+00:00 Bug 41659: Add canonical color definitions to base-browser !!! 102.9.0esr REBASE NOTE: this commit should appear relatively early in the base-browser branch - - - - - eaf290eb by Richard Pospesel at 2023-03-02T16:54:12+00:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser Bug 41659: Add canonical color definitions to base-browser - backout the tor-styles.inc.css additions - add tor-styles.css to browser-shared.css which is included everywhere - - - - - b05238e4 by Richard Pospesel at 2023-03-02T16:54:13+00:00 fixup! Bug 30237: Add v3 onion services client authentication prompt Bug 41659: Add canonical color definitions to base-browser - - - - - 0e2be626 by Richard Pospesel at 2023-03-02T16:54:13+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41659: Add canonical color definitions to base-browser - - - - - 486cbe1f by Richard Pospesel at 2023-03-02T16:54:13+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41659: Add canonical color definitions to base-browser - - - - - 13 changed files: - browser/base/content/browser.xhtml - browser/branding/alpha/content/jar.mn - browser/branding/alpha/content/tor-styles.css - browser/branding/nightly/content/jar.mn - browser/branding/nightly/content/tor-styles.css - browser/branding/official/content/jar.mn - browser/branding/official/content/tor-styles.css - browser/components/onionservices/content/authPreferences.css - browser/components/torconnect/content/aboutTorConnect.css - browser/components/torpreferences/content/torPreferences.css - browser/branding/tor-styles.inc.css → browser/themes/shared/browser-colors.css - browser/themes/shared/browser-shared.css - browser/themes/shared/jar.inc.mn Changes: ===================================== browser/base/content/browser.xhtml ===================================== @@ -10,7 +10,6 @@ override rules using selectors with the same specificity. This applies to both "content" and "skin" packages, which bug 1385444 will unify later. --> <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> -<?xml-stylesheet href="chrome://branding/content/tor-styles.css" type="text/css"?> <!-- While these stylesheets are defined in Toolkit, they are only used in the main browser window, so we can load them here. Bug 1474241 is on file to ===================================== browser/branding/alpha/content/jar.mn ===================================== @@ -20,4 +20,4 @@ browser.jar: content/branding/icon512.png (../default512.png) content/branding/identity-icons-brand.svg content/branding/aboutDialog.css -* content/branding/tor-styles.css + content/branding/tor-styles.css ===================================== browser/branding/alpha/content/tor-styles.css ===================================== @@ -1,5 +1,3 @@ -%include ../../tor-styles.inc.css - /* default theme*/ :root { --tor-branding-color: var(--teal-70); ===================================== browser/branding/nightly/content/jar.mn ===================================== @@ -19,4 +19,4 @@ browser.jar: content/branding/icon512.png (../default512.png) content/branding/identity-icons-brand.svg content/branding/aboutDialog.css -* content/branding/tor-styles.css + content/branding/tor-styles.css ===================================== browser/branding/nightly/content/tor-styles.css ===================================== @@ -1,5 +1,3 @@ -%include ../../tor-styles.inc.css - /* default theme*/ :root { --tor-branding-color: var(--blue-60); ===================================== browser/branding/official/content/jar.mn ===================================== @@ -19,4 +19,4 @@ browser.jar: content/branding/icon512.png (../default512.png) content/branding/identity-icons-brand.svg content/branding/aboutDialog.css -* content/branding/tor-styles.css + content/branding/tor-styles.css ===================================== browser/branding/official/content/tor-styles.css ===================================== @@ -1,5 +1,3 @@ -%include ../../tor-styles.inc.css - /* default theme*/ :root { --tor-branding-color: var(--purple-60); ===================================== browser/components/onionservices/content/authPreferences.css ===================================== @@ -1,6 +1,6 @@ /* Copyright (c) 2020, The Tor Project, Inc. */ -@import url("chrome://branding/content/tor-styles.css"); +@import url("chrome://browser/skin/browser-colors.css"); #torOnionServiceKeys-overview-container { margin-right: 30px; @@ -19,6 +19,6 @@ margin-right: 4px; list-style-image: url("chrome://global/skin/icons/warning.svg"); -moz-context-properties: fill; - fill: var(--torbrowser-warning); + fill: var(--warning-color); visibility: hidden; } ===================================== browser/components/torconnect/content/aboutTorConnect.css ===================================== @@ -2,7 +2,7 @@ /* Copyright (c) 2021, The Tor Project, Inc. */ @import url("chrome://browser/skin/error-pages.css"); -@import url("chrome://branding/content/tor-styles.css"); +@import url("chrome://browser/skin/browser-colors.css"); :root { --onion-opacity: 1; @@ -305,5 +305,5 @@ body { .title.location { background-image: url("chrome://browser/content/torconnect/connection-location.svg"); - stroke: var(--torbrowser-warning); + stroke: var(--warning-color); } ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -1,4 +1,5 @@ -@import url("chrome://branding/content/tor-styles.css"); +@import url("chrome://browser/skin/browser-colors.css"); + #category-connection > .category-icon { list-style-image: url("chrome://browser/content/torpreferences/torPreferencesIcon.svg"); @@ -170,7 +171,7 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { #torPreferences-status-internet-statusIcon.offline, #torPreferences-status-tor-statusIcon:not(.connected) { list-style-image: url("chrome://global/skin/icons/warning.svg"); - fill: var(--torbrowser-warning); + fill: var(--warning-color); } #torPreferences-status-tor-statusIcon.blocked { @@ -557,7 +558,7 @@ hbox#torPreferences-requestBridge-incorrectCaptchaHbox { image#torPreferences-requestBridge-errorIcon { list-style-image: url("chrome://global/skin/icons/warning.svg"); -moz-context-properties: fill; - fill: var(--torbrowser-warning); + fill: var(--warning-color); } groupbox#torPreferences-bridges-group textarea { ===================================== browser/branding/tor-styles.inc.css → browser/themes/shared/browser-colors.css ===================================== @@ -87,11 +87,11 @@ /* TODO: Switch to some Firefox variable, once Mozilla adds one for this color. Matches --warning-icon-bgcolor (but not on the dark theme variant). */ - --torbrowser-warning: #ffa436; + --warning-color: #ffa436; } @media (prefers-color-scheme: dark) { :root { - --torbrowser-warning: #ffbd4f; + --warning-color: #ffbd4f; } -} +} \ No newline at end of file ===================================== browser/themes/shared/browser-shared.css ===================================== @@ -23,6 +23,8 @@ @import url("chrome://browser/skin/UITour.css"); @import url("chrome://browser/skin/torconnect-urlbar.css"); @import url("chrome://browser/skin/onionlocation.css"); +@import url("chrome://browser/skin/browser-colors.css"); +@import url("chrome://branding/content/tor-styles.css"); @namespace html url("http://www.w3.org/1999/xhtml"); ===================================== browser/themes/shared/jar.inc.mn ===================================== @@ -17,6 +17,7 @@ skin/classic/browser/autocomplete.css (../shared/autocomplete.css) skin/classic/browser/blockedSite.css (../shared/blockedSite.css) skin/classic/browser/browser-shared.css (../shared/browser-shared.css) + skin/classic/browser/browser-colors.css (../shared/browser-colors.css) skin/classic/browser/ctrlTab.css (../shared/ctrlTab.css) skin/classic/browser/light-dark-overrides.css (../shared/light-dark-overrides.css) skin/classic/browser/error-pages.css (../shared/error-pages.css) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/0a12a5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/0a12a5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.8.0esr-12.5-1] Bug 41659: Add canonical color definitions to base-browser !!! 102.9.0esr...
by Richard Pospesel (＠richard) 02 Mar '23

02 Mar '23

Richard Pospesel pushed to branch base-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 7d26a0ae by Richard Pospesel at 2023-03-02T17:19:05+00:00 Bug 41659: Add canonical color definitions to base-browser !!! 102.9.0esr REBASE NOTE: this commit should appear relatively early in the base-browser branch - - - - - 3 changed files: - + browser/themes/shared/browser-colors.css - browser/themes/shared/browser-shared.css - browser/themes/shared/jar.inc.mn Changes: ===================================== browser/themes/shared/browser-colors.css ===================================== @@ -0,0 +1,97 @@ +:root { + /* photon colors, not all of them are available for whatever reason + in firefox, so here they are */ + + --magenta-50: #ff1ad9; + --magenta-60: #ed00b5; + --magenta-70: #b5007f; + --magenta-80: #7d004f; + --magenta-90: #440027; + + --purple-30: #c069ff; + --purple-40: #ad3bff; + --purple-50: #9400ff; + --purple-60: #8000d7; + --purple-70: #6200a4; + --purple-80: #440071; + --purple-90: #25003e; + + --blue-40: #45a1ff; + --blue-50: #0a84ff; + --blue-50-a30: rgba(10, 132, 255, 0.3); + --blue-60: #0060df; + --blue-70: #003eaa; + --blue-80: #002275; + --blue-90: #000f40; + + --teal-50: #00feff; + --teal-60: #00c8d7; + --teal-70: #008ea4; + --teal-80: #005a71; + --teal-90: #002d3e; + + --green-50: #30e60b; + --green-60: #12bc00; + --green-70: #058b00; + --green-80: #006504; + --green-90: #003706; + + --yellow-50: #ffe900; + --yellow-60: #d7b600; + --yellow-70: #a47f00; + --yellow-80: #715100; + --yellow-90: #3e2800; + + --red-50: #ff0039; + --red-60: #d70022; + --red-70: #a4000f; + --red-80: #5a0002; + --red-90: #3e0200; + + --orange-50: #ff9400; + --orange-60: #d76e00; + --orange-70: #a44900; + --orange-80: #712b00; + --orange-90: #3e1300; + + --grey-10: #f9f9fa; + --grey-10-a10: rgba(249, 249, 250, 0.1); + --grey-10-a20: rgba(249, 249, 250, 0.2); + --grey-10-a40: rgba(249, 249, 250, 0.4); + --grey-10-a60: rgba(249, 249, 250, 0.6); + --grey-10-a80: rgba(249, 249, 250, 0.8); + --grey-20: #ededf0; + --grey-30: #d7d7db; + --grey-40: #b1b1b3; + --grey-50: #737373; + --grey-60: #4a4a4f; + --grey-70: #38383d; + --grey-80: #2a2a2e; + --grey-90: #0c0c0d; + --grey-90-a05: rgba(12, 12, 13, 0.05); + --grey-90-a10: rgba(12, 12, 13, 0.1); + --grey-90-a20: rgba(12, 12, 13, 0.2); + --grey-90-a30: rgba(12, 12, 13, 0.3); + --grey-90-a40: rgba(12, 12, 13, 0.4); + --grey-90-a50: rgba(12, 12, 13, 0.5); + --grey-90-a60: rgba(12, 12, 13, 0.6); + --grey-90-a70: rgba(12, 12, 13, 0.7); + --grey-90-a80: rgba(12, 12, 13, 0.8); + --grey-90-a90: rgba(12, 12, 13, 0.9); + + --ink-70: #363959; + --ink-80: #202340; + --ink-90: #0f1126; + + --white-100: #ffffff; + + /* TODO: Switch to some Firefox variable, once Mozilla adds one for this + color. Matches --warning-icon-bgcolor (but not on the dark theme variant). */ + --warning-color: #ffa436; +} + +@media (prefers-color-scheme: dark) { + :root { + --warning-color: #ffbd4f; + } +} \ No newline at end of file ===================================== browser/themes/shared/browser-shared.css ===================================== @@ -21,6 +21,7 @@ @import url("chrome://browser/skin/ctrlTab.css"); @import url("chrome://browser/skin/customizableui/customizeMode.css"); @import url("chrome://browser/skin/UITour.css"); +@import url("chrome://browser/skin/browser-colors.css"); @namespace html url("http://www.w3.org/1999/xhtml"); ===================================== browser/themes/shared/jar.inc.mn ===================================== @@ -17,6 +17,7 @@ skin/classic/browser/autocomplete.css (../shared/autocomplete.css) skin/classic/browser/blockedSite.css (../shared/blockedSite.css) skin/classic/browser/browser-shared.css (../shared/browser-shared.css) + skin/classic/browser/browser-colors.css (../shared/browser-colors.css) skin/classic/browser/ctrlTab.css (../shared/ctrlTab.css) skin/classic/browser/light-dark-overrides.css (../shared/light-dark-overrides.css) skin/classic/browser/error-pages.css (../shared/error-pages.css) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7d26a0a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7d26a0a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.5-1] 6 commits: fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by Richard Pospesel (＠richard) 02 Mar '23

02 Mar '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 24e44e33 by Richard Pospesel at 2023-03-02T16:41:37+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41659: Add canonical color definitions to base-browser - commit removes tor-styles.css browser.xhtml so that the base-browser rebase applies correctly - - - - - d643fcd1 by Richard Pospesel at 2023-03-02T17:00:38+00:00 Bug 41659: Add canonical color definitions to base-browser !!! 102.9.0esr REBASE NOTE: this commit should appear relatively early in the base-browser branch - - - - - e74b4acd by Richard Pospesel at 2023-03-02T17:12:25+00:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser Bug 41659: Add canonical color definitions to base-browser - backout the tor-styles.inc.css additions - add tor-styles.css to browser-shared.css which is included everywhere - - - - - 068750f3 by Richard Pospesel at 2023-03-02T17:12:26+00:00 fixup! Bug 30237: Add v3 onion services client authentication prompt Bug 41659: Add canonical color definitions to base-browser - - - - - 157540ad by Richard Pospesel at 2023-03-02T17:12:26+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41659: Add canonical color definitions to base-browser - - - - - 715ba5fa by Richard Pospesel at 2023-03-02T17:12:26+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41659: Add canonical color definitions to base-browser - - - - - 13 changed files: - browser/base/content/browser.xhtml - browser/branding/tb-alpha/content/jar.mn - browser/branding/tb-alpha/content/tor-styles.css - browser/branding/tb-nightly/content/jar.mn - browser/branding/tb-nightly/content/tor-styles.css - browser/branding/tb-release/content/jar.mn - browser/branding/tb-release/content/tor-styles.css - browser/components/onionservices/content/authPreferences.css - browser/components/torconnect/content/aboutTorConnect.css - browser/components/torpreferences/content/torPreferences.css - browser/branding/tor-styles.inc.css → browser/themes/shared/browser-colors.css - browser/themes/shared/browser-shared.css - browser/themes/shared/jar.inc.mn Changes: ===================================== browser/base/content/browser.xhtml ===================================== @@ -10,7 +10,6 @@ override rules using selectors with the same specificity. This applies to both "content" and "skin" packages, which bug 1385444 will unify later. --> <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> -<?xml-stylesheet href="chrome://branding/content/tor-styles.css" type="text/css"?> <!-- While these stylesheets are defined in Toolkit, they are only used in the main browser window, so we can load them here. Bug 1474241 is on file to ===================================== browser/branding/tb-alpha/content/jar.mn ===================================== @@ -18,4 +18,4 @@ browser.jar: content/branding/icon256.png (../default256.png) content/branding/identity-icons-brand.svg content/branding/aboutDialog.css -* content/branding/tor-styles.css + content/branding/tor-styles.css ===================================== browser/branding/tb-alpha/content/tor-styles.css ===================================== @@ -1,5 +1,3 @@ -%include ../../tor-styles.inc.css - /* default theme*/ :root { --tor-branding-color: var(--teal-70); ===================================== browser/branding/tb-nightly/content/jar.mn ===================================== @@ -18,4 +18,4 @@ browser.jar: content/branding/icon256.png (../default256.png) content/branding/identity-icons-brand.svg content/branding/aboutDialog.css -* content/branding/tor-styles.css + content/branding/tor-styles.css ===================================== browser/branding/tb-nightly/content/tor-styles.css ===================================== @@ -1,5 +1,3 @@ -%include ../../tor-styles.inc.css - /* default theme*/ :root { --tor-branding-color: var(--blue-60); ===================================== browser/branding/tb-release/content/jar.mn ===================================== @@ -18,4 +18,4 @@ browser.jar: content/branding/icon256.png (../default256.png) content/branding/identity-icons-brand.svg content/branding/aboutDialog.css -* content/branding/tor-styles.css + content/branding/tor-styles.css ===================================== browser/branding/tb-release/content/tor-styles.css ===================================== @@ -1,5 +1,3 @@ -%include ../../tor-styles.inc.css - /* default theme*/ :root { --tor-branding-color: var(--purple-60); ===================================== browser/components/onionservices/content/authPreferences.css ===================================== @@ -1,6 +1,6 @@ /* Copyright (c) 2020, The Tor Project, Inc. */ -@import url("chrome://branding/content/tor-styles.css"); +@import url("chrome://browser/skin/browser-colors.css"); #torOnionServiceKeys-overview-container { margin-right: 30px; @@ -19,6 +19,6 @@ margin-right: 4px; list-style-image: url("chrome://global/skin/icons/warning.svg"); -moz-context-properties: fill; - fill: var(--torbrowser-warning); + fill: var(--warning-color); visibility: hidden; } ===================================== browser/components/torconnect/content/aboutTorConnect.css ===================================== @@ -2,7 +2,7 @@ /* Copyright (c) 2021, The Tor Project, Inc. */ @import url("chrome://browser/skin/error-pages.css"); -@import url("chrome://branding/content/tor-styles.css"); +@import url("chrome://browser/skin/browser-colors.css"); :root { --onion-opacity: 1; @@ -317,5 +317,5 @@ body { .title.location { background-image: url("chrome://browser/content/torconnect/connection-location.svg"); - stroke: var(--torbrowser-warning); + stroke: var(--warning-color); } ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -1,4 +1,5 @@ -@import url("chrome://branding/content/tor-styles.css"); +@import url("chrome://browser/skin/browser-colors.css"); + #category-connection > .category-icon { list-style-image: url("chrome://browser/content/torpreferences/torPreferencesIcon.svg"); @@ -170,7 +171,7 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { #torPreferences-status-internet-statusIcon.offline, #torPreferences-status-tor-statusIcon:not(.connected) { list-style-image: url("chrome://global/skin/icons/warning.svg"); - fill: var(--torbrowser-warning); + fill: var(--warning-color); } #torPreferences-status-tor-statusIcon.blocked { @@ -563,7 +564,7 @@ hbox#torPreferences-requestBridge-incorrectCaptchaHbox { image#torPreferences-requestBridge-errorIcon { list-style-image: url("chrome://global/skin/icons/warning.svg"); -moz-context-properties: fill; - fill: var(--torbrowser-warning); + fill: var(--warning-color); } groupbox#torPreferences-bridges-group textarea { ===================================== browser/branding/tor-styles.inc.css → browser/themes/shared/browser-colors.css ===================================== @@ -87,11 +87,11 @@ /* TODO: Switch to some Firefox variable, once Mozilla adds one for this color. Matches --warning-icon-bgcolor (but not on the dark theme variant). */ - --torbrowser-warning: #ffa436; + --warning-color: #ffa436; } @media (prefers-color-scheme: dark) { :root { - --torbrowser-warning: #ffbd4f; + --warning-color: #ffbd4f; } -} +} \ No newline at end of file ===================================== browser/themes/shared/browser-shared.css ===================================== @@ -23,6 +23,8 @@ @import url("chrome://browser/skin/UITour.css"); @import url("chrome://browser/skin/torconnect-urlbar.css"); @import url("chrome://browser/skin/onionlocation.css"); +@import url("chrome://browser/skin/browser-colors.css"); +@import url("chrome://branding/content/tor-styles.css"); @namespace html url("http://www.w3.org/1999/xhtml"); ===================================== browser/themes/shared/jar.inc.mn ===================================== @@ -17,6 +17,7 @@ skin/classic/browser/autocomplete.css (../shared/autocomplete.css) skin/classic/browser/blockedSite.css (../shared/blockedSite.css) skin/classic/browser/browser-shared.css (../shared/browser-shared.css) + skin/classic/browser/browser-colors.css (../shared/browser-colors.css) skin/classic/browser/ctrlTab.css (../shared/ctrlTab.css) skin/classic/browser/light-dark-overrides.css (../shared/light-dark-overrides.css) skin/classic/browser/error-pages.css (../shared/error-pages.css) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6518ee… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6518ee… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-android-service][main] Bug 40800: Add WebTunnel support
by boklm (＠boklm) 02 Mar '23

02 Mar '23

boklm pushed to branch main at The Tor Project / Applications / tor-android-service Commits: 0438a9a4 by Shelikhoo at 2023-03-02T13:11:36+00:00 Bug 40800: Add WebTunnel support - - - - - 1 changed file: - service/src/main/java/org/torproject/android/service/TorService.java Changes: ===================================== service/src/main/java/org/torproject/android/service/TorService.java ===================================== @@ -379,8 +379,10 @@ public final class TorService extends Service implements TorServiceConstants, Or if(!pluggableTransportSnow.canExecute()) pluggableTransportSnow.setExecutable(true); File pluggableTransportConjure = new File(nativeDir, "libConjure.so"); if(!pluggableTransportConjure.canExecute()) pluggableTransportConjure.setExecutable(true); + File pluggableTransportWebtunnel = new File(nativeDir, "libWebtunnel.so"); + if(!pluggableTransportWebtunnel.canExecute()) pluggableTransportWebtunnel.setExecutable(true); - builder.configurePluggableTransportsFromSettings(pluggableTransportObfs, pluggableTransportSnow, pluggableTransportConjure); + builder.configurePluggableTransportsFromSettings(pluggableTransportObfs, pluggableTransportSnow, pluggableTransportConjure, pluggableTransportWebtunnel); mDataService.updateConfigBuilder(builder); onionProxyManager.getTorInstaller().updateTorConfigCustom (builder.asString()); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-android-service/-/commit… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-android-service/-/commit… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.0-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by Richard Pospesel (＠richard) 28 Feb '23

28 Feb '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 0a12a547 by Richard Pospesel at 2023-02-28T19:53:01+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection fixed substring calculation to get short name of locale for bridge emojii names - - - - - 1 changed file: - browser/components/torpreferences/content/connectionPane.js Changes: ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -741,7 +741,7 @@ const gConnectionPane = (function() { const annotations = await res.json(); const bcp47 = Services.locale.appLocaleAsBCP47; const dash = bcp47.indexOf("-"); - const lang = dash !== -1 ? bcp47.substring(dash) : bcp47; + const lang = dash !== -1 ? bcp47.substring(0, dash) : bcp47; if (bcp47 in annotations) { emojiAnnotations = annotations[bcp47]; } else if (lang in annotations) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0a12a54… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0a12a54… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40793: Add some metadata also to the Windows installer
by Pier Angelo Vendrame (＠pierov) 27 Feb '23

27 Feb '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 8d0aeaff by Pier Angelo Vendrame at 2023-02-27T18:57:02+01:00 Bug 40793: Add some metadata also to the Windows installer - - - - - 2 changed files: - projects/browser/windows-installer.nsi - projects/firefox/config Changes: ===================================== projects/browser/windows-installer.nsi ===================================== @@ -45,6 +45,15 @@ !define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\[% c('var/ProjectName') %]" [% END -%] +;-------------------------------- +;Metadata + + VIProductVersion "[% pc("firefox", "var/browser_series") %].0.0" + VIAddVersionKey "ProductName" "[% c('var/Project_Name') %]" + VIAddVersionKey "ProductVersion" "[% c('var/torbrowser_version') %]" + VIAddVersionKey "FileDescription" "[% c('var/Project_Name') %][% IF system_install_mode -%] System[% END -%] Installer" + VIAddVersionKey "LegalCopyright" "© [% pc("firefox", "var/copyright_year") %] The Tor Project" + ;-------------------------------- ;Interface Configuration @@ -164,7 +173,9 @@ Section "[% c('var/Project_Name') %]" SecBrowser WriteRegStr HKLM "${UNINST_KEY}" "DisplayName" "[% c('var/Project_Name') %]" WriteRegStr HKLM "${UNINST_KEY}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\"" WriteRegStr HKLM "${UNINST_KEY}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S" + WriteRegStr HKLM "${UNINST_KEY}" "Publisher" "The Tor Project" WriteRegStr HKLM "${UNINST_KEY}" "DisplayIcon" "$\"$INSTDIR\[% c('var/exe_name') %].exe$\"" + WriteRegStr HKLM "${UNINST_KEY}" "DisplayVersion" "[% c('var/torbrowser_version') %]" WriteRegDWORD HKLM "${UNINST_KEY}" "NoModify" "1" WriteRegDWORD HKLM "${UNINST_KEY}" "NoRepair" "1" ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2 ===================================== projects/firefox/config ===================================== @@ -13,7 +13,8 @@ container: var: firefox_platform_version: 102.8.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' - browser_branch: '12.5-1' + browser_series: '12.5' + browser_branch: '[% c("var/browser_series") %]-1' browser_build: 3 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.5-1] 2 commits: fixup! Add TorStrings module for localization
by Richard Pospesel (＠richard) 27 Feb '23

27 Feb '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 63afd83c by Dan Ballard at 2023-02-27T14:55:03+00:00 fixup! Add TorStrings module for localization bug 41085: add new strings for bridge removal dialog - - - - - 6518ee5b by Dan Ballard at 2023-02-27T14:55:03+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection bug 41085: move remove all bridges button and modernize dialoge to proton - - - - - 5 changed files: - browser/components/torpreferences/content/connectionPane.js - browser/components/torpreferences/content/connectionPane.xhtml - browser/components/torpreferences/content/torPreferences.css - browser/modules/TorStrings.jsm - toolkit/torbutton/chrome/locale/en-US/settings.properties Changes: ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -117,9 +117,9 @@ const gConnectionPane = (function() { locationEntries: "#torPreferences-bridges-locationEntries", chooseForMe: "#torPreferences-bridges-buttonChooseBridgeForMe", currentHeader: "#torPreferences-currentBridges-header", - currentHeaderText: "#torPreferences-currentBridges-headerText", currentDescription: "#torPreferences-currentBridges-description", currentDescriptionText: "#torPreferences-currentBridges-descriptionText", + switchLabel: "#torPreferences-currentBridges-enableAll-label", switch: "#torPreferences-currentBridges-switch", cards: "#torPreferences-currentBridges-cards", cardTemplate: "#torPreferences-bridgeCard-template", @@ -426,10 +426,9 @@ const gConnectionPane = (function() { const bridgeHeader = prefpane.querySelector( selectors.bridges.currentHeader ); - bridgeHeader.querySelector( - selectors.bridges.currentHeaderText - ).textContent = TorStrings.settings.bridgeCurrent; - const bridgeSwitch = bridgeHeader.querySelector(selectors.bridges.switch); + bridgeHeader.textContent = TorStrings.settings.bridgeCurrent; + prefpane.querySelector(selectors.bridges.switchLabel).textContent = TorStrings.settings.allBridgesEnabled; + const bridgeSwitch = prefpane.querySelector(selectors.bridges.switch); bridgeSwitch.addEventListener("change", () => { TorSettings.bridges.enabled = bridgeSwitch.checked; TorSettings.saveToPrefs(); @@ -860,35 +859,32 @@ const gConnectionPane = (function() { } { - const overlay = prefpane.querySelector(selectors.bridges.removeOverlay); this._confirmBridgeRemoval = () => { - overlay.classList.remove("hidden"); - }; - const closeDialog = () => { - overlay.classList.add("hidden"); + const aParentWindow = Services.wm.getMostRecentWindow("navigator:browser"); + + const ps = Services.prompt; + const btnFlags = + ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING + + ps.BUTTON_POS_0_DEFAULT + + ps.BUTTON_POS_1 * ps.BUTTON_TITLE_CANCEL; + + const notUsed = { value: false }; + const btnIndex = ps.confirmEx( + aParentWindow, + TorStrings.settings.bridgeRemoveAllDialogTitle, + TorStrings.settings.bridgeRemoveAllDialogDescription, + btnFlags, + TorStrings.settings.remove, + null, + null, + null, + notUsed + ); + + if (btnIndex === 0) { + this.onRemoveAllBridges(); + } }; - overlay.addEventListener("click", closeDialog); - const modal = prefpane.querySelector(selectors.bridges.removeModal); - modal.addEventListener("click", e => { - e.stopPropagation(); - }); - const dismiss = prefpane.querySelector(selectors.bridges.removeDismiss); - dismiss.addEventListener("click", closeDialog); - const question = prefpane.querySelector( - selectors.bridges.removeQuestion - ); - question.textContent = TorStrings.settings.removeBridgesQuestion; - const warning = prefpane.querySelector(selectors.bridges.removeWarning); - warning.textContent = TorStrings.settings.removeBridgesWarning; - const confirm = prefpane.querySelector(selectors.bridges.removeConfirm); - confirm.setAttribute("label", TorStrings.settings.remove); - confirm.addEventListener("command", () => { - this.onRemoveAllBridges(); - closeDialog(); - }); - const cancel = prefpane.querySelector(selectors.bridges.removeCancel); - cancel.setAttribute("label", TorStrings.settings.cancel); - cancel.addEventListener("command", closeDialog); } // Advanced setup ===================================== browser/components/torpreferences/content/connectionPane.xhtml ===================================== @@ -91,12 +91,17 @@ <button id="torPreferences-bridges-buttonChooseBridgeForMe" class="primary"/> </hbox> <html:h2 id="torPreferences-currentBridges-header"> - <html:span id="torPreferences-currentBridges-headerText"/> - <html:input type="checkbox" id="torPreferences-currentBridges-switch" class="toggle-button"/> </html:h2> <description flex="1" id="torPreferences-currentBridges-description"> <html:span id="torPreferences-currentBridges-descriptionText"/> </description> + <hbox align="center"> + <html:input type="checkbox" id="torPreferences-currentBridges-switch" class="toggle-button"/> + <html:label id="torPreferences-currentBridges-enableAll-label" for="torPreferences-currentBridges-switch"> + </html:label> + <spacer flex="1"/> + <button id="torPreferences-currentBridges-removeAll"/> + </hbox> <menupopup id="torPreferences-bridgeCard-menu"/> <vbox id="torPreferences-bridgeCard-template" class="torPreferences-bridgeCard"> <hbox class="torPreferences-bridgeCard-heading"> @@ -133,7 +138,6 @@ <vbox id="torPreferences-currentBridges-cards"></vbox> <vbox align="center"> <button id="torPreferences-currentBridges-showAll"/> - <button id="torPreferences-currentBridges-removeAll" class="primary danger-button"/> </vbox> <html:h2 id="torPreferences-addBridge-header"></html:h2> <hbox align="center"> @@ -176,17 +180,4 @@ </hbox> </groupbox> -<html:div id="bridge-remove-overlay" class="hidden"> - <html:div id="bridge-remove-modal"> - <html:img id="bridge-remove-dismiss" src="chrome://global/skin/icons/close.svg"/> - <html:div id="bridge-remove-icon"/> - <html:p id="bridge-remove-question"/> - <html:p id="bridge-remove-warning"/> - <html:div id="bridge-remove-buttonbar"> - <button id="bridge-remove-cancel"/> - <button id="bridge-remove-confirm"/> - </html:div> - </html:div> -</html:div> - </html:template> ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -187,6 +187,12 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { font-weight: 700; } +#torPreferences-currentBridges-enableAll-label { + /* Block display to work with parent's xul box layout. */ + display: block; + margin-inline: 6px; +} + /* Bridge cards */ :root { --bridgeCard-animation-time: 0.25s; ===================================== browser/modules/TorStrings.jsm ===================================== @@ -111,7 +111,10 @@ const Loader = { bridgeCopy: "Copy Bridge Address", copied: "Copied!", bridgeShowAll: "Show All Bridges", + allBridgesEnabled: "Use current bridges", bridgeRemoveAll: "Remove All Bridges", + bridgeRemoveAllDialogTitle: "Remove all bridges?", + bridgeRemoveAllDialogDescription: "If these bridges were received from torproject.org or added manually, this action cannot be undone", bridgeAdd: "Add a New Bridge", bridgeSelectBrowserBuiltin: "Choose from one of Tor Browser’s built-in bridges", ===================================== toolkit/torbutton/chrome/locale/en-US/settings.properties ===================================== @@ -43,7 +43,10 @@ settings.bridgeShare=Share this bridge using the QR code or by copying its addre settings.bridgeCopy=Copy Bridge Address settings.copied=Copied! settings.bridgeShowAll=Show All Bridges +settings.allBridgesEnabled=Use current bridges settings.bridgeRemoveAll=Remove All Bridges +settings.bridgeRemoveAllDialogTitle=Remove all bridges? +settings.bridgeRemoveAllDialogDescription=If these bridges were received from torproject.org or added manually, this action cannot be undone settings.bridgeAdd=Add a New Bridge settings.bridgeSelectBrowserBuiltin=Choose from one of Tor Browser’s built-in bridges settings.bridgeSelectBuiltin=Select a Built-In Bridge… View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d81464… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d81464… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.8.0esr-12.5-1] Bug 41635: Disable the Normandy component
by Richard Pospesel (＠richard) 27 Feb '23

27 Feb '23

Richard Pospesel pushed to branch base-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 21d60922 by Pier Angelo Vendrame at 2023-02-27T14:53:20+00:00 Bug 41635: Disable the Normandy component Do not include Normandy at all whenever MOZ_NORMANDY is False. - - - - - 2 changed files: - browser/components/BrowserGlue.jsm - toolkit/components/moz.build Changes: ===================================== browser/components/BrowserGlue.jsm ===================================== @@ -1934,7 +1934,13 @@ BrowserGlue.prototype = { () => PageDataService.uninit(), () => PageThumbs.uninit(), () => NewTabUtils.uninit(), - () => Normandy.uninit(), + + () => { + if (AppConstants.MOZ_NORMANDY) { + Normandy.uninit(); + } + }, + () => RFPHelper.uninit(), () => UpdateListener.reset(), ]; ===================================== toolkit/components/moz.build ===================================== @@ -123,7 +123,9 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] != "android": ] if CONFIG["MOZ_BUILD_APP"] == "browser": - DIRS += ["normandy", "messaging-system"] + if CONFIG["MOZ_NORMANDY"]: + DIRS += ["normandy"] + DIRS += ["messaging-system"] DIRS += ["nimbus"] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/21d6092… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/21d6092… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.5-1] Bug 41635: Disable the Normandy component
by Richard Pospesel (＠richard) 27 Feb '23

27 Feb '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: d814648c by Pier Angelo Vendrame at 2023-02-27T14:09:58+00:00 Bug 41635: Disable the Normandy component Do not include Normandy at all whenever MOZ_NORMANDY is False. - - - - - 2 changed files: - browser/components/BrowserGlue.jsm - toolkit/components/moz.build Changes: ===================================== browser/components/BrowserGlue.jsm ===================================== @@ -2011,7 +2011,13 @@ BrowserGlue.prototype = { () => PageDataService.uninit(), () => PageThumbs.uninit(), () => NewTabUtils.uninit(), - () => Normandy.uninit(), + + () => { + if (AppConstants.MOZ_NORMANDY) { + Normandy.uninit(); + } + }, + () => RFPHelper.uninit(), () => UpdateListener.reset(), () => OnionAliasStore.uninit(), ===================================== toolkit/components/moz.build ===================================== @@ -124,7 +124,9 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] != "android": ] if CONFIG["MOZ_BUILD_APP"] == "browser": - DIRS += ["normandy", "messaging-system"] + if CONFIG["MOZ_NORMANDY"]: + DIRS += ["normandy"] + DIRS += ["messaging-system"] DIRS += ["nimbus"] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d814648… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d814648… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.8.0esr-12.5-1] 2 commits: Revert "Bug 41629: Fix errors with MOZ_SERVICES_SYNC=False"
by Pier Angelo Vendrame (＠pierov) 27 Feb '23

27 Feb '23

Pier Angelo Vendrame pushed to branch base-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: bc8fc896 by Richard Pospesel at 2023-02-27T09:47:57+01:00 Revert "Bug 41629: Fix errors with MOZ_SERVICES_SYNC=False" This reverts commit 8f61c9c0b06a1820caeb4683595cec98f0ad88b9. current implementation breaks about:preferences due to runtime errors - - - - - a4aaf6e6 by Richard Pospesel at 2023-02-27T09:48:26+01:00 Revert "fixup! Base Browser's .mozconfigs." This reverts commit 9ac0abfdd9f4bcb53841c40d3b42d34bec92b262. - - - - - 5 changed files: - browser/base/content/browser-sync.js - browser/components/BrowserGlue.jsm - browser/installer/package-manifest.in - browser/moz.configure - toolkit/modules/moz.build Changes: ===================================== browser/base/content/browser-sync.js ===================================== @@ -5,11 +5,7 @@ // This file is loaded into the browser window scope. /* eslint-env mozilla/browser-window */ -ChromeUtils.defineModuleGetter( - this, - "UIState", - "resource://services-sync/UIState.jsm" -); +const { UIState } = ChromeUtils.import("resource://services-sync/UIState.jsm"); ChromeUtils.defineModuleGetter( this, @@ -346,9 +342,7 @@ var gSync = { // once syncing completes (bug 1239042). _syncStartTime: 0, _syncAnimationTimer: 0, - _obs: AppConstants.MOZ_SERVICES_SYNC - ? ["weave:engine:sync:finish", "quit-application", UIState.ON_UPDATE] - : [], + _obs: ["weave:engine:sync:finish", "quit-application", UIState.ON_UPDATE], get log() { if (!this._log) { @@ -464,7 +458,7 @@ var gSync = { this._definePrefGetters(); - if (!AppConstants.MOZ_SERVICES_SYNC || !this.FXA_ENABLED) { + if (!this.FXA_ENABLED) { this.onFxaDisabled(); return; } @@ -1535,7 +1529,7 @@ var gSync = { // can lead to a empty label for 'Send To Device' Menu. this.init(); - if (!AppConstants.MOZ_SERVICES_SYNC || !this.FXA_ENABLED) { + if (!this.FXA_ENABLED) { // These items are hidden in onFxaDisabled(). No need to do anything. return; } @@ -1570,7 +1564,7 @@ var gSync = { // "Send Page to Device" and "Send Link to Device" menu items updateContentContextMenu(contextMenu) { - if (!AppConstants.MOZ_SERVICES_SYNC || !this.FXA_ENABLED) { + if (!this.FXA_ENABLED) { // These items are hidden by default. No need to do anything. return false; } ===================================== browser/components/BrowserGlue.jsm ===================================== @@ -718,10 +718,10 @@ let JSWINDOWACTORS = { }, }; -XPCOMUtils.defineLazyGetter(this, "WeaveService", () => - AppConstants.MOZ_SERVICES_SYNC - ? Cc["@mozilla.org/weave/service;1"].getService().wrappedJSObject - : null +XPCOMUtils.defineLazyGetter( + this, + "WeaveService", + () => Cc["@mozilla.org/weave/service;1"].getService().wrappedJSObject ); if (AppConstants.MOZ_CRASHREPORTER) { @@ -2690,7 +2690,7 @@ BrowserGlue.prototype = { // Schedule a sync (if enabled) after we've loaded { task: async () => { - if (WeaveService?.enabled) { + if (WeaveService.enabled) { await WeaveService.whenLoaded(); WeaveService.Weave.Service.scheduler.autoConnect(); } ===================================== browser/installer/package-manifest.in ===================================== @@ -179,17 +179,7 @@ @RESPATH@/browser/components/MacTouchBar.manifest @RESPATH@/browser/components/MacTouchBar.js #endif -; TODO: Remove this in ESR-115. -; If everything goes well, this patch will not be necessary in 115, because we -; have also an upstream bug. -; I suspect this is somehow incorrect, and that MOZ_SERVICES_SYNC is actually -; never defined for the makefile (it is not for Firefox 112, which builds -; correctly with MOZ_SERVICES_SYNC == False, even without this ifdef). -; But we are interested in disabling it, so using either this, or #if 0 would be -; fine for us. -#ifdef MOZ_SERVICES_SYNC @RESPATH@/components/SyncComponents.manifest -#endif @RESPATH@/components/servicesComponents.manifest @RESPATH@/components/servicesSettings.manifest @RESPATH@/components/cryptoComponents.manifest ===================================== browser/moz.configure ===================================== @@ -7,8 +7,7 @@ imply_option("MOZ_PLACES", True) # tor-browser#32493 imply_option("MOZ_SERVICES_HEALTHREPORT", False) -# tor-browser#41629 -imply_option("MOZ_SERVICES_SYNC", False) +imply_option("MOZ_SERVICES_SYNC", True) imply_option("MOZ_DEDICATED_PROFILES", True) imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", True) # tor-browser#33734 ===================================== toolkit/modules/moz.build ===================================== @@ -291,7 +291,6 @@ for var in ( for var in ( "MOZ_ALLOW_ADDON_SIDELOAD", "MOZ_BACKGROUNDTASKS", - "MOZ_SERVICES_SYNC", "MOZ_SYSTEM_NSS", "MOZ_SYSTEM_POLICIES", "MOZ_UNSIGNED_APP_SCOPE", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/24aca1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/24aca1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.5-1] Revert "fixup! Base Browser's .mozconfigs."
by Richard Pospesel (＠richard) 25 Feb '23

25 Feb '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 85b5aa49 by Richard Pospesel at 2023-02-25T12:39:13+00:00 Revert "fixup! Base Browser's .mozconfigs." This reverts commit 9ac0abfdd9f4bcb53841c40d3b42d34bec92b262. - - - - - 1 changed file: - browser/moz.configure Changes: ===================================== browser/moz.configure ===================================== @@ -7,8 +7,7 @@ imply_option("MOZ_PLACES", True) # tor-browser#32493 imply_option("MOZ_SERVICES_HEALTHREPORT", False) -# tor-browser#41629 -imply_option("MOZ_SERVICES_SYNC", False) +imply_option("MOZ_SERVICES_SYNC", True) imply_option("MOZ_DEDICATED_PROFILES", False) imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", False) # tor-browser#33734 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/85b5aa4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/85b5aa4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.5-1] Revert "Bug 41629: Fix errors with MOZ_SERVICES_SYNC=False"
by Richard Pospesel (＠richard) 24 Feb '23

24 Feb '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: cc0c58ab by Richard Pospesel at 2023-02-24T11:29:13+00:00 Revert "Bug 41629: Fix errors with MOZ_SERVICES_SYNC=False" This reverts commit 8f61c9c0b06a1820caeb4683595cec98f0ad88b9. current implementation breaks about:preferences due to runtime errors - - - - - 4 changed files: - browser/base/content/browser-sync.js - browser/components/BrowserGlue.jsm - browser/installer/package-manifest.in - toolkit/modules/moz.build Changes: ===================================== browser/base/content/browser-sync.js ===================================== @@ -5,11 +5,7 @@ // This file is loaded into the browser window scope. /* eslint-env mozilla/browser-window */ -ChromeUtils.defineModuleGetter( - this, - "UIState", - "resource://services-sync/UIState.jsm" -); +const { UIState } = ChromeUtils.import("resource://services-sync/UIState.jsm"); ChromeUtils.defineModuleGetter( this, @@ -346,9 +342,7 @@ var gSync = { // once syncing completes (bug 1239042). _syncStartTime: 0, _syncAnimationTimer: 0, - _obs: AppConstants.MOZ_SERVICES_SYNC - ? ["weave:engine:sync:finish", "quit-application", UIState.ON_UPDATE] - : [], + _obs: ["weave:engine:sync:finish", "quit-application", UIState.ON_UPDATE], get log() { if (!this._log) { @@ -464,7 +458,7 @@ var gSync = { this._definePrefGetters(); - if (!AppConstants.MOZ_SERVICES_SYNC || !this.FXA_ENABLED) { + if (!this.FXA_ENABLED) { this.onFxaDisabled(); return; } @@ -1535,7 +1529,7 @@ var gSync = { // can lead to a empty label for 'Send To Device' Menu. this.init(); - if (!AppConstants.MOZ_SERVICES_SYNC || !this.FXA_ENABLED) { + if (!this.FXA_ENABLED) { // These items are hidden in onFxaDisabled(). No need to do anything. return; } @@ -1570,7 +1564,7 @@ var gSync = { // "Send Page to Device" and "Send Link to Device" menu items updateContentContextMenu(contextMenu) { - if (!AppConstants.MOZ_SERVICES_SYNC || !this.FXA_ENABLED) { + if (!this.FXA_ENABLED) { // These items are hidden by default. No need to do anything. return false; } ===================================== browser/components/BrowserGlue.jsm ===================================== @@ -791,10 +791,10 @@ if (AppConstants.TOR_BROWSER_UPDATE) { }; } -XPCOMUtils.defineLazyGetter(this, "WeaveService", () => - AppConstants.MOZ_SERVICES_SYNC - ? Cc["@mozilla.org/weave/service;1"].getService().wrappedJSObject - : null +XPCOMUtils.defineLazyGetter( + this, + "WeaveService", + () => Cc["@mozilla.org/weave/service;1"].getService().wrappedJSObject ); if (AppConstants.MOZ_CRASHREPORTER) { @@ -2795,7 +2795,7 @@ BrowserGlue.prototype = { // Schedule a sync (if enabled) after we've loaded { task: async () => { - if (WeaveService?.enabled) { + if (WeaveService.enabled) { await WeaveService.whenLoaded(); WeaveService.Weave.Service.scheduler.autoConnect(); } ===================================== browser/installer/package-manifest.in ===================================== @@ -181,17 +181,7 @@ @RESPATH@/browser/components/MacTouchBar.manifest @RESPATH@/browser/components/MacTouchBar.js #endif -; TODO: Remove this in ESR-115. -; If everything goes well, this patch will not be necessary in 115, because we -; have also an upstream bug. -; I suspect this is somehow incorrect, and that MOZ_SERVICES_SYNC is actually -; never defined for the makefile (it is not for Firefox 112, which builds -; correctly with MOZ_SERVICES_SYNC == False, even without this ifdef). -; But we are interested in disabling it, so using either this, or #if 0 would be -; fine for us. -#ifdef MOZ_SERVICES_SYNC @RESPATH@/components/SyncComponents.manifest -#endif @RESPATH@/components/servicesComponents.manifest @RESPATH@/components/servicesSettings.manifest @RESPATH@/components/cryptoComponents.manifest ===================================== toolkit/modules/moz.build ===================================== @@ -293,7 +293,6 @@ for var in ( for var in ( "MOZ_ALLOW_ADDON_SIDELOAD", "MOZ_BACKGROUNDTASKS", - "MOZ_SERVICES_SYNC", "MOZ_SYSTEM_NSS", "MOZ_SYSTEM_POLICIES", "MOZ_UNSIGNED_APP_SCOPE", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/cc0c58a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/cc0c58a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40795: Trim down tor-browser-build release prep issue templates
by Richard Pospesel (＠richard) 23 Feb '23

23 Feb '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: e9dc91e5 by Richard Pospesel at 2023-02-23T18:41:12+00:00 Bug 40795: Trim down tor-browser-build release prep issue templates - - - - - 2 changed files: - .gitlab/issue_templates/Release Prep - Alpha.md - .gitlab/issue_templates/Release Prep - Stable.md Changes: ===================================== .gitlab/issue_templates/Release Prep - Alpha.md ===================================== @@ -5,8 +5,6 @@ - `$(STAGING_SERVER)` : the server the signer is using to to run the signing process - `$(ESR_VERSION)` : the Mozilla defined ESR version, used in various places for building tor-browser tags, labels, etc - example : `91.6.0` -- `$(RR_VERSION)` : the Mozilla defined Rapid-Release version; Tor Browser for Android is based off of the `$(ESR_VERSION)`, but Mozilla's Firefox for Android is based off of the `$(RR_VERSION)` so we need to keep track of security vulnerabilities to backport from the monthly Rapid-Release train and our frozen ESR train. - - example: `103` - `$(ESR_TAG)` : the Mozilla defined hg (Mercurial) tag associated with `$(ESR_VERSION)` - exmaple : `FIREFOX_91_7_0esr_BUILD2` - `$(ESR_TAG_PREV)` : the Mozilla defined hg (Mercurial) tag associated with the previous ESR version when rebasing (ie, the ESR version we are rebasing from) @@ -23,91 +21,12 @@ - if we have build failures unrelated to `tor-browser`, the `$(TOR_BROWSER_BUILD_N)` value will increase while the `$(BUILD_N)` will stay the same. - `$(TOR_BROWSER_VERSION)` : the published Tor Browser version - example : `11.5a6`, `11.0.7` -- `$(TOR_BROWSER_BRANCH)` : the full name of tor-browser branch - - typically of the form: `tor-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1` -- `$(TOR_BROWSER_BRANCH_PREV)` : the full name of the previous tor-browser branch (when rebasing) </details> -<details> - <summary>Android</summary> - -### **Security Vulnerabilities Backport** : https://www.mozilla.org/en-US/security/advisories/ -- **NOTE** : this work usually first occurs during the Tor Browser Stable release, so for alpha we typically only need to update the various `tor-browser-build` configs to point to the right release tags. -- [ ] Create tor-browser issue `Backport Android-specific Firefox $(RR_VERSION) to ESR $(ESR_VERSION)-based Tor Browser` - - [ ] Link new backport issue to this release prep issue -- [ ] Go through any `Security Vulnerabilities fixed in Firefox $(RR_VERSION)` (or similar) and create list of CVEs which affect Android that need to be a backported - - Potentially Affected Components: - - `firefox`/`geckoview` - - `application-services` - - `android-components` - - `fenix` - -### **application-services** ***(Optional)*** : *TODO: we need to setup a gitlab copy of this repo that we can apply security backports to* -- [ ] Backport any Android-specific security fixes from Firefox rapid-release -- [ ] Sign/Tag commit: - - Tag : `application-services-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha` -- [ ] Push tag to `origin` - -### **android-components** ***(Optional)*** : https://gitlab.torproject.org/tpo/applications/android-components.git -- [ ] Backport any Android-specific security fixes from Firefox rapid-release -- [ ] Sign/Tag commit: - - Tag : `android-components-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha)` -- [ ] Push tag to `origin` - -### **fenix** ***(Optional)*** : https://gitlab.torproject.org/tpo/applications/fenix.git -- [ ] Backport any Android-specific security fixes from Firefox rapid-release -- [ ] Sign/Tag commit: - - Tag : `tor-browser-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha)` -- [ ] Push tag to `origin` - -</details> - -<details> - <summary>Shared</summary> - -### tor-browser: https://gitlab.torproject.org/tpo/applications/tor-browser.git -- [ ] ***(Optional)*** Backport any Android-specific security fixes from Firefox rapid-release -- [ ] ***(Optional, Chemspill)*** Backport security-fixes to both `tor-browser` and `base-browser` branches -- [ ] ***(Optional)*** Rebase to `$(ESR_VERSION)` - - [ ] Find the Firefox hg tag here : https://hg.mozilla.org/releases/mozilla-esr102/tags - - [ ] `$(ESR_TAG)` : `<INSERT_TAG_HERE>` - - [ ] Identify the hg patch associated with above hg tag, and find the equivalent `gecko-dev` git commit (search by commit message) - - [ ] `gecko-dev` commit : `<INSERT_COMMIT_HASH_HERE>` - - [ ] Sign/Tag `gecko-dev` commit : - - Tag : `$(ESR_TAG)` - - Message : `Hg tag $(ESR_TAG)` - - [ ] Create new `tor-browser` branch with the discovered `gecko-dev` commit as `HEAD` named: - - `tor-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1` - - [ ] Push new branches and esr tag to origin - - [ ] Rebase previous `tor-browser` patches onto the new `gecko-dev` branch - - [ ] Compare patch-sets (ensure nothing *weird* happened during rebase): - - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..$(TOR_BROWSER_BRANCH)` - - [ ] diff of diffs: - - Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred `$(DIFF_TOOL)` and look at differences on lines that starts with + or - - - [ ] `git diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) > current_patchset.diff` - - [ ] `git diff $(ESR_TAG)..$(TOR_BROWSER_BRANCH) > rebased_patchset.diff` - - [ ] `$(DIFF_TOOL) current_patchset.diff rebased_patchset.diff` - - [ ] Open MR for the rebase - - [ ] Merge -- [ ] Sign/Tag `tor-browser` commit : - - Tag : `tor-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(FIREFOX_BUILD_N)` - - Message : `Tagging $(FIREFOX_BUILD_N) for $(ESR_VERSION)esr-based alpha` -- [ ] Create `base-browser` branch from rebased `tor-browser` branch named: - - `base-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1` - - **NOTE** : Currently we are using the `Bug 40926: Implemented the New Identity feature` commit as the final commit of `base-browser` before `tor-browser` -- [ ] Sign/Tag `base-browser` commit : - - Tag : `base-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-build1` - - Message: `Tagging build1 for $(ESR_VERSION)esr-based alpha` -- [ ] Push tags to `origin` -- [ ] Update Gitlab Default Branch to new Alpha branch: https://gitlab.torproject.org/tpo/applications/tor-browser/-/settings/repos… - -</details> +**NOTE** It is assumed that the `tor-browser` rebase and security backport tasks have been completed <details> - <summary>Build</summary> + <summary>Build Updates</summary> ### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git Tor Browser Alpha (and Nightly) are on the `main` branch @@ -115,9 +34,9 @@ Tor Browser Alpha (and Nightly) are on the `main` branch - [ ] Update `rbm.conf` - [ ] `var/torbrowser_version` : update to next version - [ ] `var/torbrowser_build` : update to `$(TOR_BROWSER_BUILD_N)` - - [ ] ***(Optional, Desktop)*** `var/torbrowser_incremental_from` : update to previous Desktop version - - [ ] **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make incrementals-*` step will fail -- [ ] ***(Optional)*** Update Desktop-specific build configs + - [ ] ***(Desktop Only)***`var/torbrowser_incremental_from` : update to previous Desktop version + - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make incrementals-*` step will fail +- [ ] Update Desktop-specific build configs - [ ] Update `projects/firefox/config` - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased @@ -127,7 +46,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch - [ ] `steps/base-browser-fluent/git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch - [ ] `steps/tor-browser/git_hash` : update with `HEAD` commit of project's `tor-browser` branch - [ ] `steps/fenix/git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch -- [ ] ***(Optional)*** Update Android-specific build configs +- [ ] Update Android-specific build configs - [ ] ***(Optional)*** Update `projects/geckoview/config` - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag - [ ] ***(Optional)*** `var/geckoview_version` : update to latest `$(ESR_VERSION)` if rebased @@ -163,7 +82,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch - [ ] ***(Optional)*** Update `projects/go/config` - [ ] `version` : update go version - [ ] `input_files/sha256sum` for `go` : update sha256sum of archive (sha256 sums are displayed on the go download page) - - [ ] ***(Optional)*** Update the manual : https://gitlab.torproject.org/tpo/web/manual/-/jobs/ + - [ ] Update the manual : https://gitlab.torproject.org/tpo/web/manual/-/jobs/ - [ ] Download the `artifacts.zip` file from latest build stage row (download icon button on the right) - [ ] Rename it to `manual_$PIPELINEID.zip` - [ ] Upload it to people.tpo @@ -178,40 +97,62 @@ Tor Browser Alpha (and Nightly) are on the `main` branch - Make sure you have `requests` installed (e.g., `apt install python3-requests`) - The first time you run this script you will need to generate an access token; the script will guide you - [ ] Copy the output of the script to the beginning of `ChangeLog.txt` and adjust its output - - At the moment, the script does not create a _Build System_ section - If you used the issue number, you will need to write the Tor Browser version manually + - [ ] Include any version updates for: + - [ ] translations + - [ ] OpenSSL + - [ ] NoScript + - [ ] Go + - [ ] zlib + - [ ] Include any ESR rebase for Firefox and GeckoView - [ ] Open MR with above changes - [ ] Begin build on `$(BUILD_SERVER)` (fix any issues which come up and update MR) - [ ] Merge - [ ] Sign/Tag commit: `make signtag-alpha` - [ ] Push tag to `origin` + </details> <details> - <summary>Communications</summary> + <summary>Communications</summary> ### notify stakeholders + + <details> + <summary>email template</summary> + + Hello All, + + Unsigned Tor Browser $(TOR_BROWSER_VERSION) alpha candidate builds are now available for testing: + + - https://tb-build-05.torproject.org/~$(BUILDER)/builds/release/unsigned/$(TO… + + The full changelog can be found here: + + - https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/main… + + </details> + - [ ] Email tor-qa mailing list: tor-qa(a)lists.torproject.org - - [ ] Provide links to unsigned builds on `$(BUILD_SERVER)` - - [ ] Note any new functionality which needs testing - - [ ] Link to any known issues -- [ ] Email downstream consumers: + - Additional information: + - [ ] Note any new functionality which needs testing + - [ ] Link to any known issues +- [ ] ***(Optional, only around build/packaging changes)*** Email downstream consumers: - Recipients: - - [ ] Tails dev mailing list: tails-dev(a)boum.org - - [ ] Guardian Project: nathan(a)guardianproject.info - - [ ] torbrowser-launcher: micah(a)micahflee.com - - [ ] FreeBSD port: freebsd(a)sysctl.cz  - - [ ] OpenBSD port: caspar(a)schutijser.com  - - [ ] Provide links to unsigned builds on `$(BUILD_SERVER)` + - Tails dev mailing list: tails-dev(a)boum.org + - Guardian Project: nathan(a)guardianproject.info + - torbrowser-launcher: micah(a)micahflee.com + - FreeBSD port: freebsd(a)sysctl.cz  + - OpenBSD port: caspar(a)schutijser.com  - [ ] Note any changes which may affect packaging/downstream integration - [ ] Email upstream stakeholders: - - [ ] ***(Optional, after ESR migration)*** Cloudflare: ask-research(a)cloudflare.com + - ***(Optional, after ESR migration)*** Cloudflare: ask-research(a)cloudflare.com - **NOTE** : We need to provide them with updated user agent string so they can update their internal machinery to prevent Tor Browser users from getting so many CAPTCHAs </details> <details> - <summary>Signing/Publishing</summary> + <summary>Signing</summary> ### signing + publishing - [ ] Ensure builders have matching builds @@ -242,26 +183,32 @@ Tor Browser Alpha (and Nightly) are on the `main` branch - **NOTE**: at this point the signed binaries should have been copied to `staticiforme` - [ ] Update `staticiforme.torproject.org`: - From `screen` session on `staticiforme.torproject.org`: + - [ ] Static update components : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org` + - [ ] Enable update responses : `sudo -u tb-release ./deploy_update_responses-alpha.sh` - [ ] Remove old release data from following places: - **NOTE** : Skip this step if the current release is Android or Desktop *only* - [ ] `/srv/cdn-master.torproject.org/htdocs/aus1/torbrowser` - [ ] `/srv/dist-master.torproject.org/htdocs/torbrowser` - - [ ] Static update components : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org` - - [ ] Enable update responses : `sudo -u tb-release ./deploy_update_responses-alpha.sh` + - [ ] Static update components (again) : `static-update-component cdn.torproject.org && static-update-component - [ ] Publish APKs to Google Play: - Log into https://play.google.com/apps/publish - Select `Tor Browser (Alpha)` app - - Navigate to `Release > Production` and click `Create new release` button - - [ ] Upload the `*.multi.apk` APKs - - [ ] Update Release Name to Tor Browser version number - - [ ] Update Release Notes + - Navigate to `Release > Production` and click `Create new release` button: + - Upload the `*.multi.apk` APKs + - Update Release Name to Tor Browser version number + - Update Release Notes - Next to 'Release notes', click `Copy from a previous release` - - [ ] Edit blog post url to point to most recent blog post + - Edit blog post url to point to most recent blog post - Save, review, and configure rollout percentage - [ ] 25% rollout when publishing a scheduled update - [ ] 100% rollout when publishing a security-driven release - [ ] Update rollout percentage to 100% after confirmed no major issues +</details> + +<details> + <summary>Publishing</summary> + ### website: https://gitlab.torproject.org/tpo/web/tpo.git - [ ] `databags/versions.ini` : Update the downloads versions - `torbrowser-stable/version` : sort of a catch-all for latest stable version ===================================== .gitlab/issue_templates/Release Prep - Stable.md ===================================== @@ -4,16 +4,16 @@ - `$(BUILD_SERVER)` : the server the main builder is using to build a tor-browser release - `$(STAGING_SERVER)` : the server the signer is using to to run the signing process - `$(ESR_VERSION)` : the Mozilla defined ESR version, used in various places for building tor-browser tags, labels, etc - - example : `91.6.0` -- `$(RR_VERSION)` : the Mozilla defined Rapid-Release version; Tor Browser for Android is based off of the `$(ESR_VERSION)`, but Mozilla's Firefox for Android is based off of the `$(RR_VERSION)` so we need to keep track of security vulnerabilities to backport from the monthly Rapid-Release train and our frozen ESR train. - - example: `103` + - example : `91.6.0` - `$(ESR_TAG)` : the Mozilla defined hg (Mercurial) tag associated with `$(ESR_VERSION)` - - exmaple : `FIREFOX_91_7_0esr_BUILD2` + - exmaple : `FIREFOX_91_7_0esr_BUILD2` - `$(ESR_TAG_PREV)` : the Mozilla defined hg (Mercurial) tag associated with the previous ESR version when rebasing (ie, the ESR version we are rebasing from) - `$(TOR_BROWSER_MAJOR)` : the Tor Browser major version - - example : `11` + - example : `11` - `$(TOR_BROWSER_MINOR)` : the Tor Browser minor version - - example : either `0` or `5`; Alpha's is always `(Stable + 5) % 10` + - example : either `0` or `5`; Alpha's is always `(Stable + 5) % 10` +- `$(TOR_BROWSER_VERSION)` : the Tor Browser version in the format + - example: `12.5a3`, `12.0.3` - `$(BUILD_N)` : a project's build revision within a its branch; this is separate from the `$(TOR_BROWSER_BUILD_N)` value; many of the Firefox-related projects have a `$(BUILD_N)` suffix and may differ between projects even when they contribute to the same build. - example : `build1` - `$(TOR_BROWSER_BUILD_N)` : the tor-browser build revision for a given Tor Browser release; used in tagging git commits @@ -23,89 +23,12 @@ - if we have build failures unrelated to `tor-browser`, the `$(TOR_BROWSER_BUILD_N)` value will increase while the `$(BUILD_N)` will stay the same. - `$(TOR_BROWSER_VERSION)` : the published Tor Browser version - example : `11.5a6`, `11.0.7` -- `$(TOR_BROWSER_BRANCH)` : the full name of tor-browser branch - - typically of the form: `tor-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1` -- `$(TOR_BROWSER_BRANCH_PREV)` : the full name of the previous tor-browser branch (when rebasing) </details> -<details> - <summary>Android</summary> - -### **Security Vulnerabilities Backport** : https://www.mozilla.org/en-US/security/advisories/ -- [ ] Create tor-browser issue `Backport Android-specific Firefox $(RR_VERSION) to ESR $(ESR_VERSION)-based Tor Browser` - - [ ] Link new backport issue to this release prep issue -- [ ] Go through any `Security Vulnerabilities fixed in Firefox $(RR_VERSION)` (or similar) and create list of CVEs which affect Android that need to be a backported - - Potentially Affected Components: - - `firefox`/`geckoview` - - `application-services` - - `android-components` - - `fenix` - -### **application-services** ***(Optional)*** : *TODO: we need to setup a gitlab copy of this repo that we can apply security backports to* -- [ ] Backport any Android-specific security fixes from Firefox rapid-release -- [ ] Sign/Tag commit: - - Tag : `application-services-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based stable` -- [ ] Push tag to `origin` - -### **android-components** ***(Optional)*** : https://gitlab.torproject.org/tpo/applications/android-components.git -- [ ] Backport any Android-specific security fixes from Firefox rapid-release -- [ ] Sign/Tag commit: - - Tag : `android-components-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based stable)` -- [ ] Push tag to `origin` - -### **fenix** ***(Optional)*** : https://gitlab.torproject.org/tpo/applications/fenix.git -- [ ] Backport any Android-specific security fixes from Firefox rapid-release -- [ ] Sign/Tag commit: - - Tag : `tor-browser-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based stable)` -- [ ] Push tag to `origin` - -</details> - -<details> - <summary>Shared</summary> - -### tor-browser: https://gitlab.torproject.org/tpo/applications/tor-browser.git -- [ ] ***(Optional)*** Backport any Android-specific security fixes from Firefox rapid-release -- [ ] ***(Optional, Chemspill)*** Backport security-fixes to both `tor-browser` and `base-browser` branches -- [ ] ***(Optional)*** Rebase to `$(ESR_VERSION)` - - [ ] Find the Firefox hg tag here : https://hg.mozilla.org/releases/mozilla-esr102/tags - - [ ] `$(ESR_TAG)` : `<INSERT_TAG_HERE>` - - [ ] Identify the hg patch associated with above hg tag, and find the equivalent `gecko-dev` git commit (search by commit message) - - [ ] `gecko-dev` commit : `<INSERT_COMMIT_HASH_HERE>` - - [ ] Sign/Tag `gecko-dev` commit : - - Tag : `$(ESR_TAG)` - - Message : `Hg tag $(ESR_TAG)` - - [ ] Create new `tor-browser` branch with the discovered `gecko-dev` commit as `HEAD` named: - - `tor-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1` - - [ ] Push new branches and esr tag to origin - - [ ] Rebase previous `tor-browser` patches onto the new `gecko-dev` branch - - [ ] Compare patch-sets (ensure nothing *weird* happened during rebase): - - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..$(TOR_BROWSER_BRANCH)` - - [ ] diff of diffs: - - Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred `$(DIFF_TOOL)` and look at differences on lines that starts with + or - - - [ ] `git diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) > current_patchset.diff` - - [ ] `git diff $(ESR_TAG)..$(TOR_BROWSER_BRANCH) > rebased_patchset.diff` - - [ ] `$(DIFF_TOOL) current_patchset.diff rebased_patchset.diff` - - [ ] Open MR for the rebase - - [ ] Merge -- [ ] Sign/Tag `tor-browser` commit : - - Tag : `tor-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(FIREFOX_BUILD_N)` - - Message : `Tagging $(FIREFOX_BUILD_N) for $(ESR_VERSION)esr-based stable` -- [ ] Create `base-browser` branch from rebased `tor-browser` branch named: - - `base-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1` - - **NOTE** : Currently we are using the `Bug 40926: Implemented the New Identity feature` commit as the final commit of `base-browser` before `tor-browser` -- [ ] Sign/Tag `base-browser` commit: - - Tag : `base-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-build1` - - Message: `Tagging build1 for $(ESR_VERSION)esr-based stable` -- [ ] Push tags to `origin` - -</details> +**NOTE** It is assumed that the `tor-browser` rebase and security backport tasks have been completed <details> - <summary>Build</summary> + <summary>Build Configs</summary> ### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)` (and possibly more specific) branches @@ -113,9 +36,9 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE - [ ] Update `rbm.conf` - [ ] `var/torbrowser_version` : update to next version - [ ] `var/torbrowser_build` : update to `$(TOR_BROWSER_BUILD_N)` - - [ ] ***(Optional, Desktop)*** `var/torbrowser_incremental_from` : update to previous Desktop version - - [ ] **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make incrementals-*` step will fail -- [ ] ***(Optional)*** Update Desktop-specific build configs + - [ ] ***(Desktop Only)***`var/torbrowser_incremental_from` : update to previous Desktop version + - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make incrementals-*` step will fail +- [ ] Update Desktop-specific build configs - [ ] Update `projects/firefox/config` - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased @@ -125,7 +48,7 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE - [ ] `steps/base-browser-fluent/git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch - [ ] `steps/tor-browser/git_hash` : update with `HEAD` commit of project's `tor-browser` branch - [ ] `steps/fenix/git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch -- [ ] ***(Optional)*** Update Android-specific build configs +- [ ] Update Android-specific build configs - [ ] ***(Optional)*** Update `projects/geckoview/config` - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag - [ ] ***(Optional)*** `var/geckoview_version` : update to latest `$(ESR_VERSION)` if rebased @@ -161,7 +84,7 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE - [ ] ***(Optional)*** Update `projects/go/config` - [ ] `version` : update go version - [ ] `input_files/sha256sum` for `go` : update sha256sum of archive (sha256 sums are displayed on the go download page) - - [ ] ***(Optional)*** Update the manual : https://gitlab.torproject.org/tpo/web/manual/-/jobs/ + - [ ] Update the manual : https://gitlab.torproject.org/tpo/web/manual/-/jobs/ - [ ] Download the `artifacts.zip` file from latest build stage row (download icon button on the right) - [ ] Rename it to `manual_$PIPELINEID.zip` - [ ] Upload it to people.tpo @@ -176,40 +99,62 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE - Make sure you have `requests` installed (e.g., `apt install python3-requests`) - The first time you run this script you will need to generate an access token; the script will guide you - [ ] Copy the output of the script to the beginning of `ChangeLog.txt` and adjust its output - - At the moment, the script does not create a _Build System_ section - If you used the issue number, you will need to write the Tor Browser version manually + - [ ] Include any version updates for: + - [ ] translations + - [ ] OpenSSL + - [ ] NoScript + - [ ] Go + - [ ] zlib + - [ ] Include any ESR rebase for Firefox and GeckoView - [ ] Open MR with above changes - [ ] Begin build on `$(BUILD_SERVER)` (and fix any issues which come up and update MR) - [ ] Merge - [ ] Sign/Tag commit: `make signtag-release` - [ ] Push tag to `origin` + </details> <details> - <summary>Communications</summary> + <summary>Communications</summary> ### notify stakeholders + + <details> + <summary>email template</summary> + + Hello All, + + Unsigned Tor Browser $(TOR_BROWSER_VERSION) release candidate builds are now available for testing: + + - https://tb-build-05.torproject.org/~$(BUILDER)/builds/release/unsigned/$(TO… + + The full changelog can be found here: + + - https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/main… + + </details> + - [ ] Email tor-qa mailing list: tor-qa(a)lists.torproject.org - - [ ] Provide links to unsigned builds on `$(BUILD_SERVER)` - - [ ] Note any new functionality which needs testing - - [ ] Link to any known issues + - Additional information: + - [ ] Note any new functionality which needs testing + - [ ] Link to any known issues - [ ] Email downstream consumers: - Recipients: - - [ ] Tails dev mailing list: tails-dev(a)boum.org - - [ ] Guardian Project: nathan(a)guardianproject.info - - [ ] torbrowser-launcher: micah(a)micahflee.com - - [ ] FreeBSD port: freebsd(a)sysctl.cz  - - [ ] OpenBSD port: caspar(a)schutijser.com  - - [ ] Provide links to unsigned builds on `$(BUILD_SERVER)` + - Tails dev mailing list: tails-dev(a)boum.org + - Guardian Project: nathan(a)guardianproject.info + - torbrowser-launcher: micah(a)micahflee.com + - FreeBSD port: freebsd(a)sysctl.cz  + - OpenBSD port: caspar(a)schutijser.com  - [ ] Note any changes which may affect packaging/downstream integration - [ ] Email upstream stakeholders: - - [ ] ***(Optional, after ESR migration)*** Cloudflare: ask-research(a)cloudflare.com + - ***(Optional, after ESR migration)*** Cloudflare: ask-research(a)cloudflare.com - **NOTE** : We need to provide them with updated user agent string so they can update their internal machinery to prevent Tor Browser users from getting so many CAPTCHAs </details> <details> - <summary>Signing/Publishing</summary> + <summary>Signing</summary> ### signing + publishing - [ ] Ensure builders have matching builds @@ -240,26 +185,32 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE - **NOTE**: at this point the signed binaries should have been copied to `staticiforme` - [ ] Update `staticiforme.torproject.org`: - From `screen` session on `staticiforme.torproject.org`: + - [ ] Static update components : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org` + - [ ] Enable update responses : `sudo -u tb-release ./deploy_update_responses-release.sh` - [ ] Remove old release data from following places: - **NOTE** : Skip this step if the current release is Android or Desktop *only* - [ ] `/srv/cdn-master.torproject.org/htdocs/aus1/torbrowser` - [ ] `/srv/dist-master.torproject.org/htdocs/torbrowser` - - [ ] Static update components : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org` - - [ ] Enable update responses : `sudo -u tb-release ./deploy_update_responses-release.sh` +- [ ] Static update components (again) : `static-update-component cdn.torproject.org && static-update-component - [ ] Publish APKs to Google Play: - Log into https://play.google.com/apps/publish - Select `Tor Browser` app - - Navigate to `Release > Production` and click `Create new release` button - - [ ] Upload the `*.multi.apk` APKs - - [ ] Update Release Name to Tor Browser version number - - [ ] Update Release Notes + - Navigate to `Release > Production` and click `Create new release` button: + - Upload the `*.multi.apk` APKs + - Update Release Name to Tor Browser version number + - Update Release Notes - Next to 'Release notes', click `Copy from a previous release` - - [ ] Edit blog post url to point to most recent blog post + - Edit blog post url to point to most recent blog post - Save, review, and configure rollout percentage - [ ] 25% rollout when publishing a scheduled update - [ ] 100% rollout when publishing a security-driven release - [ ] Update rollout percentage to 100% after confirmed no major issues +</details> + +<details> + <summary>Publishing</summary> + ### website: https://gitlab.torproject.org/tpo/web/tpo.git - [ ] `databags/versions.ini` : Update the downloads versions - `torbrowser-stable/version` : sort of a catch-all for latest stable version @@ -296,4 +247,3 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE </details> /label ~"Release Prep" - View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… You're receiving this email because of your account on gitlab.torproject.org.

1 0