[tbb-bugs] #29104 [Applications/Tor Browser]: Rebase Tor Browser patches against 60.5.0esr

[Tor Bug Tracker & Wiki]

#29104: Rebase Tor Browser patches against 60.5.0esr
-------------------------------------------------+-------------------------
 Reporter:  gk                                   |          Owner:  tbb-
                                                 |  team
     Type:  task                                 |         Status:
                                                 |  needs_review
 Priority:  Very High                            |      Milestone:
Component:  Applications/Tor Browser             |        Version:
 Severity:  Normal                               |     Resolution:
 Keywords:  TorBrowserTeam201901R,               |  Actual Points:
  GeorgKoppen201901                              |
Parent ID:                                       |         Points:
 Reviewer:                                       |        Sponsor:
-------------------------------------------------+-------------------------
Changes (by gk):

 * cc: mcs, brade (added)


Comment:

 `tor-browser-60.5.0esr-8.0-1` (https://gitweb.torproject.org/user/gk/tor-
 browser.git/log/?h=tor-browser-60.5.0esr-8.0-1) in my public `tor-browser`
 repo is what could be the branch for the 8.0.5 stable.

 Assuming you have `git-wrapper` in your path you should get it by doing
 `git-wrapper rebase -i --autosquash
 5305958d84a17c0203074504874350683476b8de` and `git-wrapper rebase
 --continue` after each of the conflicts got resolved, starting from `tor-
 browser.60.4.0esr-8.0-1`.

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