aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2024-05-30 09:09:39 -0400
committerDavid Goulet <dgoulet@torproject.org>2024-05-30 09:49:27 -0400
commit39ba9ce0d7913ceb53fc1f1b4e2c2c129099fc4f (patch)
treea96baead630177b5afa7b683337a2f9f44812f97
parent7708f9a4eab610ad199fe6a6fe04ba254efa24e9 (diff)
downloadtor-39ba9ce0d7913ceb53fc1f1b4e2c2c129099fc4f.tar.gz
tor-39ba9ce0d7913ceb53fc1f1b4e2c2c129099fc4f.zip
dirauth: Add new faravahar
Brand new address, brand new keys, brand new day. Closes #40689 Signed-off-by: David Goulet <dgoulet@torproject.org>
-rw-r--r--changes/ticket406893
-rw-r--r--src/app/config/auth_dirs.inc3
-rw-r--r--src/test/test_config.c6
3 files changed, 9 insertions, 3 deletions
diff --git a/changes/ticket40689 b/changes/ticket40689
new file mode 100644
index 0000000000..735d3df02f
--- /dev/null
+++ b/changes/ticket40689
@@ -0,0 +1,3 @@
+ o Minor feature (dirauth):
+ - Add back faravahar with a new address and new keys. Closes 40689.
+
diff --git a/src/app/config/auth_dirs.inc b/src/app/config/auth_dirs.inc
index 2f63cc8e8c..758cf177cc 100644
--- a/src/app/config/auth_dirs.inc
+++ b/src/app/config/auth_dirs.inc
@@ -29,3 +29,6 @@
"v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
"ipv6=[2620:13:4000:6000::1000:118]:443 "
"204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
+"faravahar orport=443 "
+ "v3ident=70849B868D606BAECFB6128C5E3D782029AA394F "
+ "216.218.219.41:80 E3E4 2D35 F801 C9D5 AB23 584E 0025 D56F E2B3 3396",
diff --git a/src/test/test_config.c b/src/test/test_config.c
index a53d0b8227..c45b10657b 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -2003,10 +2003,10 @@ test_config_adding_default_trusted_dir_servers(void *arg)
tt_int_op(get_n_authorities(BRIDGE_DIRINFO), OP_EQ, 1);
tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 1);
- /* Assume we have eight V3 authorities */
+ /* Assume we have nine V3 authorities */
add_default_trusted_dir_authorities(V3_DIRINFO);
- tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 8);
- tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 9);
+ tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 9);
+ tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 10);
done:
clear_dir_servers();