Merge branch 'maint-0.4.8' into release-0.4.8

changes/ticket40689

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

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",

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();