[tor-commits] [tor/master] Pathbias should continue to ignore previously ignored circs.

[asn at torproject.org]

commit b98bcd789e45fb6a09ef92ab15052a6c19e24887
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed May 8 21:21:03 2019 +0000

    Pathbias should continue to ignore previously ignored circs.
    
    If circuit padding wants to keep a circuit open and pathbias used to ignore
    it, pathbias should continue to ignore it.
    
    This may catch other purpose-change related miscounts (such as timeout
    measurement, cannibalization, onion service circuit transitions, and
    vanguards).
---
 src/feature/client/circpathbias.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/feature/client/circpathbias.c b/src/feature/client/circpathbias.c
index e6af649ba..2be9984a6 100644
--- a/src/feature/client/circpathbias.c
+++ b/src/feature/client/circpathbias.c
@@ -400,12 +400,13 @@ pathbias_should_count(origin_circuit_t *circ)
   /* Check to see if the shouldcount result has changed due to a
    * unexpected purpose change that would affect our results */
   if (circ->pathbias_shouldcount == PATHBIAS_SHOULDCOUNT_IGNORED) {
-      log_info(LD_BUG,
-              "Circuit %d is now being counted despite being ignored "
-              "in the past. Purpose is %s, path state is %s",
-              circ->global_identifier,
-              circuit_purpose_to_string(circ->base_.purpose),
-              pathbias_state_to_string(circ->path_state));
+    log_info(LD_CIRC,
+            "Circuit %d is not being counted by pathbias because it was "
+            "ignored in the past. Purpose is %s, path state is %s",
+            circ->global_identifier,
+            circuit_purpose_to_string(circ->base_.purpose),
+            pathbias_state_to_string(circ->path_state));
+    return 0;
   }
   circ->pathbias_shouldcount = PATHBIAS_SHOULDCOUNT_COUNTED;