Partially apply bug 891 parch from forest: check EXTEND cell address against real_addr, not addr. I have questions about the rest of the patch: see the flyspray entry.

svn:r17730

src/or/circuitbuild.c

@@ -362,8 +362,8 @@ connection_good_enough_for_extend(const or_connection_t *n_conn,
     *state_out = "too old. Launching a new one.";
     *launch_out = 1;
     return 0;
-  } else if (tor_addr_compare(&n_conn->_base.addr, target_addr, CMP_EXACT) &&
+  } else if (tor_addr_compare(&n_conn->real_addr, target_addr, CMP_EXACT)
-             ! n_conn->is_canonical) {
+             && ! n_conn->is_canonical) {
     *state_out = "is not from a canonical address. Launching a new one.";
     *launch_out = 1;
     return 0;