From c793cf338b92ba2aee0d556a041fefeb2656ee04 Mon Sep 17 00:00:00 2001 From: teor Date: Wed, 7 Nov 2018 18:46:39 +1000 Subject: [PATCH 1/3] doc: Remove an outdated sentence from KeepalivePeriod in the man page --- doc/tor.1.txt | 4 +--- 1 file changed, 1 insertion(+), 3 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 From a7aa3f76ecfceb4f7efaab4bc5744e422735c396 Mon Sep 17 00:00:00 2001 From: teor Date: Wed, 7 Nov 2018 18:47:42 +1000 Subject: [PATCH 2/3] comment: Fix a typo in nodes_in_same_family() --- src/feature/nodelist/nodelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) && From 9daf06d171035582c0fca3516f265a59fffc7bbf Mon Sep 17 00:00:00 2001 From: teor Date: Wed, 7 Nov 2018 18:59:08 +1000 Subject: [PATCH 3/3] comment: circuit_list_path_impl() does not check Named any more --- src/core/or/circuitbuild.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 verbose is false, allocate and return a comma-separated list of * the currently built elements of circ. If verbose is true, also * list information about link status in a more verbose format using spaces. - * If verbose_names is false, give nicknames for Named routers and hex - * digests for others; if verbose_names is true, use $DIGEST=Name style - * names. + * If verbose_names is false, give hex digests; if verbose_names + * is true, use $DIGEST=Name style names. */ static char * circuit_list_path_impl(origin_circuit_t *circ, int verbose, int verbose_names)