Commit 3900b193 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'maint-0.4.5' into master

parents 7c067077 d04a27be

changes/ticket40195

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  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.

src/feature/relay/relay_config.c

+4 −0
Original line number Diff line number Diff line
@@ -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(&current->addr) == tor_addr_family(&next->addr) &&

          current->port == next->port) {