[tbb-bugs] #31918 [Applications/Tor Browser]: Rebase and squash mobile/android patches into desktop
Tor Bug Tracker & Wiki
blackhole at torproject.org
Tue Apr 21 18:11:51 UTC 2020
#31918: Rebase and squash mobile/android patches into desktop
-------------------------------------------------+-------------------------
Reporter: sysrqb | Owner: acat
Type: task | Status:
| needs_review
Priority: Medium | Milestone:
Component: Applications/Tor Browser | Version:
Severity: Normal | Resolution:
Keywords: tbb-9.5, ReleaseTrainMigration, | Actual Points:
TorBrowserTeam202004R |
Parent ID: #33656 | Points: 1
Reviewer: sysrqb | Sponsor:
| Sponsor58
-------------------------------------------------+-------------------------
Changes (by acat):
* keywords: tbb-9.5, ReleaseTrainMigration, TorBrowserTeam202004 =>
tbb-9.5, ReleaseTrainMigration, TorBrowserTeam202004R
* status: assigned => needs_review
Comment:
I'm using this one to also squash some of the desktop patches, not only
mobile -> desktop. I used the 33533+4 branch, and the resulting rebased
patches are in https://github.com/acatarineu/tor-browser/commits/31918.
I squashed some commits with the mozconfigs one which are not strictly
mozconfigs, but I think they could all belong to the same category,
something like "build-time options that we set or unset". And if we do
#23656 then all the changes in this patch would be effective for tor-
browser-builds.
Here is the list of changes from 33533+4 to 31918:
{{{
Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs
squash! TB4: Tor Browser's Firefox preference overrides.
Bug 25741 - TBA: Add an AppConstant for TOR_BROWSER_VERSION
fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.
Bug 25741 - TBA: Add default configure options in dedicated file
squash! TB3: Tor Browser's official .mozconfigs.
Bug 25741 - TBA: Disable features at compile-time
squash! TB3: Tor Browser's official .mozconfigs.
Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT
squash! TB3: Tor Browser's official .mozconfigs.
Bug 31658: Changed the 'SECURITY LEVEL' text color to builtin --panel-
disabled-color
fixup! Bug 25658: Replace security slider with security level UI
Bug 32188: Change useLocalProxy string to tor-launcher's torsettings
useProxy.checkbox in TorStrings.jsm
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings
in about:preferences#tor
Bug 31803: Replaced about:debugging logo with flat version
squash! Bug 2176: Rebrand Firefox to TorBrowser
Bug 32111: Fixed issue parsing user-provided brige strings
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings
in about:preferences#tor
Bug 31749: Fix security level panel spawning events
fixup! Bug 25658: Replace security slider with security level UI
Bug 31920: Fix Security Level panel when its toolbar button moves to
overflow
fixup! Bug 25658: Replace security slider with security level UI
Bug 31748: Fixed 'Learn More' links in Security Level preferences and
panel
fixup! Bug 25658: Replace security slider with security level UI
Bug 31935: Disable profile downgrade protection.
squash! TB3: Tor Browser's official .mozconfigs.
Bug 28196: preparations for using torbutton tor-browser-brand.ftl
squash! Bug 2176: Rebrand Firefox to TorBrowser
Bug 24653: merge securityLevel.properties into torbutton.dtd
fixup! Bug 25658: Replace security slider with security level UI
Bug 31457: disable per-installation profiles
squash! TB3: Tor Browser's official .mozconfigs.
Bug 31251: Security Level button UI polish
fixup! Bug 25658: Replace security slider with security level UI
Bug 30631: Blurry Tor Browser icon on macOS app switcher
squash! Bug 2176: Rebrand Firefox to TorBrowser
Bug 25702: Update Tor Browser icon to follow design guidelines
took the aboutTBUpdateLogo.png changes (aboutTBUpdateLogo.png,
browser/base/jar.mn) and added commit as fixup for
`Bug 16940: After update, load local change notes.`
the rest, squash! Bug 2176: Rebrand Firefox to TorBrowser
Bug 22548: Firefox downgrades VP9 videos to VP8.
squash! TB4: Tor Browser's Firefox preference overrides.
Bug 14392: Make about:tor behave like other initial pages.
squash! Bug 10760: Integrate TorButton to TorBrowser core
}}}
Some notes/questions:
I did not touch the onboarding patches, as I'm not sure what we are going
to do with #31660. If we keep the current onboarding, I think it might be
worth to squash them. I was thinking to keep two patches:
- "Resurrect Firefox old onboarding"
- Revert "Bug 1462415 - Delete onboarding system add-on
r=Standard8,k88hudson
- squash! Revert "Bug 1498378 - Actually remove the old onboarding add-
on's prefs r=Gijs
- squash! Bug 28822: Convert onboarding to webextension
- squash! Partially revert 1564367 (controlCenter in UITour.jsm)
- "Actual onboarding implementation"
- Bug 26961: New user onboarding.
- squash! Bug 27082: enable a limited UITour
- squash! Bug 26962 - implement new features onboarding (part 1).
- squash! Bug 27486 Avoid about:blank tabs when opening onboarding
pages.
- squash! Bug 31768: Introduce toolbar and network settings changes in
onboarding
Given that now some "actual onboarding" patches go after "Bug 28822:
Convert onboarding to webextension", to do this reordering + squashing we
would have to fix some conflicts, but it should not be a big deal. The
only thing is that "actual onboarding" patch should go after the most
recent patch from all features, which I assume would be "Bug 27511: Add
new identity button to toolbar".
If we agree with the mozconf squashes I suggested, would the patch "Bug
21849: Don't allow SSL key logging" fit in that too? (build-time configs
that we set/change)
Is it fine to leave tests separated from patches, or do you think we could
also squash those too?
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/31918#comment:19>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
More information about the tbb-bugs
mailing list