diff options
author | Roger Dingledine <arma@torproject.org> | 2011-09-28 15:35:27 -0400 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2011-09-28 15:35:27 -0400 |
commit | ff8aba7053728d5b8f51152e10d73a7535e495a3 (patch) | |
tree | b80745a9c7e1dbd0cd92fd3e648663a815d4586e /src/or | |
parent | 0b5d2646d56fe351b8b2b4bc97bbad30cb34b6d4 (diff) | |
download | tor-ff8aba7053728d5b8f51152e10d73a7535e495a3.tar tor-ff8aba7053728d5b8f51152e10d73a7535e495a3.tar.gz |
bridges should use create_fast cells for their own circuits
fixes bug 4124, as noticed in bug 4115
Diffstat (limited to 'src/or')
-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 888023d8f..c864fd249 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1961,9 +1961,10 @@ should_use_create_fast_for_circuit(origin_circuit_t *circ) return 1; /* our hand is forced: only a create_fast will work. */ if (!options->FastFirstHopPK) return 0; /* we prefer to avoid create_fast */ - if (server_mode(options)) { + if (public_server_mode(options)) { /* We're a server, and we know an onion key. We can choose. - * Prefer to blend in. */ + * Prefer to blend our circuit into the other circuits we are + * creating on behalf of others. */ return 0; } |