Correct grammatical errors in tor comments

Avoid using gender for things that don't have it.

Avoid assigning a gender to tor users.

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index e742a5614f3462f05d9cd4f2129ea597e3fb163d..a6fffdfd46baa2ff1e9363cdff98ac43a80e5b6b 100644 (file)
--- 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 8ee163474542f951540c64f0d0450fd83700b5d9..d2d88159df9930e8441fa471ec46ed0d8e18aa35 100644 (file)
--- 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 c0031047e754060919ba98c1826a59505495f637..efe804df2801b32106aa9bba19fbb4d74aaa64dc 100644 (file)
--- 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 73e4d19369dccc82a88e45de01aa3dea1341b472..d778eb3b4fc5dd694e0a51d7f96af613775293ae 100644 (file)
--- 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 e1bdcb01510ff53f699e87fc91d2b211da74e6cc..c1fa37f24235f81d2b42e78b1c9487b6605582e8 100644 (file)
--- 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 bf71fc30c0f4537b235579a1bfeb40a8c784ff54..789c53da17c1bdda4d3849157fb9892f78e80d57 100644 (file)
--- 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 f159f7d0a6c61ab3ceda1d281f13ae9886b25f46..810fa0d9aa8606740550c18e433ecb903ebfd252 100644 (file)
--- 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 ee2f041dbd7d5538080f2f5ad8e572cb9c42cc4e..aea51a165b3e2063f2f6f7fbb84c518aed2d6b31 100644 (file)
--- 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 81b8db25080ef50def1e971c663c6d880ce7aab2..5a3af85be8256baf0a72b884cd42fe92229ea030 100644 (file)
--- 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);