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.
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.
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.
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.
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 @@
<!-- Onion location -->
<string name="preferences_tor_prioritize_onions">Prioritize .onion sites</string>
+
+ <!-- 2023 year-end-campaign. -->
+
+ <!-- Large introduction text. -->
+ <string name="yec_2023_introduction">Right now, Tor Browser for Android is protecting your privacy!</string>
+ <!-- 2023 year-end-campaign. -->
+ <!-- The first part of yec_2023_pleas_donate_full. Split out from the full string to bring some styling attention to this part. Follows directly below yec_2023_introduction. -->
+ <string name="yec_2023_please_donate_beginning">This is possible because of donations from our community.</string>
+ <!-- 2023 year-end-campaign. -->
+ <!-- Full donation message. Follows directly below yec_2023_introduction. -->
+ <!-- %s will be replaced with the translated string of yec_2023_please_donate_beginning with some visual styling. -->
+ <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>
+ <!-- 2023 year-end-campaign. -->
+ <!-- Shown only during a period where donations will be matched. The end date should match the end of the year. -->
+ <!-- %s will be replaced with the donation limit. This will be a whole-number and will be automatically pre-formatted according to the language/locale: using the language's numeral symbols and thousand-separators. -->
+ <!-- NOTE: The amount should be shown as USD (United States dollar) currency. In the original English string, the leading "$" is the literal USD currency symbol, and this can be changed or removed when translating to whatever is most appropriate for USD currency in the locale. The ending "!" is also the literal exclamation point and can be similarly changed. -->
+ <!-- For example, "$%s" for English would eventually be shown as "$5,000", whilst "%s US$" for Arabic would be shown as "٥٬٠٠٠ US$". -->
+ <!-- Translators: If you need any help or clarification, feel free to ask a question on weblate or in IRC (#tor-l10n). -->
+ <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>
+ <!-- 2023 year-end-campaign. -->
+ <string name="yec_2023_close_button">Close</string>
+ <!-- 2023 year-end-campaign. -->
+ <string name="yec_2023_donate_button">Donate now</string>
+ <!-- 2023 year-end-campaign. -->
+ <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.
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.
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 @@
-<!--
-* Use this issue template for reporting a new UX bug.
--->
-
-### 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.