tor

commit 4bda4534a569a737f3ee47222336be06a0cc36f2
parent 8984a08f1822839c09e0f084407e9c95ec42569a
Author: David Goulet <dgoulet@torproject.org>
Date:   Mon,  6 Oct 2025 12:59:26 +0000

Merge branch 'typos2' into 'main'

simple comment and whitespace fixes

See merge request tpo/core/tor!939
Diffstat:
M
src/core/or/connection_or.c
 | 
7
-------
M
src/lib/log/util_bug.c
 | 
2
+-
M
src/lib/process/restrict.c
 | 
4
++--

3 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/core/or/connection_or.c b/src/core/or/connection_or.c
@@ -413,7 +413,6 @@ connection_or_state_publish(const or_connection_t *conn, uint8_t state)
 /** Call this to change or_connection_t states, so the owning channel_tls_t can
  * be notified.
  */
-
 MOCK_IMPL(void,
 connection_or_change_state,(or_connection_t *conn, uint8_t state))
 {
@@ -429,7 +428,6 @@ connection_or_change_state,(or_connection_t *conn, uint8_t state))
 /** Return the number of circuits using an or_connection_t; this used to
  * be an or_connection_t field, but it got moved to channel_t and we
  * shouldn't maintain two copies. */
-
 MOCK_IMPL(int,
 connection_or_get_num_circuits, (or_connection_t *conn))
 {
@@ -520,7 +518,6 @@ var_cell_new(uint16_t payload_len)
 /**
  * Copy a var_cell_t
  */
-
 var_cell_t *
 var_cell_copy(const var_cell_t *src)
 {
@@ -1448,7 +1445,6 @@ connection_or_notify_error(or_connection_t *conn,
  *
  * Return the launched conn, or NULL if it failed.
  */
-
 MOCK_IMPL(or_connection_t *,
 connection_or_connect, (const tor_addr_t *_addr, uint16_t port,
                         const char *id_digest,
@@ -1595,7 +1591,6 @@ connection_or_connect, (const tor_addr_t *_addr, uint16_t port,
  * rather than connections, use channel_mark_for_close(); see also
  * the comment on that function in channel.c.
  */
-
 void
 connection_or_close_normally(or_connection_t *orconn, int flush)
 {
@@ -1616,7 +1611,6 @@ connection_or_close_normally(or_connection_t *orconn, int flush)
 /** Mark orconn for close and transition the associated channel, if any, to
  * the error state.
  */
-
 MOCK_IMPL(void,
 connection_or_close_for_error,(or_connection_t *orconn, int flush))
 {
@@ -1933,7 +1927,6 @@ connection_or_client_learned_peer_id(or_connection_t *conn,
 /** Return when we last used this channel for client activity (origin
  * circuits). This is called from connection.c, since client_used is now one
  * of the timestamps in channel_t */
-
 time_t
 connection_or_client_used(or_connection_t *conn)
 {
diff --git a/src/lib/log/util_bug.c b/src/lib/log/util_bug.c
@@ -134,7 +134,7 @@ tor_bug_occurred_(const char *fname, unsigned int line,
     " (Future instances of this warning will be silenced.)": "";
   if (! once) {
     // _once assertions count from the macro directly so we count them as many
-    // time as they are reached, and not just once.
+    // times as they are reached, and not just once.
     tor_bug_increment_count_();
   }
   if (! expr) {
diff --git a/src/lib/process/restrict.c b/src/lib/process/restrict.c
@@ -177,8 +177,8 @@ tor_mlockall(void)
  * return 0 and <b>max_out</b> is set to the current maximum value returned
  * by getrlimit().
  *
- * Otherwise, return 0 and store the maximum we found inside <b>max_out</b>
- * and set <b>max_sockets</b> with that value as well.*/
+ * Otherwise: return 0, store the maximum we found inside <b>max_out</b>,
+ * and call set_max_sockets() with that value as well.*/
 int
 set_max_file_descriptors(rlim_t limit, int *max_out)
 {