[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5

[ahf at torproject.org]

commit 78712990ab90b1317d164a1be806ef1d31d5da6d
Merge: b2d6fed3e9 b07cd2ee90
Author: Alexander Færøy <ahf at torproject.org>
Date:   Mon Aug 16 13:58:32 2021 +0000

    Merge branch 'maint-0.3.5' into maint-0.4.5

 .gitlab-ci.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --cc .gitlab-ci.yml
index 8afd090a58,1e9d03caf5..f7abf8362e
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -96,10 -96,10 +96,10 @@@ variables
      - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 https://git.torproject.org/chutney.git ;  export CHUTNEY_PATH="$(pwd)/chutney"; fi
      - if [ "$TRACING" = yes ]; then apt install liblttng-ust-dev; fi
  
 -# Minmal check on debian: just make, make check.
 +# Minimal check on debian: just make, make check.
  #
  debian-minimal:
-   image: debian:stable
+   image: debian:buster
    <<: *debian-template
    script:
      - ./scripts/ci/ci-driver.sh