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

Conflicts:
	src/or/policies.c

diff --cc src/or/policies.c
index 3018803bc4f7d070bf2454d1e2b436bf620ec93f,55d08afc8105d6d74a469ee8645e1e48de177618..6e984211baed98c490b407f46dde4b776c9440fd
--- 1/src/or/policies.c
--- 2/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);