Bug 41357: Fix format of keyring/anti-censorship.gpg

Merge Info

Issues

Resolves

• #41357 (closed)
• tor-browser#xxxxx
• mullvad-browser#xxxxx

Related

• tor-browser-build#xxxxx
• tor-browser#xxxxx
• mullvad-browser#xxxxx

Merging

Target Branches

• main: esr128-14.5
• maint-14.0: esr128-14.0
• maint-13.5: esr115-13.5

Backporting

Timeline

• No Backport (preferred): patchset for the next major stable
• Immediate: patchset needed as soon as possible
• Next Minor Stable Release: patchset that needs to be verified in nightly before backport
• Eventually: patchset that needs to be verified in alpha before backport

(Optional) Justification

• Emergency security update: patchset fixes CVEs, 0-days, etc
• Censorship event: patchset enables censorship circumvention
• Critical bug-fix: patchset fixes a bug in core-functionality
• Consistency: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
• Sponsor required: patchset required for sponsor
• Other: please explain

Issue Tracking

• Link resolved issues with appropriate Release Prep issue for changelog generation

Review

Request Reviewer

• Request review from an applications developer depending on modified system:
  • NOTE: if the MR modifies multiple areas, please /cc all the relevant reviewers (since gitlab only allows 1 reviewer)
  • accessibility : henry
  • android : clairehurst, dan
  • build system : boklm
  • extensions : ma1
  • firefox internals (XUL/JS/XPCOM) : jwilde, ma1
  • fonts : pierov
  • frontend (implementation) : henry
  • frontend (review) : donuts, morgan
  • localization : henry, pierov
  • macOS : clairehurst, dan
  • nightly builds : boklm
  • rebases/release-prep : boklm, dan, ma1, morgan, pierov
  • security : jwilde, ma1
  • signing : boklm, morgan
  • updater : pierov
  • windows : jwilde, morgan
  • misc/other : morgan, pierov

Change Description

Done with this command:

gpg --no-default-keyring --keyring keyring/anti-censorship.gpg --export > tmp.gpg && mv tmp.gpg keyring/anti-censorship.gpg

How Tested

Checked the diff of tools/keyring/list-all-keyrings without and with the change:

--- /tmp/1.txt	2025-02-02 10:10:52.282000000 +0100
+++ /tmp/2.txt	2025-02-02 10:10:58.776000000 +0100
@@ -1,4 +1,4 @@
-./keyring/anti-censorship.gpg: GPG keybox database version 1, created-at Fri Oct 21 09:35:52 2022, last-maintained Fri Oct 21 09:35:52 2022
+./keyring/anti-censorship.gpg: PGP/GPG key public ring (v4) created Fri Jan 18 03:00:17 2019 RSA (Encrypt or Sign) 4096 bits MPI=0x9453419f5c48f734...
 ./keyring/anti-censorship.gpg
 -----------------------------
 pub   rsa4096/009DE379FD9B7B90 2019-01-18 [SCA]