From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 27 Aug 2012 20:07:04 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
X-Git-Tag: tor-0.2.4.1-alpha~34^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=443e4ae1ee0520cead27dd3a21e9f79b1bed8f8b;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

Conflicts:
	src/or/policies.c
---

443e4ae1ee0520cead27dd3a21e9f79b1bed8f8b
diff --cc src/or/policies.c
index 3018803bc4,55d08afc81..6e984211ba
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@@ -711,8 -684,12 +711,12 @@@ compare_tor_addr_to_addr_policy(const t
    if (!policy) {
      /* no policy? accept all. */
      return ADDR_POLICY_ACCEPTED;
 -  } else if (tor_addr_is_null(addr)) {
 +  } else if (addr == NULL || tor_addr_is_null(addr)) {
-     tor_assert(port != 0);
+     if (port == 0) {
+       log_info(LD_BUG, "Rejecting null address with 0 port (family %d)",
+                addr ? tor_addr_family(addr) : -1);
+       return ADDR_POLICY_REJECTED;
+     }
      return compare_unknown_tor_addr_to_addr_policy(port, policy);
    } else if (port == 0) {
      return compare_known_tor_addr_to_addr_policy_noport(addr, policy);