[tor-commits] [tor/master] nodelist: Fix a comment and a log message

nickm at torproject.org nickm at torproject.org
Tue Jun 9 19:45:23 UTC 2020


commit 8829d2d64428675e205889dc0af22cd2d98d53f0
Author: teor <teor at riseup.net>
Date:   Mon May 11 17:01:49 2020 +1000

    nodelist: Fix a comment and a log message
---
 src/feature/nodelist/node_select.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/feature/nodelist/node_select.c b/src/feature/nodelist/node_select.c
index 8e7da1ae2..fe88b7230 100644
--- a/src/feature/nodelist/node_select.c
+++ b/src/feature/nodelist/node_select.c
@@ -992,7 +992,7 @@ router_choose_random_node(smartlist_t *excludedsmartlist,
       smartlist_add(excludednodes, (node_t*)node);
     } else if (rendezvous_v3 &&
                !node_supports_v3_rendezvous_point(node)) {
-      /* Exclude relays that do not support to rendezvous for a hidden service
+      /* Exclude relays that can not become a rendezvous for a hidden service
        * version 3. */
       smartlist_add(excludednodes, (node_t*)node);
     }
@@ -1030,11 +1030,12 @@ router_choose_random_node(smartlist_t *excludedsmartlist,
   if (!choice && (need_uptime || need_capacity || need_guard || pref_addr)) {
     /* try once more -- recurse but with fewer restrictions. */
     log_info(LD_CIRC,
-             "We couldn't find any live%s%s%s routers; falling back "
+             "We couldn't find any live%s%s%s%s routers; falling back "
              "to list of all routers.",
              need_capacity?", fast":"",
              need_uptime?", stable":"",
-             need_guard?", guard":"");
+             need_guard?", guard":"",
+             pref_addr?", preferred address":"");
     flags &= ~ (CRN_NEED_UPTIME|CRN_NEED_CAPACITY|CRN_NEED_GUARD|
                 CRN_PREF_ADDR);
     choice = router_choose_random_node(





More information about the tor-commits mailing list