nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.5' into maint-0.4.6

Browse Source
This commit is contained in:
Nick Mathewson 2021-05-17 09:04:22 -04:00
commit fbd47a5078
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket40370 Normal file
View File

@ -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.

1
src/core/mainloop/connection.c
View File

@ -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;