diff options
| author | Mike Perry <mikeperry-git@torproject.org> | 2018-04-20 18:58:15 +0000 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2018-04-28 01:26:50 +0300 |
| commit | d634c1ba6b3b5b4773ee2bc7095a004818431541 (patch) | |
| tree | 9126904cf95136aaf466c8f124715dc3adcc6e37 /src/or/circuitbuild.c | |
| parent | d8ac7d557c0af199d21639a52a8c8c9dd201f555 (diff) | |
| download | tor-d634c1ba6b3b5b4773ee2bc7095a004818431541.tar.gz tor-d634c1ba6b3b5b4773ee2bc7095a004818431541.zip | |
Bug 25870: Allow the last hop in a vanguard circuit to be our guard.
The last hop in vanguard circuits can be an RP/IP/HSDir.
Since vanguard circuits are at least 3 hops (sometimes 4) before this node,
this change will not cause A - B - A paths.
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 54446bb01d..75540e5d36 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2628,7 +2628,7 @@ choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state, /* This request is for an entry server to use for a regular circuit, * and we use entry guard nodes. Just return one of the guard nodes. */ tor_assert(guard_state_out); - return guards_choose_guard(state, guard_state_out); + return guards_choose_guard(state, purpose, guard_state_out); } excluded = smartlist_new(); |