Merge branch 'maint-0.4.5' into maint-0.4.6

diff --cc src/feature/hs/hs_metrics.c
index 891029aded042b96d9c7f196b41b5252634d78e7,25e2e62111946221683fd550d89fc26c89a77c21..a82d2ae370e7c1bbe920c78da729bc02e416954e
--- 1/src/feature/hs/hs_metrics.c
--- 2/src/feature/hs/hs_metrics.c
+++ b/src/feature/hs/hs_metrics.c
@@@ -59,19 -59,26 +59,26 @@@ init_store(hs_service_t *service
    store = service->metrics.store;
  
    for (size_t i = 0; i < base_metrics_size; ++i) {
-     metrics_store_entry_t *entry =
-       metrics_store_add(store, base_metrics[i].type, base_metrics[i].name,
-                         base_metrics[i].help);
- 
-     /* Add labels to the entry. */
-     metrics_store_entry_add_label(entry,
-                         format_label("onion", service->onion_address));
+     /* Add entries with port as label. We need one metric line per port. */
      if (base_metrics[i].port_as_label && service->config.ports) {
        SMARTLIST_FOREACH_BEGIN(service->config.ports,
 -                              const rend_service_port_config_t *, p) {
 +                              const hs_port_config_t *, p) {
+         metrics_store_entry_t *entry =
+           metrics_store_add(store, base_metrics[i].type, base_metrics[i].name,
+                             base_metrics[i].help);
+ 
+         /* Add labels to the entry. */
+         metrics_store_entry_add_label(entry,
+                 format_label("onion", service->onion_address));
          metrics_store_entry_add_label(entry,
-                       format_label("port", port_to_str(p->virtual_port)));
+                 format_label("port", port_to_str(p->virtual_port)));
        } SMARTLIST_FOREACH_END(p);
+     } else {
+       metrics_store_entry_t *entry =
+         metrics_store_add(store, base_metrics[i].type, base_metrics[i].name,
+                           base_metrics[i].help);
+       metrics_store_entry_add_label(entry,
+               format_label("onion", service->onion_address));
      }
    }
  }