[tor-commits] [tor/main] Simplify cannibalization logic now that all HS is vanguards

[asn at torproject.org]

commit 52c5b8aa12cc613e145600826965917ae10b7cbb
Author: George Kadianakis <desnacked at riseup.net>
Date:   Thu Jul 1 17:56:56 2021 +0300

    Simplify cannibalization logic now that all HS is vanguards
    
    Co-authored-by: Mike Perry <mikeperry-git at torproject.org>
---
 src/core/or/circuituse.c | 10 ++++------
 1 file 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;
   }