Skip to content

Bug 40526: Add boklm to torbutton.gpg

morgan requested to merge morgan/tor-browser-build:bug_40526 into main

resolves #40526 (closed) and #40643 (closed)

$ tor-browser-build/keyring$ gpg --no-default-keyring --keyring ./torbutton.gpg --list-keys > torbutton.gpg.txt.old
$ git checkout bug_40643
$ tor-browser-build/keyring$ gpg --no-default-keyring --keyring ./torbutton.gpg --list-keys > torbutton.gpg.txt.new
$ diff torbutton.gpg.txt.old torbutton.gpg.txt.new
39a40,47
> pub   rsa4096 2015-09-24 [SC]
>       6AB6AEE9776E782723C8ACE83E39CEABFC69F6F7
> uid           [ unknown] Nicolas Vigier (boklm) <boklm@torproject.org>
> uid           [ unknown] Nicolas Vigier (boklm) <boklm@mars-attacks.org>
> sub   rsa4096 2016-04-23 [A]
> sub   rsa4096 2021-05-31 [E] [expires: 2023-05-31]
> sub   rsa4096 2021-05-31 [S] [expires: 2023-05-31]
>
Edited by morgan

Merge request reports