Merge remote-tracking branch 'linus/bug5151'

changes/bug5151

@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Fix bug stomping on ORPort option NoListen and ignoring option
+      NoAdvertise. Fixes bug 5151.
+    - Move a debug printout from notice to debug level.

src/or/config.c

@@ -5772,13 +5772,13 @@ parse_port_config(smartlist_t *out,
 
     if (out && port) {
       port_cfg_t *cfg = tor_malloc_zero(sizeof(port_cfg_t));
-      cfg->type = listener_type;
-      cfg->port = port;
       tor_addr_copy(&cfg->addr, &addr);
-      cfg->session_group = sessiongroup;
+      cfg->port = port;
+      cfg->type = listener_type;
       cfg->isolation_flags = isolation;
+      cfg->session_group = sessiongroup;
+      cfg->no_advertise = no_advertise;
       cfg->no_listen = no_listen;
-      cfg->no_listen = no_advertise;
       cfg->all_addrs = all_addrs;
       cfg->ipv4_only = ipv4_only;
       cfg->ipv6_only = ipv6_only;

src/or/router.c

@@ -1997,7 +1997,7 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router,
     if (a) {
       tor_asprintf(&extra_or_address,
                    "or-address %s:%d\n", a, router->ipv6_orport);
-      log_notice(LD_OR, "My line is <%s>", extra_or_address);
+      log_debug(LD_OR, "My or-address line is <%s>", extra_or_address);
     }
   }