diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-10-21 11:01:12 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-10-21 11:01:12 -0400 |
| commit | 0e8d1c22177fa10b7f5fd6214d6b3c7e5eeaafac (patch) | |
| tree | 0bb172119c9107999df60759e386e9a37befa16c /src/or/connection_edge.c | |
| parent | ea7f4be6d271639bff0731108751a0b20c0b860e (diff) | |
| parent | 69a496ba9810f5065f55af558932e84152ce50bc (diff) | |
| download | tor-0e8d1c22177fa10b7f5fd6214d6b3c7e5eeaafac.tar.gz tor-0e8d1c22177fa10b7f5fd6214d6b3c7e5eeaafac.zip | |
Merge remote branch 'hoganrobert/bug1859' into maint-0.2.2
Diffstat (limited to 'src/or/connection_edge.c')
| -rw-r--r-- | src/or/connection_edge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index da0fc1856c..0970cda4b9 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -600,7 +600,7 @@ circuit_discard_optional_exit_enclaves(extend_info_t *info) !edge_conn->chosen_exit_retries) continue; r1 = router_get_by_nickname(edge_conn->chosen_exit_name, 0); - r2 = router_get_by_nickname(info->nickname, 0); + r2 = router_get_by_digest(info->identity_digest); if (!r1 || !r2 || r1 != r2) continue; tor_assert(edge_conn->socks_request); |