diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-10-21 11:17:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-10-21 11:17:34 -0400 |
| commit | f32140238fc39cda3a292a4f67651044b7791423 (patch) | |
| tree | bb7790d669fdd34dc854c9fb7f845f22e23f6c25 /src/or/connection_edge.c | |
| parent | 2c3dafc342b94e9674b62ebd1a1da00bab615a86 (diff) | |
| parent | 5f3010667d9473d5c246ff77d6dc3d0ad4c4f30a (diff) | |
| download | tor-f32140238fc39cda3a292a4f67651044b7791423.tar tor-f32140238fc39cda3a292a4f67651044b7791423.tar.gz | |
Merge remote branch 'origin/maint-0.2.2' for bug 1859 patches
Some of this is already done in nodelist.
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 d595e6b72..22711d6ae 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 = node_get_by_nickname(edge_conn->chosen_exit_name, 0); - r2 = node_get_by_nickname(info->nickname, 0); + r2 = node_get_by_id(info->identity_digest); if (!r1 || !r2 || r1 != r2) continue; tor_assert(edge_conn->socks_request); |