mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-11 05:33:47 +01:00
Merge branch 'maint-0.4.5' into master
This commit is contained in:
commit
3900b19379
5
changes/ticket40195
Normal file
5
changes/ticket40195
Normal file
@ -0,0 +1,5 @@
|
||||
o Minor bugfixes (configuration, ports):
|
||||
- Fix an issue where an ORPort was validated against other type of ports
|
||||
when it should have been only checked against other ORPorts. This lead to
|
||||
"DirPort auto" to be ignored and failing to be used. Fixes bug 40195;
|
||||
bugfix on 0.4.5.1-alpha.
|
@ -227,6 +227,10 @@ remove_duplicate_orports(smartlist_t *ports)
|
||||
if (removing[j]) {
|
||||
continue;
|
||||
}
|
||||
/* Skip non ORPorts. */
|
||||
if (next->type != CONN_TYPE_OR_LISTENER) {
|
||||
continue;
|
||||
}
|
||||
/* Same address family and same port number, we have a match. */
|
||||
if (tor_addr_family(¤t->addr) == tor_addr_family(&next->addr) &&
|
||||
current->port == next->port) {
|
||||
|
Loading…
Reference in New Issue
Block a user