Merge branch 'uniqx-tor-android-0.4.8.9-dev'

.gitignore

@@ -71,6 +71,7 @@ core.*
 /stamp-h1
 /tags
 /TAGS
+/target
 /test-driver
 /tor.sh
 /tor.spec
@@ -138,6 +139,8 @@ core.*
 # /scripts
 /scripts/maint/checkOptionDocs.pl
 /scripts/maint/updateVersions.pl
+scripts/maint/geoip/geoip
+scripts/maint/geoip/geoip6
 
 # /src/
 /src/Makefile

.gitlab-ci.yml.disabled

@@ -42,6 +42,7 @@ variables:
 .x86-64-template: &x86-64-template
   tags:
     - amd64
+    - physical
 
 # This template should be usable on any system that's based on apt.
 .apt-template: &apt-template |
@@ -51,6 +52,7 @@ variables:
       export APT_CACHE_DIR="$(pwd)/apt-cache"
       rm -f /etc/apt/apt.conf.d/docker-clean
       echo 'quiet "1";' \
+           'Acquire::Retries "20";' \
            'APT::Install-Recommends "0";' \
            'APT::Install-Suggests "0";' \
            'Acquire::Retries "20";' \
@@ -100,6 +102,8 @@ variables:
     - if [ "$STEM" = yes ]; then apt-get install timelimit; fi
     - if [ "$CC" = clang ]; then apt-get install clang; fi
     - if [ "$NSS" = yes ]; then apt-get install libnss3 libnss3-dev; fi
+    # llvm-symbolizer for sanitizer backtrace
+    - if [ "$HARDENING" = yes ]; then apt-get install llvm; fi
     # TODO: This next line should not be debian-only.
     - if [ "$STEM" = yes ]; then git clone --depth 1 https://gitlab.torproject.org/tpo/network-health/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
     # TODO: This next line should not be debian-only.
@@ -114,13 +118,15 @@ 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:bullseye
   <<: *debian-template
   script:
     - ./scripts/ci/ci-driver.sh
+  tags:
+    - physical
 
 #####
 # Run "make check" with a hardened clang on debian stable.  This takes
@@ -212,6 +218,16 @@ debian-disable-relay:
   script:
     - ./scripts/ci/ci-driver.sh
 
+#####
+# GPL licensed mode, enables pow module
+debian-gpl:
+  image: debian:buster
+  <<: *debian-template
+  variables:
+    GPL: "yes"
+  script:
+    - ./scripts/ci/ci-driver.sh
+
 #####
 # NSS check on debian
 debian-nss:
@@ -241,6 +257,22 @@ debian-packaging-0.4.6:
     - if: $CI_PROJECT_NAMESPACE == "tpo/core" &&
           $CI_COMMIT_BRANCH == "maint-0.4.6"
 
+#####
+# Run tests written in Rust, and run clippy on all Rust code here.
+rust-latest:
+  image: rust:latest
+  <<: *debian-template
+  script:
+    - apt-get install llvm-dev libclang-dev clang
+    - rustup show
+    - cargo build --locked --verbose
+    - cargo test --verbose
+    - rustup component add clippy
+    - rustup show
+    - cargo clippy --all-features --all-targets -- -D warnings
+  after_script:
+    - cargo clean
+
 # cppcheck static analyzer
 cppcheck:
   image: debian:bullseye