diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/app/config/auth_dirs.inc | 3 | ||||
| -rw-r--r-- | src/core/or/circuitbuild.c | 2 | ||||
| -rw-r--r-- | src/core/or/conflux_params.c | 2 | ||||
| -rw-r--r-- | src/feature/relay/dns.c | 4 | ||||
| -rw-r--r-- | src/test/test_config.c | 6 |
5 files changed, 10 insertions, 7 deletions
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/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index dc1912294b..878436339b 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -1343,7 +1343,7 @@ circuit_finish_handshake(origin_circuit_t *circ, hop->ccontrol = congestion_control_new(¶ms, CC_PATH_EXIT); } else { /* This is likely directory requests, which should block on orconn - * before congestion control, but lets give them the lower sbws + * before congestion control, but let's give them the lower sbws * param set anyway just in case. */ log_info(LD_CIRC, "Unexpected path length %d for exit circuit %d, purpose %d", diff --git a/src/core/or/conflux_params.c b/src/core/or/conflux_params.c index 65728032f9..b6109625ac 100644 --- a/src/core/or/conflux_params.c +++ b/src/core/or/conflux_params.c @@ -178,7 +178,7 @@ conflux_is_enabled(const circuit_t *circ) log_warn(LD_GENERAL, "This tor is a relay and ConfluxEnabled is set to 0. " "We would ask you to please write to us on " - "tor-relay@lists.torproject.org or file a bug explaining " + "tor-relays@lists.torproject.org or file a bug explaining " "why you have disabled this option. Without news from you, " "we might end up marking your relay as a BadExit."); tor_free(msg); diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index 129f6209d7..eb31678189 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -1184,8 +1184,8 @@ dns_found_answer(const char *address, uint8_t query_type, * resolution. * * Do this by sending a RELAY_RESOLVED cell (if the pending stream had sent us - * RELAY_RESOLVE cell), or by launching an exit connection (if the pending - * stream had send us a RELAY_BEGIN cell). + * a RELAY_RESOLVE cell), or by launching an exit connection (if the pending + * stream had sent us a RELAY_BEGIN cell). */ static void inform_pending_connections(cached_resolve_t *resolve) 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(); |