Changeset f002fd0 in trunk

Timestamp:

2026-01-21T19:02:37Z (13 days ago)

Author:

GitHub <noreply@…>

Parents:

b6ef335 (diff), fedf472 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

meejah <meejah@…> (2026-01-21 19:02:37)

git-committer:

GitHub <noreply@…> (2026-01-21 19:02:37)

Message:

Merge pull request #1452 from hacklschorsch/4191.update-tor-gpg-key

4191 Update Tor installation commands for Ubuntu integration tests

Files:

• .github/workflows/ci.yml (modified) (1 diff)
• newsfragments/4191.minor (added)

.github/workflows/ci.yml

@@ -174 +174 @@
         if: ${{ contains(matrix.os, 'ubuntu') }}
         run: |
-          gpg --keyserver keyserver.ubuntu.com --recv-keys 74A941BA219EC810
-          gpg --export 74A941BA219EC810 | sudo tee /usr/share/keyrings/tor-archive-keyring.gpg > /dev/null
-          echo "deb [signed-by=/usr/share/keyrings/tor-archive-keyring.gpg] https://deb.torproject.org/torproject.org noble main" | sudo tee /etc/apt/sources.list.d/tor.list
+          wget -qO- https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | gpg --dearmor | sudo tee /usr/share/keyrings/deb.torproject.org-keyring.gpg >/dev/null
+          echo "deb [signed-by=/usr/share/keyrings/deb.torproject.org-keyring.gpg] https://deb.torproject.org/torproject.org noble main" | sudo tee /etc/apt/sources.list.d/tor.list
           sudo apt update
-          sudo apt install tor
+          sudo apt install tor deb.torproject.org-keyring
 
       # TODO: See https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3744.