[tor-bugs] #30425 [Applications/Tor Browser]: Revert changes for #30388 as needed

[Tor Bug Tracker & Wiki]

#30425: Revert changes for #30388 as needed
-------------------------------------------------+-------------------------
 Reporter:  gk                                   |          Owner:  tbb-
                                                 |  team
     Type:  task                                 |         Status:  closed
 Priority:  High                                 |      Milestone:
Component:  Applications/Tor Browser             |        Version:
 Severity:  Normal                               |     Resolution:  fixed
 Keywords:  TorBrowserTeam201905,                |  Actual Points:
  GeorgKoppen201905                              |
Parent ID:                                       |         Points:
 Reviewer:                                       |        Sponsor:
-------------------------------------------------+-------------------------
Changes (by gk):

 * status:  new => closed
 * resolution:   => fixed


Comment:

 Okay, I looked closer at what we need here. Given that we plan to ship 8.5
 as the next stable release which includes code from Torbutton's `master`
 branch and from `tor-browser`'s `tor-browser-60.6.1esr-8.5-1` there is not
 much to do besides:

 1) Update the Torbutton CHANGELOG so that it's vivisble that the armagadd-
 on-2.0 change is not present anymore
 2) Make sure that the armagadd-on-2.0 related changes are not picked up
 for the rebase onto 60.7.0esr.

 I'll keep track of that and think we can close this ticket.

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