Merge branch 'prop330' into 'main' (f7ea2352) · Commits · The Tor Project / Core / Chutney

.gitlab-ci.yml

+2 −2

Original line number	Diff line number	Diff line
		@@ -176,8 +176,8 @@ build-arti:
		variables:
		JOB_ARTI_REPO: "https://gitlab.torproject.org/tpo/core/arti.git"
		# This can be a tag or commit-hash.
		# main @ 2025-06-11.
		JOB_ARTI_REV: "0a677a9b42558f23ceb1d46e6ee1d4251bd8acd7"
		# main @ 2025-09-16.
		JOB_ARTI_REV: "e67444c5d417d3a527ba282eee8c18d9e1e32c2d"
		# comma-separated list of features to build with
		JOB_ARTI_FEATURES: onion-service-service
		JOB_ARTI_PROFILE: "quicktest"

+35 −16

Original line number	Diff line number	Diff line
		@@ -55,22 +55,41 @@ def tor_config(net: TorNet.Network) -> dict[str, object]:
		for auth in net.authorities
		if auth.alt_dir_auth
		],
		"authorities": [
		{
		"name": auth.nick,
		"v3ident": auth.v3id,
		"dirports": (
		"authorities": {
		"v3idents": [
		auth.v3id for auth in net.authorities if auth.alt_dir_auth
		],
		"uploads": [
		[f"{auth.ipv4}:{auth.dirport}"]
		+ (
		[f"{auth.ipv6.unwrap()}:{auth.dirport}"]
		if auth.ipv6.is_some()
		else []
		)
		),
		}
		for auth in net.authorities
		if auth.alt_dir_auth
		],
		"downloads": [
		[f"{auth.ipv4}:{auth.dirport}"]
		+ (
		[f"{auth.ipv6.unwrap()}:{auth.dirport}"]
		if auth.ipv6.is_some()
		else []
		)
		for auth in net.authorities
		if auth.alt_dir_auth
		],
		"votes": [
		[f"{auth.ipv4}:{auth.dirport}"]
		+ (
		[f"{auth.ipv6.unwrap()}:{auth.dirport}"]
		if auth.ipv6.is_some()
		else []
		)
		for auth in net.authorities
		if auth.alt_dir_auth
		],
		},
		},
		"bridges": {
		"bridges": [