Merge branch 'maint-0.4.8'

src/feature/nodelist/node_select.h

@@ -29,7 +29,7 @@ typedef enum router_crn_flags_t {
   /* On clients, if choosing a node for a direct connection, only provide
    * nodes that satisfy ClientPreferIPv6OR. */
   CRN_PREF_ADDR = 1<<5,
-  /* On clients, indiate that we need a HS related circuit (IP, HSDir or RP).
+  /* On clients, indicate that we need a HS related circuit (IP, HSDir, or RP).
    * This is used in order to avoid certain nodes for these purposes. */
   CRN_FOR_HS = 1<<6,
   /* On clients, only provide nodes that can initiate IPv6 extends. */

src/feature/nodelist/routerlist.c

@@ -600,7 +600,7 @@ router_can_choose_node(const node_t *node, int flags)
     return false;
   if (initiate_ipv6_extend && !node_supports_initiating_ipv6_extends(node))
     return false;
-  /* MiddleOnly node should never be used for HS ndpoints (IP, RP, HSDir). */
+  /* MiddleOnly node should never be used for HS endpoints (IP, RP, HSDir). */
   if (for_hs && node->is_middle_only) {
     return false;
   }