Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9

This commit is contained in:
Nick Mathewson
2018-01-02 10:09:44 -05:00
2 changed files with 8 additions and 0 deletions
+2
View File
@@ -854,6 +854,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;
}
}