Commit fb5877b9 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.3.0' into maint-0.3.1

parents 08469a33 8a776760

changes/bug24736

0 → 100644
+6 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (address selection):

    - When the fascist_firewall_choose_address_ functions don't find a

      reachable address, set the returned address to the null address and port.

      This is a precautionary measure, because some callers do not check the

      return value.

      Fixes bug 24736; bugfix on 0.2.8.2-alpha.

src/or/policies.c

+2 −0
Original line number Diff line number Diff line
@@ -865,6 +865,8 @@ fascist_firewall_choose_address_base(const tor_addr_t *ipv4_addr, 
    ap->port = result->port;

    return 1;

  } else {

    tor_addr_make_null(&ap->addr, AF_UNSPEC);

    ap->port = 0;

    return 0;

  }

}