diff options
| author | David Goulet <dgoulet@torproject.org> | 2017-04-25 13:49:05 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-09 10:30:52 -0400 |
| commit | 09bc858dd54101e645b31bf32fe463b73c38add2 (patch) | |
| tree | 24494f8629a5d8eb9cbe6a6dd346a0afa06353e2 /src/or/circuitbuild.c | |
| parent | d52a1e2faaf0edf8f5899c6fa9864d0cecebf692 (diff) | |
| download | tor-09bc858dd54101e645b31bf32fe463b73c38add2.tar.gz tor-09bc858dd54101e645b31bf32fe463b73c38add2.zip | |
config: Remove ExcludeSingleHopRelays option
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans
up the code associated with it.
Partially fixes #22060
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index faf2e3dcd9..012229bf86 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1835,8 +1835,9 @@ choose_good_exit_server_general(int need_uptime, int need_capacity) // router->nickname, i); continue; /* skip invalid routers */ } - if (options->ExcludeSingleHopRelays && - node_allows_single_hop_exits(node)) { + /* We do not allow relays that allow single hop exits by default. Option + * was deprecated in 0.2.9.2-alpha and removed in 0.3.1.0-alpha. */ + if (node_allows_single_hop_exits(node)) { n_supported[i] = -1; continue; } |