commit 9bd73da7cf23ac63ad89beda4d72eca2535e90bd Author: Roger Dingledine arma@torproject.org Date: Wed Apr 8 19:13:52 2020 -0400

fix typos from #32542 --- doc/tor.1.txt | 2 +- src/feature/hs/hs_circuit.c | 4 ++-- src/feature/hs/hs_client.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 3cd9a2403..fbe2915cf 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1592,7 +1592,7 @@ The following options are useful only for clients (that is, if

X'F7' Onion Service Introduction Timed Out

- Similar to X'F2' code but in this case, all introduction attemps + Similar to X'F2' code but in this case, all introduction attempts have failed due to a time out. (v3 only)

// Anchor only for formatting, not visible in the man page. diff --git a/src/feature/hs/hs_circuit.c b/src/feature/hs/hs_circuit.c index 53f574c14..447f664f8 100644 --- a/src/feature/hs/hs_circuit.c +++ b/src/feature/hs/hs_circuit.c @@ -632,7 +632,7 @@ cleanup_on_close_client_circ(circuit_t *circ) hs_client_circuit_cleanup_on_close(circ); } /* It is possible the circuit has an HS purpose but no identifier (rend_data - * or hs_ident). Thus possible that this passess through. */ + * or hs_ident). Thus possible that this passes through. */ }

/** Helper: cleanup function for client circuit. This is for every HS version. @@ -648,7 +648,7 @@ cleanup_on_free_client_circ(circuit_t *circ) hs_client_circuit_cleanup_on_free(circ); } /* It is possible the circuit has an HS purpose but no identifier (rend_data - * or hs_ident). Thus possible that this passess through. */ + * or hs_ident). Thus possible that this passes through. */ }

/* ========== */ diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index 40647ac25..cf2f165c9 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -992,7 +992,7 @@ intro_points_all_timed_out(const ed25519_public_key_t *service_pk) return ret; }

-/** Called when a rendezvous circuit has timed out. Every streams attached to +/** Called when a rendezvous circuit has timed out. Every stream attached to * the circuit will get set with the SOCKS5_HS_REND_FAILED (0xF3) extended * error code so if the connection to the rendezvous point ends up not * working, this code could be sent back as a reason. */ @@ -1001,7 +1001,7 @@ socks_report_rend_circuit_timed_out(const origin_circuit_t *rend_circ) { tor_assert(rend_circ);

- /* For each entry connections attached to this rendezvous circuit, report + /* For each entry connection attached to this rendezvous circuit, report * the error. */ for (edge_connection_t *edge = rend_circ->p_streams; edge; edge = edge->next_stream) { @@ -1858,10 +1858,10 @@ hs_client_circuit_cleanup_on_close(const circuit_t *circ) case CIRCUIT_PURPOSE_C_REND_READY: case CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED: case CIRCUIT_PURPOSE_C_REND_JOINED: - /* Report extended SOCKS error code when a rendezvous circuit timeouts. + /* Report extended SOCKS error code when a rendezvous circuit times out. * This MUST be done on_close() because it is possible the entry * connection would get closed before the circuit is freed and thus - * failing to report the error code. */ + * would fail to report the error code. */ if (has_timed_out) { socks_report_rend_circuit_timed_out(CONST_TO_ORIGIN_CIRCUIT(circ)); }