diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-05-17 09:04:22 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-05-17 09:04:22 -0400 |
| commit | 3630649b7900c8b98c12b6b147b99b5b33ba58ec (patch) | |
| tree | 3ce449fd6427311c0bee9fa2ea1e85ee59eca71a | |
| parent | 086f01e224a3118d83d8b5a14d5dc27d9af41d0a (diff) | |
| parent | fbd47a50783c79a553510091df09dce7632e02f6 (diff) | |
| download | tor-3630649b7900c8b98c12b6b147b99b5b33ba58ec.tar.gz tor-3630649b7900c8b98c12b6b147b99b5b33ba58ec.zip | |
Merge branch 'maint-0.4.6' into release-0.4.6
| -rw-r--r-- | changes/ticket40370 | 4 | ||||
| -rw-r--r-- | src/core/mainloop/connection.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/ticket40370 b/changes/ticket40370 new file mode 100644 index 0000000000..fcdb0eb173 --- /dev/null +++ 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 index 9c6da1295f..b17d7bf2bd 100644 --- 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; |