aboutsummaryrefslogtreecommitdiff
path: root/src/core/or/circuituse.c
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2021-07-01 17:56:56 +0300
committerGeorge Kadianakis <desnacked@riseup.net>2021-07-01 18:15:55 +0300
commit52c5b8aa12cc613e145600826965917ae10b7cbb (patch)
tree5a566bc4a3b113769bb442b69b31859f6e9e7324 /src/core/or/circuituse.c
parent9afd9d09404200ed149abeeaad9efd3a1542f7e0 (diff)
downloadtor-52c5b8aa12cc613e145600826965917ae10b7cbb.tar.gz
tor-52c5b8aa12cc613e145600826965917ae10b7cbb.zip
Simplify cannibalization logic now that all HS is vanguards
Co-authored-by: Mike Perry <mikeperry-git@torproject.org>
Diffstat (limited to 'src/core/or/circuituse.c')
-rw-r--r--src/core/or/circuituse.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c
index adf9e12ed5..2ec391eca0 100644
--- a/src/core/or/circuituse.c
+++ b/src/core/or/circuituse.c
@@ -2049,13 +2049,11 @@ circuit_should_cannibalize_to_build(uint8_t purpose_to_build,
return 0;
}
- /* For vanguards, the server-side intro circ is not cannibalized
- * because we pre-build 4 hop HS circuits, and it only needs a 3 hop
- * circuit. It is also long-lived, so it is more important that
- * it have lower latency than get built fast.
+ /* The server-side intro circ is not cannibalized because it only
+ * needs a 3 hop circuit. It is also long-lived, so it is more
+ * important that it have lower latency than get built fast.
*/
- if (circuit_should_use_vanguards(purpose_to_build) &&
- purpose_to_build == CIRCUIT_PURPOSE_S_ESTABLISH_INTRO) {
+ if (purpose_to_build == CIRCUIT_PURPOSE_S_ESTABLISH_INTRO) {
return 0;
}