[tor-commits] [tor] 04/04: Merge branch 'maint-0.4.7'

[gitolite role]

This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch main
in repository tor.

commit 97008526db53ce77cc65fbf93a4f5760c242082b
Merge: 925201c946 066da91521
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Wed May 31 14:32:07 2023 -0400

    Merge branch 'maint-0.4.7'

 .gitlab-ci.yml            | 21 ++++++++++++---------
 changes/ticket40799       |  6 ++++++
 src/lib/sandbox/sandbox.c |  7 ++++++-
 3 files changed, 24 insertions(+), 10 deletions(-)

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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.