diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-22 17:19:41 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-22 17:19:41 -0500 |
| commit | 491abbc65e535b5308d6c57ab9ab3900ac2dd2d2 (patch) | |
| tree | 63f1dc9a7f92bd931d14cd78aa37fd8ba3a59e81 /src/or/connection_edge.c | |
| parent | 7605985b3ff71cee7fabdf023baf298b218d04c1 (diff) | |
| parent | 2392290c1887b732fd2309e57ce04ab71b9b4e69 (diff) | |
| download | tor-491abbc65e535b5308d6c57ab9ab3900ac2dd2d2.tar.gz tor-491abbc65e535b5308d6c57ab9ab3900ac2dd2d2.zip | |
Merge remote branch 'public/bug1859_021' into maint-0.2.1
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 052aa3706a..5609c1df40 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -571,7 +571,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); |