[tor-commits] [tor/master] Correct grammatical errors in tor comments
nickm at torproject.org
nickm at torproject.org
Tue Jan 26 15:01:45 UTC 2016
commit c927b6cb1aff4588a5f3729f8cc919ef3616d73e
Author: teor (Tim Wilson-Brown) <teor2345 at gmail.com>
Date: Tue Jan 26 13:45:01 2016 +1100
Correct grammatical errors in tor comments
Avoid using gender for things that don't have it.
Avoid assigning a gender to tor users.
---
src/or/circuituse.c | 2 +-
src/or/config.c | 2 +-
src/or/connection.c | 2 +-
src/or/connection_or.c | 4 ++--
src/or/directory.c | 2 +-
src/or/entrynodes.c | 2 +-
src/or/ext_orport.c | 2 +-
src/or/relay.c | 2 +-
src/or/transports.c | 2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index e742a56..a6fffdf 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -2241,7 +2241,7 @@ consider_recording_trackhost(const entry_connection_t *conn,
char fp[HEX_DIGEST_LEN+1];
/* Search the addressmap for this conn's destination. */
- /* If he's not in the address map.. */
+ /* If they're not in the address map.. */
if (!options->TrackHostExits ||
addressmap_have_mapping(conn->socks_request->address,
options->TrackHostExitsExpire))
diff --git a/src/or/config.c b/src/or/config.c
index 8ee1634..d2d8815 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1517,7 +1517,7 @@ options_act(const or_options_t *old_options)
#endif
/* If we are a bridge with a pluggable transport proxy but no
- Extended ORPort, inform the user that she is missing out. */
+ Extended ORPort, inform the user that they are missing out. */
if (server_mode(options) && options->ServerTransportPlugin &&
!options->ExtORPort_lines) {
log_notice(LD_CONFIG, "We use pluggable transports but the Extended "
diff --git a/src/or/connection.c b/src/or/connection.c
index c003104..efe804d 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1440,7 +1440,7 @@ connection_handle_listener_read(connection_t *conn, int new_type)
if (!SOCKET_OK(news)) { /* accept() error */
int e = tor_socket_errno(conn->s);
if (ERRNO_IS_ACCEPT_EAGAIN(e)) {
- return 0; /* he hung up before we could accept(). that's fine. */
+ return 0; /* they hung up before we could accept(). that's fine. */
} else if (ERRNO_IS_RESOURCE_LIMIT(e)) {
warn_too_many_conns();
return 0;
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 73e4d19..d778eb3 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1581,7 +1581,7 @@ connection_or_nonopen_was_started_here(or_connection_t *conn)
}
/** <b>Conn</b> just completed its handshake. Return 0 if all is well, and
- * return -1 if he is lying, broken, or otherwise something is wrong.
+ * return -1 if they are lying, broken, or otherwise something is wrong.
*
* If we initiated this connection (<b>started_here</b> is true), make sure
* the other side sent a correctly formed certificate. If I initiated the
@@ -1754,7 +1754,7 @@ connection_or_client_used(or_connection_t *conn)
*
* Make sure we are happy with the person we just handshaked with.
*
- * If he initiated the connection, make sure he's not already connected,
+ * If they initiated the connection, make sure they're not already connected,
* then initialize conn from the information in router.
*
* If all is successful, call circuit_n_conn_done() to handle events
diff --git a/src/or/directory.c b/src/or/directory.c
index e1bdcb0..c1fa37f 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -715,7 +715,7 @@ connection_dir_request_failed(dir_connection_t *conn)
return; /* this was a test fetch. don't retry. */
}
if (!entry_list_is_constrained(get_options()))
- router_set_status(conn->identity_digest, 0); /* don't try him again */
+ router_set_status(conn->identity_digest, 0); /* don't try this one again */
if (conn->base_.purpose == DIR_PURPOSE_FETCH_SERVERDESC ||
conn->base_.purpose == DIR_PURPOSE_FETCH_EXTRAINFO) {
log_info(LD_DIR, "Giving up on serverdesc/extrainfo fetch from "
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index bf71fc3..789c53d 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -1152,7 +1152,7 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory,
} else {
/* Try to have at least 2 choices available. This way we don't
* get stuck with a single live-but-crummy entry and just keep
- * using him.
+ * using it.
* (We might get 2 live-but-crummy entry guards, but so be it.) */
preferred_min = 2;
}
diff --git a/src/or/ext_orport.c b/src/or/ext_orport.c
index f159f7d..810fa0d 100644
--- a/src/or/ext_orport.c
+++ b/src/or/ext_orport.c
@@ -151,7 +151,7 @@ init_ext_or_cookie_authentication(int is_enabled)
}
/** Read data from <b>conn</b> and see if the client sent us the
- * authentication type that she prefers to use in this session.
+ * authentication type that they prefer to use in this session.
*
* Return -1 if we received corrupted data or if we don't support the
* authentication type. Return 0 if we need more data in
diff --git a/src/or/relay.c b/src/or/relay.c
index ee2f041..aea51a1 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -833,7 +833,7 @@ connection_ap_process_end_not_open(
}
}
}
- /* check if he *ought* to have allowed it */
+ /* check if the exit *ought* to have allowed it */
adjust_exit_policy_from_exitpolicy_failure(circ,
conn,
diff --git a/src/or/transports.c b/src/or/transports.c
index 81b8db2..5a3af85 100644
--- a/src/or/transports.c
+++ b/src/or/transports.c
@@ -1100,7 +1100,7 @@ parse_smethod_line(const char *line, managed_proxy_t *mp)
smartlist_add(mp->transports, transport);
- /* For now, notify the user so that he knows where the server
+ /* For now, notify the user so that they know where the server
transport is listening. */
log_info(LD_CONFIG, "Server transport %s at %s:%d.",
method_name, address, (int)port);
More information about the tor-commits
mailing list