.gitignore

@@ -43,6 +43,8 @@ core.*
 !core/
 # ccls file that can be per directory.
 *.ccls
+# clangd uses that for LSP caching.
+/.cache
 
 # /
 /Makefile
@@ -52,7 +54,6 @@ core.*
 /autom4te.cache
 /build-stamp
 /compile
-/config.rust
 /configure
 /Doxyfile
 /orconfig.h
@@ -63,13 +64,14 @@ core.*
 /config.guess
 /config.sub
 /conftest*
-/link_rust.sh
 /micro-revision.*
 /patch-stamp
 /stamp-h
 /stamp-h.in
 /stamp-h1
+/tags
 /TAGS
+/target
 /test-driver
 /tor.sh
 /tor.spec
@@ -137,6 +139,8 @@ core.*
 # /scripts
 /scripts/maint/checkOptionDocs.pl
 /scripts/maint/updateVersions.pl
+scripts/maint/geoip/geoip
+scripts/maint/geoip/geoip6
 
 # /src/
 /src/Makefile
@@ -161,12 +165,6 @@ core.*
 /src/app/tor-cov
 /src/app/tor-cov.exe
 
-# /src/rust
-/src/rust/.cargo/config
-/src/rust/.cargo/registry
-/src/rust/target
-/src/rust/registry
-
 # /src/test
 /src/test/Makefile
 /src/test/Makefile.in

.gitlab-ci.yml

@@ -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 |
@@ -49,10 +50,11 @@ variables:
       echo Etc/UTC > /etc/timezone
       mkdir -p apt-cache
       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";' \
-           'APT::Acquire::Retries "20";' \
            'APT::Get::Assume-Yes "true";' \
            'Dpkg::Use-Pty "0";' \
            "Dir::Cache::Archives \"${APT_CACHE_DIR}\"; " \
@@ -79,9 +81,11 @@ variables:
     - *apt-template
     # Install patches unconditionally.
     - apt-get install
+        apt-utils
         automake
         build-essential
         ca-certificates
+        file
         git
         libevent-dev
         liblzma-dev
@@ -97,27 +101,49 @@ 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://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
+    - 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.
-    - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 https://git.torproject.org/chutney.git ;  export CHUTNEY_PATH="$(pwd)/chutney"; fi
+    - |
+      if [ "$CHUTNEY" = yes ]; then
+        # Use a fixed version of chutney to avoid surprise breakage.
+        CHUTNEY_SHALLOW_SINCE=2024-10-28
+        CHUTNEY_COMMIT=be881a1e7c4bc8038fa13fde4a7b24e5c56349c4
+
+        git clone --shallow-since "$CHUTNEY_SHALLOW_SINCE" https://gitlab.torproject.org/tpo/core/chutney.git
+        git -C ./chutney checkout "$CHUTNEY_COMMIT"
+        export CHUTNEY_PATH="$(pwd)/chutney"
+        # Have pip install chutney's python dependencies by installing chutney
+        # itself.
+        apt-get install python3-pip
+        pip3 install --user ./chutney
+      fi
     - if [ "$TRACING" = yes ]; then apt install liblttng-ust-dev; fi
 
 # Minimal check on debian: just make, make check.
 #
 debian-minimal:
-  image: debian:buster
+  image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye
   <<: *debian-template
   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
+  # TODO: Use a TPA-maintained image when there is one.
+  # See https://gitlab.torproject.org/tpo/tpa/base-images/-/issues/3
+  image:
+    name: i386/debian:bullseye
+    docker:
+      platform: linux/386
   <<: *debian-template
   script:
     - ./scripts/ci/ci-driver.sh
+  tags:
+    - physical
 
 #####
 # Run "make check" with a hardened clang on debian stable.  This takes
@@ -125,7 +151,7 @@ debian-i386-minimal:
 #
 # TODO: This will be faster once we merge #40098 and #40099.
 debian-hardened:
-  image: debian:bullseye
+  image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye
   <<: *debian-template
   variables:
     ALL_BUGS_ARE_FATAL: "yes"
@@ -137,7 +163,7 @@ debian-hardened:
 #####
 # Distcheck on debian stable
 debian-distcheck:
-  image: debian:buster
+  image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye
   <<: *debian-template
   variables:
     DISTCHECK: "yes"
@@ -148,7 +174,7 @@ debian-distcheck:
 #####
 # Documentation tests on debian stable: doxygen and asciidoc.
 debian-docs:
-  image: debian:buster
+  image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye
   <<: *debian-template
   variables:
     DOXYGEN: "yes"
@@ -166,7 +192,7 @@ debian-docs:
 #       with the 'artifacts' mechanism, in theory, but it would be good to
 #       avoid having to have a system with hundreds of artifacts.
 debian-integration:
-  image: debian:buster
+  image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye
   <<: *debian-template
   variables:
     CHECK: "no"
@@ -180,7 +206,7 @@ debian-integration:
 #####
 # Tracing build on Debian stable.
 debian-tracing:
-  image: debian:buster
+  image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye
   <<: *debian-template
   variables:
     TRACING: "yes"
@@ -188,23 +214,11 @@ debian-tracing:
     DISTCHECK: "yes"
   script:
     - ./scripts/ci/ci-driver.sh
-  # Ensure that we only run tracing when it's implemented.
-  #
-  # Once versions before 0.4.5 are obsolete, we can remove this test.
-  rules:
-    # This first "if" check prevents us from running a duplicate version of
-    # this pipeline whenever we push and create an MR.  I don't understand why
-    # it is necessary, though the following URL purports to explain:
-    #
-    # https://docs.gitlab.com/ee/ci/yaml/#prevent-duplicate-pipelines
-    - if: '$CI_PIPELINE_SOURCE == "push"'
-      exists:
-        - src/lib/trace/trace_sys.c
 
 #####
 # No-authority mode
 debian-disable-dirauth:
-  image: debian:buster
+  image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye
   <<: *debian-template
   variables:
     DISABLE_DIRAUTH: "yes"
@@ -214,31 +228,64 @@ debian-disable-dirauth:
 #####
 # No-relay mode
 debian-disable-relay:
-  image: debian:buster
+  image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye
   <<: *debian-template
   variables:
     DISABLE_RELAY: "yes"
   script:
     - ./scripts/ci/ci-driver.sh
-  # Ensure that we only run tracing when it's implemented.
-  #
-  # Once versions before 0.4.3 are obsolete, we can remove this test.
-  rules:
-    # This first "if" check prevents us from running a duplicate version of
-    # this pipeline whenever we push and create an MR.  I don't understand why
-    # it is necessary, though the following URL purports to explain:
-    #
-    # https://docs.gitlab.com/ee/ci/yaml/#prevent-duplicate-pipelines
-    - if: '$CI_PIPELINE_SOURCE == "push"'
-      exists:
-        - src/feature/relay/relay_stub.c
+
+#####
+# GPL licensed mode, enables pow module
+debian-gpl:
+  image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye
+  <<: *debian-template
+  variables:
+    GPL: "yes"
+  script:
+    - ./scripts/ci/ci-driver.sh
 
 #####
 # NSS check on debian
 debian-nss:
-  image: debian:buster
+  image: containers.torproject.org/tpo/tpa/base-images/debian:bullseye
   <<: *debian-template
   variables:
     NSS: "yes"
   script:
     - ./scripts/ci/ci-driver.sh
+
+#####
+# Debian packaging triggers for maintenance branches
+debian-packaging-0.4.5:
+  stage: deploy
+  trigger:
+    project: tpo/core/debian/tor
+    branch: debian-0.4.5
+  rules:
+    - if: $CI_PROJECT_NAMESPACE == "tpo/core" &&
+          $CI_COMMIT_BRANCH == "maint-0.4.5"
+debian-packaging-0.4.6:
+  stage: deploy
+  trigger:
+    project: tpo/core/debian/tor
+    branch: debian-0.4.6
+  rules:
+    - 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

.gitlab/issue_templates/Bug.md

+### Summary
+
+
+
+### Steps to reproduce:
+
+1. Step 1
+2. ...
+
+### What is the current bug behavior?
+
+
+
+### What is the expected behavior?
+
+
+
+### Environment
+
+- Which version of Tor are you using? Run `tor --version` to get the version if you are unsure.
+- Which operating system are you using? For example: Debian GNU/Linux 10.1, Windows 10, Ubuntu Xenial, FreeBSD 12.2, etc.
+- Which installation method did you use? Distribution package (apt, pkg, homebrew), from source tarball, from Git, etc.
+
+### Relevant logs and/or screenshots
+
+
+
+### Possible fixes
+
+
+
+/label ~Bug

.gitlab/issue_templates/Feature.md

+### Summary
+
+
+
+### What is the expected behavior?
+
+
+
+/label ~Feature

.gitmodules

-[submodule "src/ext/rust"]
-	path = src/ext/rust
-	url = https://git.torproject.org/tor-rust-dependencies

.travis.yml

@@ -2,13 +2,6 @@ language: c
 
 cache:
   ccache: true
-  ## cargo: true
-  directories:
-    - $HOME/.cargo
-    ## caching CARGO_TARGET_DIR actually slows down the build over time,
-    ## because old build products are never deleted.
-    ## where we point CARGO_TARGET_DIR in all our cargo invocations
-    #- $TRAVIS_BUILD_DIR/src/rust/target
 
 compiler:
   - gcc
@@ -29,8 +22,6 @@ env:
     - HARDENING_OPTIONS="--enable-all-bugs-are-fatal --enable-expensive-hardening"
     ## We turn off asciidoc by default, because it's slow
     - ASCIIDOC_OPTIONS="--disable-asciidoc"
-    ## Our default rust version is the minimum supported version
-    - RUST_VERSION="1.31.0"
     ## Turn off tor's sandbox in chutney, until we fix sandbox errors that are
     ## triggered by Ubuntu Xenial and Bionic. See #32722.
     - CHUTNEY_TOR_SANDBOX="0"
@@ -68,10 +59,6 @@ matrix:
     ## We check disable module dirauth
     - env: MODULES_OPTIONS="--disable-module-dirauth" HARDENING_OPTIONS="--enable-expensive-hardening"
 
-    ## We run rust on Linux, because it's faster than rust on macOS
-    ## We check rust offline
-    - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
-
     ## We check NSS
     ## Use -std=gnu99 to turn off some newer features, and maybe turn on some
     ## extra gcc warnings?
@@ -86,14 +73,6 @@ matrix:
     ## We run `make doxygen` without `make check`.
     - env: SKIP_MAKE_CHECK="yes" DOXYGEN="yes"
 
-    ## macOS builds are very slow, and we have a limited number of
-    ## concurrent macOS jobs. We're not actively developing Rust, so it is
-    ## the lowest priority.
-    ## We run rust on macOS, because we have seen macOS rust failures before
-    #- env: RUST_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
-    #  compiler: clang
-    #  os: osx
-
   ## Allow the build to report success (with non-required sub-builds
   ## continuing to run) if all required sub-builds have succeeded.
   fast_finish: true
@@ -101,16 +80,6 @@ matrix:
   ## Careful! We use global envs, which makes it hard to allow failures by env:
   ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-allow_failures
   allow_failures:
-    ## macOS rust and chutney are very slow, so we let the build finish before
-    ## they are done.  We'd like to fast finish, but still eventually show
-    ## any failures in the build status. But Travis doesn't have that ability.
-
-    ## Since this job is disabled, there's not much point having an exception
-    ## for it
-    #- env: RUST_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
-    #  compiler: clang
-    #  os: osx
-
     ## Since we're actively developing IPv6, we want to require the IPv6
     ## chutney tests
     #- env: CHUTNEY_MAKE="test-network-ipv6" CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"
@@ -187,8 +156,6 @@ osx_image: xcode11.2
 before_install:
   ## Set pipefail: we use pipes
   - set -o pipefail || echo "pipefail failed"
-  ## Create empty rust directories for non-Rust builds, so caching succeeds
-  - if [[ "$RUST_OPTIONS" == "" ]]; then mkdir -p $HOME/.cargo $TRAVIS_BUILD_DIR/src/rust/target; fi
 
 install:
   ## If we're on OSX, configure ccache (ccache is automatically installed and configured on Linux)
@@ -200,13 +167,6 @@ install:
   - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi
   ## If we're on OSX, and using asciidoc, configure asciidoc
   - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"; fi
-  ## If we're using Rust, download rustup
-  - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi
-  ## Install the stable channels of rustc and cargo and setup our toolchain environment
-  - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain $RUST_VERSION; fi
-  - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi
-  ## If we're testing rust builds in offline-mode, then set up our vendored dependencies
-  - if [[ "$TOR_RUST_DEPENDENCIES" == "true" ]]; then export TOR_RUST_DEPENDENCIES=$PWD/src/ext/rust/crates; fi
   ## If we're running chutney, install it.
   - if [[ "$CHUTNEY" != "" ]]; then git clone --depth 1 https://github.com/torproject/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi
   ## If we're running stem, install it.
@@ -215,13 +175,6 @@ install:
   ## Finally, list installed package versions
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi
-  ## Get some info about rustup, rustc and cargo
-  - if [[ "$RUST_OPTIONS" != "" ]]; then which rustup; fi
-  - if [[ "$RUST_OPTIONS" != "" ]]; then which rustc; fi
-  - if [[ "$RUST_OPTIONS" != "" ]]; then which cargo; fi
-  - if [[ "$RUST_OPTIONS" != "" ]]; then rustup --version; fi
-  - if [[ "$RUST_OPTIONS" != "" ]]; then rustc --version; fi
-  - if [[ "$RUST_OPTIONS" != "" ]]; then cargo --version; fi
   ## Get python version
   - python --version
   ## If we're running chutney, show the chutney commit
@@ -240,7 +193,7 @@ script:
   # Skip test_rebind and test_include on macOS
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export TOR_SKIP_TEST_REBIND=true; export TOR_SKIP_TEST_INCLUDE=true; fi
   - ./autogen.sh
-  - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules"
+  - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules"
   - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\""
   - ./configure $CONFIGURE_FLAGS CC="$CC $C_DIALECT_OPTIONS";
   ## We run `make check` because that's what https://jenkins.torproject.org does.
@@ -270,9 +223,6 @@ after_failure:
 before_cache:
   ## Delete all gcov files.
   - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi
-  ## Delete the cargo registry before caching .cargo, because it's cheaper to
-  ## download the registry and throw it away, rather than caching it
-  - rm -rf $HOME/.cargo/registry
 
 notifications:
   irc:

CODE_OF_CONDUCT

@@ -3,5 +3,4 @@ where people feel safe to engage, share their points of view, and
 participate. For the latest version of our Code of Conduct, please
 see
 
-https://gitweb.torproject.org/community/policies.git/plain/code_of_conduct.txt
-
+https://community.torproject.org/policies/code_of_conduct/

Cargo.lock

+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "aho-corasick"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "argh"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7e7e4aa7e40747e023c0761dafcb42333a9517575bbf1241747f68dd3177a62"
+dependencies = [
+ "argh_derive",
+ "argh_shared",
+]
+
+[[package]]
+name = "argh_derive"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69f2bd7ff6ed6414f4e5521bd509bae46454bbd513801767ced3f21a751ab4bc"
+dependencies = [
+ "argh_shared",
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.99",
+]
+
+[[package]]
+name = "argh_shared"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47253b98986dafc7a3e1cf3259194f1f47ac61abb57a57f46ec09e48d004ecda"
+
+[[package]]
+name = "bindgen"
+version = "0.66.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7"
+dependencies = [
+ "bitflags",
+ "cexpr",
+ "clang-sys",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "peeking_take_while",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn 2.0.28",
+ "which",
+]
+
+[[package]]
+name = "bitflags"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+
+[[package]]
+name = "cc"
+version = "1.0.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01"
+dependencies = [
+ "jobserver",
+ "libc",
+]
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "clang-sys"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "either"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+
+[[package]]
+name = "geoip-db-tool"
+version = "0.1.0"
+dependencies = [
+ "argh",
+ "ipnetwork",
+ "rangemap",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "heck"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "hex-literal"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
+
+[[package]]
+name = "ipnetwork"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02c3eaab3ac0ede60ffa41add21970a7df7d91772c03383aac6c2c3d53cc716b"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "jobserver"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "libc"
+version = "0.2.147"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+
+[[package]]
+name = "libloading"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+dependencies = [
+ "cfg-if",
+ "winapi",
+]
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
+[[package]]
+name = "memchr"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "peeking_take_while"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+
+[[package]]
+name = "prettyplease"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.28",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rangemap"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3929836cb64d09ee7deee59635c3d9bffbc1c0373e247efff6272abd62a11baa"
+
+[[package]]
+name = "regex"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "serde"
+version = "1.0.143"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553"
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "syn"
+version = "1.0.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tor-c-equix"
+version = "0.2.0"
+dependencies = [
+ "bindgen",
+ "cc",
+ "hex-literal",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
+
+[[package]]
+name = "which"
+version = "4.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
+dependencies = [
+ "either",
+ "libc",
+ "once_cell",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

Cargo.toml

+# See doc/HACKING/Rust.md
+#
+# There is no plan to offer a stable Rust API to the C implementation of Tor.
+# This workspace is for wrapper crates that are used internally by Arti for
+# cross-compatibility and comparison testing.
+
+[workspace]
+
+members = [
+    "src/ext/equix",
+    "scripts/maint/geoip/geoip-db-tool",
+]
+
+resolver = "2"
+

Doxyfile.in

@@ -864,10 +864,8 @@ RECURSIVE              = YES
 # run.
 
 EXCLUDE                = ./src/ext/ed25519 \
-                         ./src/ext/rust \
                          ./src/trunnel \
-                         ./src/test \
-                         ./src/rust/registry
+                         ./src/test
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded

Makefile.am

@@ -36,12 +36,6 @@ else
 TESTING_TOR_BINARY=$(top_builddir)/src/app/tor$(EXEEXT)
 endif
 
-if USE_RUST
-rust_ldadd=$(top_builddir)/$(TOR_RUST_LIB_PATH)
-else
-rust_ldadd=
-endif
-
 # "Common" libraries used to link tor's utility code.
 TOR_UTIL_LIBS = \
         src/lib/libtor-geoip.a \
@@ -120,6 +114,10 @@ TOR_CRYPTO_LIBS = \
 	$(LIBKECCAK_TINY) \
 	$(LIBDONNA)
 
+if BUILD_MODULE_POW
+TOR_CRYPTO_LIBS += $(EQUIX_LIBS)
+endif
+
 # Variants of the above for linking the testing variant of tor (for coverage
 # and tests)
 if UNITTESTS_ENABLED
@@ -127,7 +125,8 @@ TOR_CRYPTO_TESTING_LIBS = \
 	src/lib/libtor-tls-testing.a \
 	src/lib/libtor-crypt-ops-testing.a \
 	$(LIBKECCAK_TINY) \
-	$(LIBDONNA)
+	$(LIBDONNA) \
+	$(EQUIX_LIBS)
 endif
 
 # All static libraries used to link tor.
@@ -191,8 +190,7 @@ EXTRA_DIST+= \
 	CODE_OF_CONDUCT							\
 	INSTALL								\
 	LICENSE								\
-	Makefile.nmake							\
-	README								\
+	README.md								\
 	ReleaseNotes							\
 	scripts/build/combine_libs					\
 	scripts/maint/checkIncludes.py					\
@@ -253,7 +251,7 @@ endif
 TEST_NETWORK_SHOW_WARNINGS_FOR_LAST_RUN_FLAGS=--quiet --only-warnings
 
 if LIBFUZZER_ENABLED
-TEST_CFLAGS += -fsanitize-coverage=trace-pc-guard,trace-cmp,trace-div
+TEST_CFLAGS += -fsanitize=fuzzer-no-link
 # not "edge"
 endif
 
@@ -298,7 +296,7 @@ check-local:					\
 	shellcheck
 
 # test-network requires a copy of Chutney in $CHUTNEY_PATH.
-# Chutney can be cloned from https://git.torproject.org/chutney.git .
+# Chutney can be cloned from https://gitlab.torproject.org/tpo/core/chutney.git .
 .PHONY: need-chutney-path
 need-chutney-path:
 	@if test ! -d "$$CHUTNEY_PATH"; then \
@@ -311,7 +309,7 @@ need-chutney-path:
 			echo; \
 			echo "To run these tests," \
 			  "git clone" \
-			  "https://git.torproject.org/chutney.git ;" \
+			  "https://gitlab.torproject.org/tpo/core/chutney.git ;" \
 			  "export CHUTNEY_PATH=\`pwd\`/chutney"; \
 			exit 1; \
 		fi \
@@ -382,10 +380,9 @@ test-network-clean:
 #
 # Run the IPv4 tests in $(ipv4_flavors), unconditionally
 #   - tor relays and directory authorities require IPv4.
-# Run the IPv6 tests in $(ipv6_flavors), if IPv6 is available
-#   - only run IPv6 tests if we can ping6 or ping -6 ::1 (localhost)
-#     we try the syntax for BSD ping6, Linux ping6, and Linux ping -6,
-#     because they're incompatible
+# Run the IPv6 tests in $(ipv6_flavors), unconditionally
+#   - clients don't technically require IPv6, but it's not worth
+#     supporting running this test suite on such systems.
 #   - some IPv6 tests may fail without an IPv6 DNS server
 #     (see #16971 and #17011)
 # Run the mixed tests in $(mixed_flavors), if a tor-stable binary is available
@@ -402,25 +399,9 @@ test-network-run: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/
 		echo "Running IPv4 flavors: $(ipv4_flavors)."; \
 		flavors="$$flavors $(ipv4_flavors)"; \
 	fi; \
-	test_network_ipv6=false; \
-	if test -n "$(ipv6_flavors)" || \
-	   test -n "$(ipv6_mixed_flavors)"; then \
-		if ping6 -q -c 1 -o   ::1 >/dev/null 2>&1 || \
-		   ping6 -q -c 1 -W 1 ::1 >/dev/null 2>&1 || \
-		   ping  -6 -c 1 -W 1 ::1 >/dev/null 2>&1; then \
-			test_network_ipv6=true; \
-		fi; \
-	fi; \
 	if test -n "$(ipv6_flavors)"; then \
-		if test "$$test_network_ipv6" = "true"; then \
-			echo "ping6 ::1 or ping ::1 succeeded, running IPv6" \
-			  "flavors: $(ipv6_flavors)."; \
-			flavors="$$flavors $(ipv6_flavors)"; \
-		else \
-			echo "ping6 ::1 and ping ::1 failed, skipping IPv6" \
-			  "flavors: $(ipv6_flavors)."; \
-			skip_flavors="$$skip_flavors $(ipv6_flavors)"; \
-		fi; \
+		echo "Running IPv6 flavors: $(ipv6_flavors)."; \
+		flavors="$$flavors $(ipv6_flavors)"; \
 	fi; \
 	test_network_mixed=false; \
 	if test -n "$(mixed_flavors)" || \
@@ -441,8 +422,7 @@ test-network-run: need-chutney-path test-driver $(TESTING_TOR_BINARY) src/tools/
 		fi; \
 	fi; \
 	if test -n "$(ipv6_mixed_flavors)"; then \
-		if test "$$test_network_ipv6" = "true" && \
-		   test "$$test_network_mixed" = "true"; then \
+		if test "$$test_network_mixed" = "true"; then \
 			echo "Running IPv6 mixed flavors:" \
 			  "$(ipv6_mixed_flavors)."; \
 			flavors="$$flavors $(ipv6_mixed_flavors)"; \
@@ -481,7 +461,7 @@ test-network-results:
 need-stem-path:
 	@if test ! -d "$$STEM_SOURCE_DIR"; then \
 		echo '$$STEM_SOURCE_DIR was not set.'; echo; \
-		echo "To run these tests, git clone https://git.torproject.org/stem.git/ ; export STEM_SOURCE_DIR=\`pwd\`/stem"; \
+		echo "To run these tests, git clone https://gitlab.torproject.org/tpo/network-health/stem ; export STEM_SOURCE_DIR=\`pwd\`/stem"; \
 		exit 1; \
 	fi
 
@@ -590,7 +570,7 @@ check-typos:
 			$(top_srcdir)/doc \
 			$(top_srcdir)/contrib \
 			$(top_srcdir)/scripts \
-			$(top_srcdir)/README \
+			$(top_srcdir)/README.md \
 			$(top_srcdir)/ChangeLog \
 			$(top_srcdir)/INSTALL \
 			$(top_srcdir)/ReleaseNotes \
@@ -601,51 +581,6 @@ check-typos:
 		echo "You can install the latest version of misspell here: https://github.com/client9/misspell#install"; \
 	fi
 
-.PHONY: rustfmt
-rustfmt:
-if USE_RUST
-	@if test -x "`which cargo-fmt 2>&1;true`"; then \
-		echo "Formatting Rust code ..."; \
-		(cd "$(top_srcdir)/src/rust" && cargo fmt --all --); \
-	else \
-		echo "Tor uses rustfmt (via cargo-fmt) to format Rust code."; \
-		echo "However, it seems that you don't have rustfmt installed."; \
-		printf "You can install rustfmt by following the directions here:"; \
-		echo " https://github.com/rust-lang-nursery/rustfmt"; \
-	fi
-endif
-
-.PHONY: check-rustfmt
-check-rustfmt:
-if USE_RUST
-	@if test -x "`which cargo-fmt 2>&1;true`"; then \
-		printf "Running rustfmt..."; \
-		(cd "$(top_srcdir)/src/rust" && cargo fmt --all -- --check && echo "done.") || \
-		(echo "**************** check-rustfmt failed. ****************"; \
-		 echo "   Run \`make rustfmt\` to apply the above changes."; \
-		 exit 1); \
-	else \
-		echo "Tor uses rustfmt (via cargo-fmt) to format Rust code."; \
-		echo "However, it seems that you don't have rustfmt installed."; \
-		printf "You can install rustfmt by following the directions here:"; \
-		echo " https://github.com/rust-lang-nursery/rustfmt"; \
-	fi
-endif
-
-.PHONY: clippy
-clippy:
-if USE_RUST
-	@if test -x "`which cargo-clippy 2>&1;true`"; then \
-		echo "Running cargo clippy ..."; \
-		echo "Prepare yourself for the onslaught of suggestions ..."; \
-		(cd "$(top_srcdir)/src/rust" && cargo clippy); \
-	else \
-		echo "Tor can use clippy to lint Rust code."; \
-		echo "However, it seems that you don't have clippy installed."; \
-		echo "You can install the latest version of clippy by following the directions here: https://github.com/rust-lang-nursery/rust-clippy"; \
-	fi
-endif
-
 .PHONY: check-changes
 check-changes:
 if USEPYTHON
@@ -686,7 +621,7 @@ update-copyright:
 	$(PERL) $(top_srcdir)/scripts/maint/updateCopyright.pl $(OWNED_TOR_C_FILES)
 
 .PHONY: autostyle
-autostyle: update-versions rustfmt autostyle-ifdefs rectify-includes
+autostyle: update-versions autostyle-ifdefs rectify-includes
 
 mostlyclean-local:
 	rm -f $(top_builddir)/src/*/*.gc{da,no} $(top_builddir)/src/*/*/*.gc{da,no}
@@ -694,14 +629,6 @@ mostlyclean-local:
 	rm -rf $(top_builddir)/doc/doxygen
 	rm -rf $(TEST_NETWORK_ALL_LOG_DIR)
 
-clean-local:
-	rm -rf $(top_builddir)/src/rust/target
-	rm -rf $(top_builddir)/src/rust/.cargo/registry
-
-if USE_RUST
-distclean-local: distclean-rust
-endif
-
 # This relies on some internal details of how automake implements
 # distcheck.  We check two directories because automake-1.15 changed
 # from $(distdir)/_build to $(distdir)/_build/sub.

Makefile.nmake

-all:
-	cd src/common
-	$(MAKE) /F Makefile.nmake
-	cd ../../src/ext
-	$(MAKE) /F Makefile.nmake
-	cd ../../src/or
-	$(MAKE) /F Makefile.nmake
-	cd ../../src/test
-	$(MAKE) /F Makefile.nmake
-
-clean:
-	cd src/common
-	$(MAKE) /F Makefile.nmake clean
-	cd ../../src/ext
-	$(MAKE) /F Makefile.nmake clean
-	cd ../../src/or
-	$(MAKE) /F Makefile.nmake clean
-	cd ../../src/test
-	$(MAKE) /F Makefile.nmake clean

README

-Tor protects your privacy on the internet by hiding the connection
-between your Internet address and the services you use. We believe Tor
-is reasonably secure, but please ensure you read the instructions and
-configure it properly.
-
-To build Tor from source:
-        ./configure && make && make install
-
-To build Tor from a just-cloned git repository:
-        sh autogen.sh && ./configure && make && make install
-
-Home page:
-        https://www.torproject.org/
-
-Download new versions:
-        https://www.torproject.org/download/download.html
-
-Documentation, including links to installation and setup instructions:
-        https://www.torproject.org/docs/documentation.html
-
-Making applications work with Tor:
-        https://gitlab.torproject.org/legacy/trac/-/wikis/doc/TorifyHOWTO
-
-Frequently Asked Questions:
-        https://www.torproject.org/docs/faq.html
-
-Release timeline:
-        https://gitlab.torproject.org/tpo/core/team/-/wikis/NetworkTeam/CoreTorReleases
-
-To get started working on Tor development:
-        See the doc/HACKING directory.

README.md

+Tor protects your privacy on the internet by hiding the connection between
+your Internet address and the services you use. We believe Tor is reasonably
+secure, but please ensure you read the instructions and configure it properly.
+
+## Build
+
+To build Tor from source:
+
+```
+./configure
+make
+make install
+```
+
+To build Tor from a just-cloned git repository:
+
+```
+./autogen.sh
+./configure
+make
+make install
+```
+
+## Releases
+
+The tarballs, checksums and signatures can be found here: https://dist.torproject.org
+
+- Checksum: `<tarball-name>.sha256sum`
+- Signatures: `<tarball-name>.sha256sum.asc`
+
+### Schedule
+
+You can find our release schedule here:
+
+- https://gitlab.torproject.org/tpo/core/team/-/wikis/NetworkTeam/CoreTorReleases
+
+### Keys that CAN sign a release
+
+The following keys are the maintainers of this repository. One or many of
+these keys can sign the releases, do NOT expect them all:
+
+- Alexander Færøy:
+    [514102454D0A87DB0767A1EBBE6A0531C18A9179](https://keys.openpgp.org/vks/v1/by-fingerprint/1C1BC007A9F607AA8152C040BEA7B180B1491921)
+- David Goulet:
+    [B74417EDDF22AC9F9E90F49142E86A2A11F48D36](https://keys.openpgp.org/vks/v1/by-fingerprint/B74417EDDF22AC9F9E90F49142E86A2A11F48D36)
+- Nick Mathewson:
+    [2133BC600AB133E1D826D173FE43009C4607B1FB](https://keys.openpgp.org/vks/v1/by-fingerprint/2133BC600AB133E1D826D173FE43009C4607B1FB)
+
+## Development
+
+See our hacking documentation in [doc/HACKING/](./doc/HACKING).
+
+## Resources
+
+Home page:
+
+- https://www.torproject.org/
+
+Download new versions:
+
+- https://www.torproject.org/download/tor
+
+How to verify Tor source:
+
+- https://support.torproject.org/little-t-tor/
+
+Documentation and Frequently Asked Questions:
+
+- https://support.torproject.org/
+
+How to run a Tor relay:
+
+- https://community.torproject.org/relay/ 

changes/40241

-  o Minor bugfixes (compilation):
-    - Fix a compilation warning about unreachable fallthrough annotations
-      when building with "--enable-all-bugs-are-fatal" on some compilers.
-      Fixes bug 40241; bugfix on 0.3.5.4-alpha.

changes/40241_v2

-  o Minor bugfixes (compilation):
-    - Fix another warning about unreachable fallthrough annotations
-      when building with "--enable-all-bugs-are-fatal" on some compilers.
-      Fixes bug 40241; bugfix on 0.4.5.3-rc.

changes/autoconf-2.70

-  o Minor features (compilation):
-    - Make the autoconf script build correctly with autoconf versions 2.70
-      and later. Closes part of ticket 40335.

changes/bug24857

-  o Minor bugfixes (directory cache, performance, windows):
-    - Limit the number of items in the consensus diff cache to 64 on Windows.
-      We hope this will resolve an issue where Windows relay operators reported
-      Tor using 100% CPU while we investigate better solutions. Fixes bug 24857;
-      bugfix on 0.3.1.1-alpha.
-