Revert changes for #30388 as needed

A better patch for #30388 (moved) landed on esr60 (https://hg.mozilla.org/releases/mozilla-esr60/rev/5749f5b42cbf5a972bc8c398ed377977da35dbd2). We should revert our patches where needed.

added GeorgKoppen201905 TorBrowserTeam201905 component::applications/tor browser owner::tbb-team priority::high resolution::fixed severity::normal status::closed type::task labels

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.

Trac:
Resolution: N/A to fixed
Status: new to closed

closed

moved to tpo/applications/tor-browser#30425 (closed)