September 2023 - tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] squash! Bug 2176: Rebrand Firefox to TorBrowser
by Pier Angelo Vendrame (＠pierov) 18 Sep '23

18 Sep '23

Pier Angelo Vendrame pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: dec788d1 by Henry Wilkes at 2023-09-18T15:48:48+01:00 squash! Bug 2176: Rebrand Firefox to TorBrowser Bug 42088: New application icons (used in-app and on linux). - - - - - 30 changed files: - browser/branding/tb-alpha/content/tor-browser-logo.svg - browser/branding/tb-alpha/default128.png - browser/branding/tb-alpha/default16.png - browser/branding/tb-alpha/default22.png - browser/branding/tb-alpha/default24.png - browser/branding/tb-alpha/default256.png - browser/branding/tb-alpha/default32.png - browser/branding/tb-alpha/default48.png - browser/branding/tb-alpha/default64.png - − browser/branding/tb-alpha/firefox.svg - browser/branding/tb-nightly/content/tor-browser-logo.svg - browser/branding/tb-nightly/default128.png - browser/branding/tb-nightly/default16.png - browser/branding/tb-nightly/default22.png - browser/branding/tb-nightly/default24.png - browser/branding/tb-nightly/default256.png - browser/branding/tb-nightly/default32.png - browser/branding/tb-nightly/default48.png - browser/branding/tb-nightly/default64.png - − browser/branding/tb-nightly/firefox.svg - browser/branding/tb-release/content/tor-browser-logo.svg - browser/branding/tb-release/default128.png - browser/branding/tb-release/default16.png - browser/branding/tb-release/default22.png - browser/branding/tb-release/default24.png - browser/branding/tb-release/default256.png - browser/branding/tb-release/default32.png - browser/branding/tb-release/default48.png - browser/branding/tb-release/default64.png - − browser/branding/tb-release/firefox.svg The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/dec788d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/dec788d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Update rbm for rbm#40061
by boklm (＠boklm) 18 Sep '23

18 Sep '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 0e729d3f by Nicolas Vigier at 2023-09-18T16:50:16+02:00 Update rbm for rbm#40061 - - - - - 1 changed file: - rbm Changes: ===================================== rbm ===================================== @@ -1 +1 @@ -Subproject commit c4c1716dcbffa58c102daa8a5f3e188acdaf823a +Subproject commit fb51b232ea9281032762df30211400139ff80275 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/rbm][main] Bug 40061: Log copy of input_files when the RBM_VERBOSE_LOG environment variable is set
by boklm (＠boklm) 18 Sep '23

18 Sep '23

boklm pushed to branch main at The Tor Project / Applications / RBM Commits: fb51b232 by Nicolas Vigier at 2023-09-18T08:30:49+02:00 Bug 40061: Log copy of input_files when the RBM_VERBOSE_LOG environment variable is set - - - - - 1 changed file: - lib/RBM.pm Changes: ===================================== lib/RBM.pm ===================================== @@ -1229,6 +1229,10 @@ sub build_run { exec_name => 'put', exec_as_root => 0, }); + if ($ENV{RBM_VERBOSE_LOG}) { + my $now = localtime; + path($build_log)->append_utf8("[$now] Copying file $file\n"); + } if (run_script($project, $cmd, sub { system(@_) }) != 0) { $error = "Error uploading $file"; goto EXIT; View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/fb51b232ea92810… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/fb51b232ea92810… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by Pier Angelo Vendrame (＠pierov) 18 Sep '23

18 Sep '23

Pier Angelo Vendrame pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 5d6218da by Pier Angelo Vendrame at 2023-09-18T11:16:31+02:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Bug 42083: RemoteSecuritySettings.init throws error in console - - - - - 1 changed file: - security/manager/ssl/RemoteSecuritySettings.sys.mjs Changes: ===================================== security/manager/ssl/RemoteSecuritySettings.sys.mjs ===================================== @@ -529,6 +529,10 @@ class CRLiteFilters { } async cleanAttachmentCache() { + if (!this.client) { + return; + } + // Bug 1795710 - misuse of Remote Settings `downloadToDisk` caused us to // keep filters and stashes on disk indefinitely. We're no longer caching // these downloads, so if there are any filters still in the cache they can View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5d6218d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5d6218d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] Bug 42074: 2023 year end campaign for tor browser HomeFragment
by Pier Angelo Vendrame (＠pierov) 18 Sep '23

18 Sep '23

Pier Angelo Vendrame pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android Commits: 2ebfc4b7 by clairehurst at 2023-09-18T08:49:21+00:00 Bug 42074: 2023 year end campaign for tor browser HomeFragment - - - - - 1 changed file: - fenix/app/src/main/res/values/torbrowser_strings.xml Changes: ===================================== fenix/app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -75,4 +75,30 @@  <string name="preferences_tor_prioritize_onions">Prioritize .onion sites</string> + +  + +  + <string name="yec_2023_introduction">Right now, Tor Browser for Android is protecting your privacy!</string> +  +  + <string name="yec_2023_please_donate_beginning">This is possible because of donations from our community.</string> +  +  +  + <string name="yec_2023_please_donate_full">%s If you value the privacy that Tor Browser for Android offers yourself and others, please make a donation today.</string> +  +  +  +  +  +  + <string name="yec_2023_matched_donation">From now until December 31, donations to the Tor Project will be matched one-to-one, up to $%s!</string> +  + <string name="yec_2023_close_button">Close</string> +  + <string name="yec_2023_donate_button">Donate now</string> +  + <string name="yec_2023_free_to_use">Tor Browser for Android will always be free to use—no donation is required to use this app.</string> + </resources> View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/2eb… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/2eb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] fixup! Bug 7494: Create local home page for TBB.
by richard (＠richard) 15 Sep '23

15 Sep '23

richard pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 5813d89a by Henry Wilkes at 2023-09-15T20:18:20+00:00 fixup! Bug 7494: Create local home page for TBB. Bug 42073: Add onion pattern to about:tor background. - - - - - 3 changed files: - browser/components/abouttor/content/aboutTor.css - + browser/components/abouttor/content/onion-pattern.svg - browser/components/abouttor/jar.mn Changes: ===================================== browser/components/abouttor/content/aboutTor.css ===================================== @@ -20,6 +20,11 @@ body { / 1fr minmax(max-content, 600px) 1fr; justify-items: center; padding-inline: 20px; + background: + local + url("chrome://browser/content/abouttor/onion-pattern.svg") + center bottom + repeat-x; } h1 { ===================================== browser/components/abouttor/content/onion-pattern.svg ===================================== @@ -0,0 +1,27 @@ +<svg fill="none" height="150" viewBox="0 0 1200 150" width="1200" xmlns="http://www.w3.org/2000/svg"> + <path clip-rule="evenodd" d="m75 145c38.66 0 70-31.34 70-70 0-38.6599-31.34-70-70-70-38.6599 0-70 31.3401-70 70 0 38.66 31.3401 70 70 70zm0 5c41.421 0 75-33.579 75-75 0-41.4214-33.579-75-75-75-41.4214 0-75 33.5786-75 75 0 41.421 33.5786 75 75 75z" fill="#3e0663" fill-rule="evenodd"/> + <path clip-rule="evenodd" d="m75 126.25c28.305 0 51.25-22.945 51.25-51.25 0-28.3046-22.945-51.25-51.25-51.25-28.3046 0-51.25 22.9454-51.25 51.25 0 28.305 22.9454 51.25 51.25 51.25zm0 5c31.066 0 56.25-25.184 56.25-56.25s-25.184-56.25-56.25-56.25-56.25 25.184-56.25 56.25 25.184 56.25 56.25 56.25z" fill="#3e0663" fill-rule="evenodd"/> + <path clip-rule="evenodd" d="m75 107.5c17.9493 0 32.5-14.5507 32.5-32.5s-14.5507-32.5-32.5-32.5-32.5 14.5507-32.5 32.5 14.5507 32.5 32.5 32.5zm0 5c20.7107 0 37.5-16.7893 37.5-37.5s-16.7893-37.5-37.5-37.5-37.5 16.7893-37.5 37.5 16.7893 37.5 37.5 37.5z" fill="#3e0663" fill-rule="evenodd"/> + + <path clip-rule="evenodd" d="m75 88.75c7.5939 0 13.75-6.1561 13.75-13.75s-6.1561-13.75-13.75-13.75-13.75 6.1561-13.75 13.75 6.1561 13.75 13.75 13.75zm0 5c10.3553 0 18.75-8.3947 18.75-18.75s-8.3947-18.75-18.75-18.75-18.75 8.3947-18.75 18.75 8.3947 18.75 18.75 18.75z" fill="#3e0663" fill-rule="evenodd"/> + <path d="m294.846 0c2.762 0 5.017 2.24554 4.836 5.001-2.573 39.0897-35.095 69.999-74.836 69.999s-72.262-30.9093-74.836-69.999c-.181-2.75546 2.075-5.001 4.836-5.001z" fill="#3e0663"/> + <path d="m294.846 75c2.762 0 5.017 2.2455 4.836 5.001-2.573 39.09-35.095 69.999-74.836 69.999s-72.262-30.909-74.836-69.999c-.181-2.7555 2.075-5.001 4.836-5.001z" fill="#350556"/> + <path clip-rule="evenodd" d="m374.692 145c38.66 0 70-31.34 70-70 0-38.6599-31.34-70-70-70s-70 31.3401-70 70c0 38.66 31.34 70 70 70zm0 5c41.422 0 75-33.579 75-75 0-41.4214-33.578-75-75-75-41.421 0-75 33.5786-75 75 0 41.421 33.579 75 75 75z" fill="#3e0663" fill-rule="evenodd"/> + <path clip-rule="evenodd" d="m374.692 126.25c28.305 0 51.25-22.945 51.25-51.25 0-28.3046-22.945-51.25-51.25-51.25-28.304 0-51.25 22.9454-51.25 51.25 0 28.305 22.946 51.25 51.25 51.25zm0 5c31.066 0 56.25-25.184 56.25-56.25s-25.184-56.25-56.25-56.25-56.25 25.184-56.25 56.25 25.184 56.25 56.25 56.25z" fill="#3e0663" fill-rule="evenodd"/> + <path clip-rule="evenodd" d="m374.692 107.5c17.95 0 32.5-14.5507 32.5-32.5s-14.55-32.5-32.5-32.5c-17.949 0-32.5 14.5507-32.5 32.5s14.551 32.5 32.5 32.5zm0 5c20.711 0 37.5-16.7893 37.5-37.5s-16.789-37.5-37.5-37.5c-20.71 0-37.5 16.7893-37.5 37.5s16.79 37.5 37.5 37.5z" fill="#3e0663" fill-rule="evenodd"/> + <path clip-rule="evenodd" d="m374.692 88.75c7.594 0 13.75-6.1561 13.75-13.75s-6.156-13.75-13.75-13.75-13.75 6.1561-13.75 13.75 6.156 13.75 13.75 13.75zm0 5c10.356 0 18.75-8.3947 18.75-18.75s-8.394-18.75-18.75-18.75c-10.355 0-18.75 8.3947-18.75 18.75s8.395 18.75 18.75 18.75z" fill="#3e0663" fill-rule="evenodd"/> + <path d="m449.692 4.99998c0-2.76142 2.246-5.0173044 5.001-4.835902 39.09 2.573422 69.999 35.095022 69.999 74.835922 0 39.741-30.909 72.262-69.999 74.836-2.755.181-5.001-2.075-5.001-4.836z" fill="#3e0663"/> + <path d="m524.692 4.99998c0-2.76142 2.246-5.0173044 5.001-4.835902 39.09 2.573422 69.999 35.095022 69.999 74.835922 0 39.741-30.909 72.262-69.999 74.836-2.755.181-5.001-2.075-5.001-4.836z" fill="#350556"/> + <path clip-rule="evenodd" d="m674.692 145c38.66 0 70-31.34 70-70 0-38.6599-31.34-70-70-70s-70 31.3401-70 70c0 38.66 31.34 70 70 70zm0 5c41.422 0 75-33.579 75-75 0-41.4214-33.578-75-75-75-41.421 0-75 33.5786-75 75 0 41.421 33.579 75 75 75z" fill="#3e0663" fill-rule="evenodd"/> + <path clip-rule="evenodd" d="m674.692 126.25c28.305 0 51.25-22.945 51.25-51.25 0-28.3046-22.945-51.25-51.25-51.25-28.304 0-51.25 22.9454-51.25 51.25 0 28.305 22.946 51.25 51.25 51.25zm0 5c31.066 0 56.25-25.184 56.25-56.25s-25.184-56.25-56.25-56.25-56.25 25.184-56.25 56.25 25.184 56.25 56.25 56.25z" fill="#3e0663" fill-rule="evenodd"/> + <path clip-rule="evenodd" d="m674.692 107.5c17.95 0 32.5-14.5507 32.5-32.5s-14.55-32.5-32.5-32.5c-17.949 0-32.5 14.5507-32.5 32.5s14.551 32.5 32.5 32.5zm0 5c20.711 0 37.5-16.7893 37.5-37.5s-16.789-37.5-37.5-37.5c-20.71 0-37.5 16.7893-37.5 37.5s16.79 37.5 37.5 37.5z" fill="#3e0663" fill-rule="evenodd"/> + <path clip-rule="evenodd" d="m674.692 88.75c7.594 0 13.75-6.1561 13.75-13.75s-6.156-13.75-13.75-13.75-13.75 6.1561-13.75 13.75 6.156 13.75 13.75 13.75zm0 5c10.356 0 18.75-8.3947 18.75-18.75s-8.394-18.75-18.75-18.75c-10.355 0-18.75 8.3947-18.75 18.75s8.395 18.75 18.75 18.75z" fill="#3e0663" fill-rule="evenodd"/> + <path d="m894.538 0c2.762 0 5.018 2.24554 4.836 5.001-2.573 39.0897-35.095 69.999-74.836 69.999-39.74 0-72.262-30.9093-74.836-69.999-.181-2.75546 2.075-5.001 4.836-5.001z" fill="#3e0663"/> + <path d="m894.538 75c2.762 0 5.018 2.2455 4.836 5.001-2.573 39.09-35.095 69.999-74.836 69.999-39.74 0-72.262-30.909-74.836-69.999-.181-2.7555 2.075-5.001 4.836-5.001z" fill="#350556"/> + <path clip-rule="evenodd" d="m974.385 145c38.655 0 69.995-31.34 69.995-70 0-38.6599-31.34-70-69.995-70-38.66 0-70 31.3401-70 70 0 38.66 31.34 70 70 70zm0 5c41.425 0 74.995-33.579 74.995-75 0-41.4214-33.57-75-74.995-75-41.422 0-75 33.5786-75 75 0 41.421 33.578 75 75 75z" fill="#3e0663" fill-rule="evenodd"/> + <path clip-rule="evenodd" d="m974.385 126.25c28.305 0 51.245-22.945 51.245-51.25 0-28.3046-22.94-51.25-51.245-51.25s-51.25 22.9454-51.25 51.25c0 28.305 22.945 51.25 51.25 51.25zm0 5c31.065 0 56.245-25.184 56.245-56.25s-25.18-56.25-56.245-56.25c-31.066 0-56.25 25.184-56.25 56.25s25.184 56.25 56.25 56.25z" fill="#3e0663" fill-rule="evenodd"/> + <path clip-rule="evenodd" d="m974.385 107.5c17.949 0 32.495-14.5507 32.495-32.5s-14.546-32.5-32.495-32.5c-17.95 0-32.5 14.5507-32.5 32.5s14.55 32.5 32.5 32.5zm0 5c20.71 0 37.495-16.7893 37.495-37.5s-16.785-37.5-37.495-37.5c-20.711 0-37.5 16.7893-37.5 37.5s16.789 37.5 37.5 37.5z" fill="#3e0663" fill-rule="evenodd"/> + <path clip-rule="evenodd" d="m974.385 88.75c7.593 0 13.75-6.1561 13.75-13.75s-6.157-13.75-13.75-13.75c-7.594 0-13.75 6.1561-13.75 13.75s6.156 13.75 13.75 13.75zm0 5c10.355 0 18.75-8.3947 18.75-18.75s-8.395-18.75-18.75-18.75c-10.356 0-18.75 8.3947-18.75 18.75s8.394 18.75 18.75 18.75z" fill="#3e0663" fill-rule="evenodd"/> + <path d="m1199.38 145c0 2.761-2.24 5.017-5 4.836-39.09-2.573-70-35.095-70-74.836 0-39.7409 30.91-72.26248 70-74.835903 2.76-.1814017 5 2.074493 5 4.835913z" fill="#3e0663"/> + <path d="m1124.38 145c0 2.761-2.24 5.017-5 4.836-39.09-2.573-70-35.095-70-74.836 0-39.7409 30.91-72.26248 70-74.835903 2.76-.1814017 5 2.074493 5 4.835913z" fill="#350556"/> +</svg> ===================================== browser/components/abouttor/jar.mn ===================================== @@ -7,3 +7,4 @@ browser.jar: content/browser/abouttor/26a1-high-voltage.svg (content/26a1-high-voltage.svg) content/browser/abouttor/2728-sparkles.svg (content/2728-sparkles.svg) content/browser/abouttor/2764-red-heart.svg (content/2764-red-heart.svg) + content/browser/abouttor/onion-pattern.svg (content/onion-pattern.svg) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5813d89… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5813d89… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] fixup! Bug 30237: Add v3 onion services client authentication prompt
by richard (＠richard) 15 Sep '23

15 Sep '23

richard pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 0ce95033 by Henry Wilkes at 2023-09-15T20:11:51+00:00 fixup! Bug 30237: Add v3 onion services client authentication prompt Bug 42092: Fix layout styling of saved onion keys dialog. - - - - - 3 changed files: - browser/components/onionservices/content/authPreferences.css - browser/components/onionservices/content/savedKeysDialog.js - browser/components/onionservices/content/savedKeysDialog.xhtml Changes: ===================================== browser/components/onionservices/content/authPreferences.css ===================================== @@ -3,7 +3,11 @@ @import url("chrome://browser/skin/browser-colors.css"); #torOnionServiceKeys-overview-container { - margin-right: 30px; + margin-inline-end: 30px; +} + +#onionservices-savedkeys-dialog { + min-width: 45em; } #onionservices-savedkeys-tree treechildren::-moz-tree-cell-text { @@ -11,14 +15,17 @@ } #onionservices-savedkeys-errorContainer { - margin-top: 4px; + margin-block-start: 4px; min-height: 3em; } +#onionservices-savedkeys-errorContainer:not(.show-error) { + visibility: hidden; +} + #onionservices-savedkeys-errorIcon { - margin-right: 4px; + margin-inline-end: 4px; list-style-image: url("chrome://global/skin/icons/warning.svg"); -moz-context-properties: fill; fill: var(--warning-color); - visibility: hidden; } ===================================== browser/components/onionservices/content/savedKeysDialog.js ===================================== @@ -189,10 +189,10 @@ var gOnionServicesSavedKeysDialog = { }, _showError(aMessage) { - const dialog = document.querySelector(this.selector.dialog); - const errorIcon = dialog.querySelector(this.selector.errorIcon); - errorIcon.style.visibility = aMessage ? "visible" : "hidden"; - const errorDesc = dialog.querySelector(this.selector.errorMessage); + document + .getElementById("onionservices-savedkeys-errorContainer") + .classList.toggle("show-error", !!aMessage); + const errorDesc = document.querySelector(this.selector.errorMessage); errorDesc.textContent = aMessage ? aMessage : ""; }, ===================================== browser/components/onionservices/content/savedKeysDialog.xhtml ===================================== @@ -9,7 +9,6 @@ id="onionservices-savedkeys-dialog" windowtype="OnionServices:SavedKeys" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - style="width: 45em" > <script src="chrome://browser/content/onionservices/savedKeysDialog.js" /> @@ -23,8 +22,6 @@ id="onionservices-savedkeys-tree" flex="1" hidecolumnpicker="true" - width="750" - style="height: 20em" onselect="gOnionServicesSavedKeysDialog.updateButtonsState();" > <treecols> @@ -38,7 +35,7 @@ </treecols> <treechildren /> </tree> - <hbox id="onionservices-savedkeys-errorContainer" align="baseline" flex="1"> + <hbox id="onionservices-savedkeys-errorContainer" align="center"> <image id="onionservices-savedkeys-errorIcon" /> <description id="onionservices-savedkeys-errorMessage" flex="1" /> </hbox> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0ce9503… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0ce9503… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by richard (＠richard) 15 Sep '23

15 Sep '23

richard pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 3d4edb72 by Henry Wilkes at 2023-09-15T18:51:48+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 42079: Support moving out of the TorConnectState.Bootsrapped state for gTorConnectTitlebarStatus and gTorConnectUrlbarButton. - - - - - 2 changed files: - browser/components/torconnect/content/torConnectTitlebarStatus.js - browser/components/torconnect/content/torConnectUrlbarButton.js Changes: ===================================== browser/components/torconnect/content/torConnectTitlebarStatus.js ===================================== @@ -72,7 +72,6 @@ var gTorConnectTitlebarStatus = { this.node.hidden = true; return; case TorConnectState.Bootstrapped: - this._startHiding(); textId = "titlebarStatusConnected"; connected = true; break; @@ -114,6 +113,14 @@ var gTorConnectTitlebarStatus = { ); this.node.classList.toggle("tor-connect-status-connected", connected); this.connected = connected; + if (connected) { + this._startHiding(); + } else { + // We can leave the connected state when we are no longer Bootstrapped + // because the underlying tor process exited early and needs a + // restart. In this case we want to re-show the status. + this._stopHiding(); + } } this.node.classList.toggle( "tor-connect-status-potentially-blocked", @@ -125,8 +132,23 @@ var gTorConnectTitlebarStatus = { * Mark the component to be hidden after some delay. */ _startHiding() { - setTimeout(() => { + if (this._hidingTimeout) { + // Already hiding. + return; + } + this._hidingTimeout = setTimeout(() => { this.node.hidden = true; }, 5000); }, + + /** + * Re-show the component immediately. + */ + _stopHiding() { + if (this._hidingTimeout) { + clearTimeout(this._hidingTimeout); + this._hidingTimeout = 0; + } + this.node.hidden = false; + }, }; ===================================== browser/components/torconnect/content/torConnectUrlbarButton.js ===================================== @@ -112,10 +112,10 @@ var gTorConnectUrlbarButton = { * Callback for when the TorConnect state changes. */ _torConnectStateChanged() { - if ( - TorConnect.state === TorConnectState.Bootstrapped || - TorConnect.state === TorConnectState.Disabled - ) { + if (TorConnect.state === TorConnectState.Disabled) { + // NOTE: We do not uninit early when we reach the + // TorConnectState.Bootstrapped state because we can still leave the + // Bootstrapped state if the tor process exists early and needs a restart. this.uninit(); return; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3d4edb7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3d4edb7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] fixup! Bug 40933: Add tor-launcher functionality
by richard (＠richard) 15 Sep '23

15 Sep '23

richard pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: a4ff8505 by Pier Angelo Vendrame at 2023-09-15T18:31:31+00:00 fixup! Bug 40933: Add tor-launcher functionality Bug 42102: Fix checkPort in TorProcess - - - - - 2 changed files: - toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs - toolkit/components/tor-launcher/TorProcess.sys.mjs Changes: ===================================== toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs ===================================== @@ -8,7 +8,7 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { - FileUtils: "resource://gre/modules/FileUtils.sys.jsm", + FileUtils: "resource://gre/modules/FileUtils.sys.mjs", }); const kPropBundleURI = "chrome://torbutton/locale/torlauncher.properties"; @@ -565,7 +565,7 @@ export const TorLauncherUtil = Object.freeze({ } if (useIPC === undefined) { - socksPortInfo.useIPC = + useIPC = !this.isWindows && Services.prefs.getBoolPref( "extensions.torlauncher.socks_port_use_ipc", @@ -574,7 +574,7 @@ export const TorLauncherUtil = Object.freeze({ } // Fill in missing SOCKS info from prefs. - if (socksPortInfo.useIPC) { + if (useIPC) { if (!socksPortInfo.ipcFile) { socksPortInfo.ipcFile = TorLauncherUtil.getTorFile("socks_ipc", false); } @@ -611,7 +611,7 @@ export const TorLauncherUtil = Object.freeze({ return; } - if (socksPortInfo.useIPC) { + if (socksPortInfo.ipcFile) { const fph = Services.io .getProtocolHandler("file") .QueryInterface(Ci.nsIFileProtocolHandler); ===================================== toolkit/components/tor-launcher/TorProcess.sys.mjs ===================================== @@ -49,9 +49,7 @@ export class TorProcess { const checkPort = port => port === undefined || - (Number.isInteger(controlSettings.port) && - controlSettings.port > 0 && - controlSettings.port < 65535); + (Number.isInteger(port) && port > 0 && port < 65535); if (!checkPort(controlSettings?.port)) { throw new Error("Invalid control port"); } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a4ff850… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a4ff850… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] 2 commits: fixup! Bug 41649: Create rebase and security backport gitlab issue templates
by richard (＠richard) 15 Sep '23

15 Sep '23

richard pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 0a8b54dc by Pier Angelo Vendrame at 2023-09-15T17:39:33+00:00 fixup! Bug 41649: Create rebase and security backport gitlab issue templates Add a step to make the default branch and add how to find a tag when it does not exist yet. - - - - - bbfe9bf0 by Pier Angelo Vendrame at 2023-09-15T17:39:33+00:00 fixup! Adding issue and merge request templates Do not assign to new issue to nah anymore - - - - - 2 changed files: - .gitlab/issue_templates/Rebase Browser - Alpha.md - − .gitlab/issue_templates/UXBug.md Changes: ===================================== .gitlab/issue_templates/Rebase Browser - Alpha.md ===================================== @@ -39,10 +39,21 @@ - **Allowed to merge**: `Maintainers` - **Allowed to push and merge**: `Maintainers` - **Allowed to force push**: `false` + - If you copied and pasted from old rules, double check you didn't add spaces at the end, as GitLab will not trim them! ### **Create New Branches** -- [ ] Create new alpha `base-browser` branch from Firefox mercurial tag (found during the stable rebase) +- [ ] Find the Firefox mercurial tag `$(ESR_TAG)` + - If `$(BROWSER_MINOR)` is 5, the tag should already exist from the stable release + - Otherwise: + - [ ] Go to `https://hg.mozilla.org/releases/mozilla-esr$(ESR_MAJOR)/tags` + - [ ] Find and inspect the commit tagged with `$(ESR_TAG)` + - Tags are in yellow in the Mercurial web UI + - [ ] Find the equivalent commit in `https://github.com/mozilla/gecko-dev/commits/esr$(ESR_MAJOR)` + - The tag should be very close to `HEAD` (usually the second, before a `No bug - Tagging $(HG_HASH) with $(ESR_TAG)`) + - **Notice**: GitHub sorts commits by time, you might want to use `git log gecko-dev/esr$(ESR_MAJOR)` locally, instead + - [ ] Sign/Tag the `gecko-dev` commit: `git tag -as $(ESR_TAG) $(GIT_HASH) -m "Hg tag $(ESR_TAG)"` +- [ ] Create new alpha `base-browser` branch from Firefox mercurial tag - Branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` - **Example**: `base-browser-102.8.0esr-12.5-1` - [ ] Create new alpha `tor-browser` branch from Firefox mercurial tag @@ -111,6 +122,11 @@ - Update and push `base-browser` branch - [ ] Reset the new `base-browser` branch to the appropriate commit in this new `tor-browser` branch - [ ] Push these commits to `upstream` +- [ ] Set `$(TOR_BROWSER_BRANCH)` as the default GitLab branch + - [ ] Go to [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/sett… + - [ ] Expand `Branch defaults` + - [ ] Set the branch and leave the `Auto-close` checkbox unchecked + - [ ] Save changes ### **Sign and Tag** ===================================== .gitlab/issue_templates/UXBug.md deleted ===================================== @@ -1,29 +0,0 @@ - - -### Summary -**Summarize the bug encountered concisely.** - - -### Steps to reproduce: -**How one can reproduce the issue - this is very important.** - -1. Step 1 -2. Step 2 -3. ... - -### What is the current bug behavior? -**What actually happens.** - - -### What is the expected behavior? -**What you want to see instead** - - - -## Relevant logs and/or screenshots -**Do you have screenshots? Attach them to this ticket please.** - -/label ~tor-ux ~needs-investigation ~bug -/assign @nah View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cd0362… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cd0362… You're receiving this email because of your account on gitlab.torproject.org.

1 0