From: David Goulet <dgoulet@torproject.org>
Date: Wed, 31 May 2023 18:32:07 +0000 (-0400)
Subject: Merge branch 'maint-0.4.7'
X-Git-Tag: tor-0.4.8.1-alpha~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97008526db53ce77cc65fbf93a4f5760c242082b;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.7'
---

97008526db53ce77cc65fbf93a4f5760c242082b
diff --cc .gitlab-ci.yml
index 6839f76a6b,3bb2a9a40f..17ce0af43b
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -113,10 -114,10 +116,10 @@@ debian-minimal
    script:
      - ./scripts/ci/ci-driver.sh
  
 -# Minmal check on debian/i386: just make, make check.
 +# Minimal check on debian/i386: just make, make check.
  #
  debian-i386-minimal:
-   image: i386/debian:buster
+   image: i386/debian:bullseye
    <<: *debian-template
    script:
      - ./scripts/ci/ci-driver.sh