[tor-bugs] #33533 [Applications/Tor Browser]: Rebase Tor Browser esr68 patches on top of mozilla-central

[Tor Bug Tracker & Wiki]

#33533: Rebase Tor Browser esr68 patches on top of mozilla-central
--------------------------------------+--------------------------------
 Reporter:  acat                      |          Owner:  acat
     Type:  task                      |         Status:  needs_review
 Priority:  Medium                    |      Milestone:
Component:  Applications/Tor Browser  |        Version:
 Severity:  Normal                    |     Resolution:
 Keywords:  TorBrowserTeam202005R     |  Actual Points:  14
Parent ID:  #33661                    |         Points:
 Reviewer:  sysrqb, gk                |        Sponsor:  Sponsor58-must
--------------------------------------+--------------------------------

Comment (by acat):

 Replying to [comment:25 mcs]:
 > One more thing: the patches for #19251 and #19757 are missing from
 acat's 33533+5 branch. They were done as "squash" commits on top of the
 original #30237 patch. Maybe there is already a process we are following
 to pick up such fixes, but I wanted to mention this issue so that the
 patches do not get lost.

 Thanks for the reminder. I was planning (at some point) to start applying
 the changes that came after `6046d1d58280`, which is the last commit I
 used for rebasing. After taking a look at 9.5 branches >= "tor-
 browser-68.5", I think currently these are missing:

 68.5
 [https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-
 browser-68.5.0esr-9.5-1&id=aed69dc95387429e18b18ad578fb78d4a83d91f2
 squash! Bug 30237: Add v3 onion services client authentication prompt]

 [https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-
 browser-68.5.0esr-9.5-1&id=03101bba2cf4a694deec0b7b040d8141f8c7cf20 fixup!
 Bug 23247: Communicating security expectations for .onion]



 68.6
 [https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-
 browser-68.6.0esr-9.5-2&id=69dfbacfa8b3d6abd6eb5e248fcd24a03c30a962 Bug
 33342: Avoid disconnect search addon error after removal.]

 [https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-
 browser-68.6.0esr-9.5-1&id=7306a08365be9212f621b396513352d19549c487 Bug
 28005: Implement .onion alias urlbar rewrites]

 [https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-
 browser-68.6.0esr-9.5-1&id=e3b4a8bf4a19cee4838a5216a3ef5af58bea6e62
 squash! Bug 30237: Add v3 onion services client authentication prompt]

 [https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-
 browser-68.6.0esr-9.5-1&id=da5513527e50e7f13e3b1c3206ed75ff8fbd76db Bug
 21952: Implement Onion-Location]



 68.7
 [https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-
 browser-68.7.0esr-9.5-1&id=e09b2deb216910b26f1ade5882d3c3c07af30652 fixup!
 Bug 28005: Implement .onion alias urlbar rewrites]

 [https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-
 browser-68.7.0esr-9.5-1&id=dcae22191c42bdb1948a6e55c7c50e0ab97dbf70
 fixup! Bug 23247: Communicating security expectations for .onion]

 [https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-
 browser-68.7.0esr-9.5-1&id=5a8128b566fab32fa2d97fe7a1a99e761afe77b0 fixup!
 Bug 10760: Integrate TorButton to TorBrowser core]

 [https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-
 browser-68.7.0esr-9.5-1&id=7d0d47db46531a32c88db85323cd771761b8bb5d Revert
 "Bug 30575: Don't allow enterprise policies in Tor Browser"]

 [https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-
 browser-68.7.0esr-9.5-1&id=e577d655d2044e3b6636b0bccfbb5bd776148582 Bug
 32418: Allow updates to be disabled via an enterprise policy.]

 [https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-
 browser-68.7.0esr-9.5-1&id=0052c74b743756dafa4f3614f559dd8f8d1645c2
 fixup! Bug 28005: Implement .onion alias urlbar rewrites]




 68.8
 [https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-
 browser-68.8.0esr-9.5-1&id=00f5a4c995a911423e10af5a2bbeceef1ae76be6 Bug
 34196: Update site info URL with the onion name]

 [https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-
 browser-68.8.0esr-9.5-1&id=052d8a452a92a97b77130e60e28c1c02076d9db3
 fixup! Bug 34196: Update site info URL with the onion name]

 When I start applying these I'll double check with some range-diffs just
 in case I'm missing something between branches. I think I can do this (and
 :comment:24 fixup) either on next rebase (68beta?) or when gk finishes the
 review.

 (BTW, when looking at these I thought [https://gitweb.torproject.org/tor-
 browser.git/commit/?h=tor-
 browser-68.6.0esr-9.5-2&id=ddef5cd5e970f3e38651e0bb789979d67f74eb2d  Bug
 1626728 - Normalize shutdown. r=perry,jstutte, a=RyanVM] had been backed
 out from central, since that's the chronologically latest commit:
 https://github.com/mozilla/gecko-
 dev/commit/0f9da9eb51280f63b217db92c070ed4456b2fe84. However, there's this
 commit https://github.com/mozilla/gecko-
 dev/commit/064b0f9501ad76802853b43f18e33d8713fd54d3
 which has 1970 (epoch?) date but comes topologically after the backout
 commit. Not sure why this happened, maybe it says something in the bug,
 but I can't see it (sec issue I guess).)

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/33533#comment:27>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online