This should be merged after 8.0 is released (or when we are sure we won't need to do any 8.0 builds). This can be merged to both maint-8.0 and master to get the same file in both branches.
Trac: Keywords: TorBrowserTeam201809 deleted, TorBrowserTeam201809R added Status: new to needs_review
I cherry-picked e16754013b11c941efe92f19ff2b041fffca8906 onto master (commit 6c1935752caf9c72595d9e20cbf0da2300783ab6) and merged your branch into maint-8.0 (commit 80410afe4226a0a20feb5f9470e33ae31f1e9f8d).
Trac: Status: needs_review to closed Resolution: N/Ato fixed