tor

commit 84d587bed87f26c22f47ca4c3fdd6b6ab4e232db
parent e77ece3b31e9e16d576f28e6f19b3c74599b2b1c
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 19 Sep 2017 08:24:49 -0400

Merge remote-tracking branch 'teor/minor-comments'

Diffstat:
M
src/or/connection.c
 | 
2
+-
M
src/or/connection_or.c
 | 
7
++++---

2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/or/connection.c b/src/or/connection.c
@@ -812,7 +812,7 @@ connection_mark_for_close_(connection_t *conn, int line, const char *file)
  * CONN_TYPE_OR checks; this should be called when you either are sure that
  * if this is an or_connection_t the controlling channel has been notified
  * (e.g. with connection_or_notify_error()), or you actually are the
- * connection_or_close_for_error() or connection_or_close_normally function.
+ * connection_or_close_for_error() or connection_or_close_normally() function.
  * For all other cases, use connection_mark_and_flush() instead, which
  * checks for or_connection_t properly, instead.  See below.
  */
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
@@ -1743,8 +1743,9 @@ connection_or_client_learned_peer_id(or_connection_t *conn,
   return 0;
 }
 
-/** Return when a client used this, for connection.c, since client_used
- * is now one of the timestamps of channel_t */
+/** 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)
@@ -1758,7 +1759,7 @@ connection_or_client_used(or_connection_t *conn)
 
 /** The v1/v2 TLS handshake is finished.
  *
- * Make sure we are happy with the person we just handshaked with.
+ * Make sure we are happy with the peer we just handshaked with.
  *
  * If they initiated the connection, make sure they're not already connected,
  * then initialize conn from the information in router.