nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ticket40689_048_01' into 'main'

Browse Source 
dirauth: Add new faravahar

Closes #40689

See merge request tpo/core/tor!819
This commit is contained in:
David Goulet 2024-05-30 16:29:56 +00:00
commit 5c0a0f7da0
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket40689 Normal file
View File

@ -0,0 +1,3 @@
o Minor feature (dirauth):
- Add back faravahar with a new address and new keys. Closes 40689.

3
src/app/config/auth_dirs.inc
View File

@ -29,3 +29,6 @@
"v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 " "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
"ipv6=[2620:13:4000:6000::1000:118]:443 " "ipv6=[2620:13:4000:6000::1000:118]:443 "
"204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413", "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",

6
src/test/test_config.c
View File

@ -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(get_n_authorities(BRIDGE_DIRINFO), OP_EQ, 1);
tt_int_op(smartlist_len(router_get_fallback_dir_servers()), 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); add_default_trusted_dir_authorities(V3_DIRINFO);
tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 8); tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 9);
tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 9); tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 10);
done: done:
clear_dir_servers(); clear_dir_servers();