4 files changed, 8 insertions, 1 deletions
diff --git a/src/feature/dirparse/ns_parse.c b/src/feature/dirparse/ns_parse.c
index 947b3810a4..cd3e2731be 100644
--- a/src/feature/dirparse/ns_parse.c
+++ b/src/feature/dirparse/ns_parse.c
@@ -434,6 +434,8 @@ routerstatus_parse_entry_from_string(memarea_t *area,
         rs->is_possible_guard = 1;
       else if (!strcmp(tok->args[i], "BadExit"))
         rs->is_bad_exit = 1;
+      else if (!strcmp(tok->args[i], "MiddleOnly"))
+        rs->is_middle_only = 1;
       else if (!strcmp(tok->args[i], "Authority"))
         rs->is_authority = 1;
       else if (!strcmp(tok->args[i], "Unnamed") &&
diff --git a/src/feature/dirparse/parsecommon.h b/src/feature/dirparse/parsecommon.h
index 0f343e9c62..675c5f68d5 100644
--- a/src/feature/dirparse/parsecommon.h
+++ b/src/feature/dirparse/parsecommon.h
@@ -172,6 +172,7 @@ typedef enum {
   R3_DESC_AUTH_KEY,
   R3_DESC_AUTH_CLIENT,
   R3_ENCRYPTED,
+  R3_FLOW_CONTROL,
 
   R_IPO_IDENTIFIER,
   R_IPO_IP_ADDRESS,
diff --git a/src/feature/dirparse/policy_parse.c b/src/feature/dirparse/policy_parse.c
index abf3df36c6..8d30410f58 100644
--- a/src/feature/dirparse/policy_parse.c
+++ b/src/feature/dirparse/policy_parse.c
@@ -192,6 +192,10 @@ router_parse_addr_policy_private(directory_token_t *tok)
   uint16_t port_min, port_max;
   addr_policy_t result;
 
+  /* Safeguard: always flag non canonical because it is a stack allocated
+   * object and thus should not be considered a copy stored in a map. */
+  result.is_canonical = 0;
+
   arg = tok->args[0];
   if (strcmpstart(arg, "private"))
     return NULL;
diff --git a/src/feature/dirparse/unparseable.c b/src/feature/dirparse/unparseable.c
index 930717a6ff..e966db734a 100644
--- a/src/feature/dirparse/unparseable.c
+++ b/src/feature/dirparse/unparseable.c
@@ -403,7 +403,7 @@ dump_desc_compare_fifo_entries(const void **a_v, const void **b_v)
       }
     } else {
       /*
-       * We shouldn't see this, but what the hell, NULLs precede everythin
+       * We shouldn't see this, but what the hell, NULLs precede everything
        * else
        */
       return 1;