tor

commit fbd47a50783c79a553510091df09dce7632e02f6
parent 8851861ff087efe3ab95069952ab93108dbb6bf1
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 17 May 2021 09:04:22 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6

Diffstat:
A
changes/ticket40370
 | 
4
++++
M
src/core/mainloop/connection.c
 | 
1
+

2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/changes/ticket40370 b/changes/ticket40370
@@ -0,0 +1,4 @@
+  o Minor bugfix (metrics port):
+    - Fix a bug that made tor try to re-bind() every 60 seconds on an already
+      open MetricsPort. Fixes bug 40370; bugfix on 0.4.5.1-alpha.
+
diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c
@@ -4943,6 +4943,7 @@ connection_is_listener(connection_t *conn)
       conn->type == CONN_TYPE_AP_NATD_LISTENER ||
       conn->type == CONN_TYPE_AP_HTTP_CONNECT_LISTENER ||
       conn->type == CONN_TYPE_DIR_LISTENER ||
+      conn->type == CONN_TYPE_METRICS_LISTENER ||
       conn->type == CONN_TYPE_CONTROL_LISTENER)
     return 1;
   return 0;