nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tor-gitlab/mr/631' into maint-0.4.5

Browse Source
This commit is contained in:
David Goulet 2022-10-26 14:21:35 -04:00
commit 7a851e8983
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket40688 Normal file
View File

@ -0,0 +1,3 @@
o Directory authority changes (Faravahar):
- Remove Faravahar until its operator, Sina, set it back up online outside
of Team Cymru network. Closes ticket 40688.

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

@ -22,9 +22,6 @@
"v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
"ipv6=[2001:67c:289c::9]:80 " "ipv6=[2001:67c:289c::9]:80 "
"171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
"Faravahar orport=443 "
"v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
"154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
"longclaw orport=443 " "longclaw orport=443 "
"v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
"199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",

4
src/test/test_config.c
View File

@ -2007,8 +2007,8 @@ test_config_adding_default_trusted_dir_servers(void *arg)
/* Assume we have eight V3 authorities */ /* Assume we have eight 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, 9); tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 8);
tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 10); tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 9);
done: done:
clear_dir_servers(); clear_dir_servers();