git diff e7a834d3..f85ff99d | git apply

8.5.4-build2 was published as 8.5.4 while the Tor Browser import was
being performed. Acknowledge there were no changes between both
versions.

Thanks @segfault for catching it!

None of this is needed / true since we don't build custom packages anymore.

I had broken it by adding text in the past without paying much attention
to the surrounding context.

This is a follow-up on commit:7a1d01de, that
removed these patches.

This avoids the need to build and upload Thunderbird packages every now and
then. Instead, we'll need to refresh our patches when they don't apply
as-is anymore.

Current patchset imported from our icedove.git at
commit a3eab1e85558f2c9cf01d332920ac81fea3cd9fd.

Fix-committed: #16389