Merge branch 'maint-0.3.5' into release-0.3.5

3 files changed, 4 insertions, 7 deletions

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 2d5237c843..019c8af757 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -635,9 +635,7 @@ GENERAL OPTIONS
 
 [[KeepalivePeriod]] **KeepalivePeriod** __NUM__::
     To keep firewalls from expiring connections, send a padding keepalive cell
-    every NUM seconds on open connections that are in use. If the connection
-    has no open circuits, it will instead be closed after NUM seconds of
-    idleness. (Default: 5 minutes)
+    every NUM seconds on open connections that are in use. (Default: 5 minutes)
 
 [[Log]] **Log** __minSeverity__[-__maxSeverity__] **stderr**|**stdout**|**syslog**::
     Send all messages between __minSeverity__ and __maxSeverity__ to the standard
diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c
index a69457571e..da137accc3 100644
--- a/src/core/or/circuitbuild.c
+++ b/src/core/or/circuitbuild.c
@@ -255,9 +255,8 @@ get_unique_circ_id_by_chan(channel_t *chan)
 /** If <b>verbose</b> is false, allocate and return a comma-separated list of
  * the currently built elements of <b>circ</b>. If <b>verbose</b> is true, also
  * list information about link status in a more verbose format using spaces.
- * If <b>verbose_names</b> is false, give nicknames for Named routers and hex
- * digests for others; if <b>verbose_names</b> is true, use $DIGEST=Name style
- * names.
+ * If <b>verbose_names</b> is false, give hex digests; if <b>verbose_names</b>
+ * is true, use $DIGEST=Name style names.
  */
 static char *
 circuit_list_path_impl(origin_circuit_t *circ, int verbose, int verbose_names)
diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c
index a98a5c8655..c77ef443d0 100644
--- a/src/feature/nodelist/nodelist.c
+++ b/src/feature/nodelist/nodelist.c
@@ -1932,7 +1932,7 @@ nodes_in_same_family(const node_t *node1, const node_t *node2)
       return 1;
   }
 
-  /* Are they in the same option because the user says they are? */
+  /* Are they in the same family because the user says they are? */
   if (options->NodeFamilySets) {
     SMARTLIST_FOREACH(options->NodeFamilySets, const routerset_t *, rs, {
         if (routerset_contains_node(rs, node1) &&