commit 8f43b97895c2fb3179a83b4535c5fc2a97d75998
parent 605f30c4865d8d462e4fd80c4e164862e0573548
Author: David Goulet <dgoulet@torproject.org>
Date: Wed, 16 Oct 2024 09:05:34 -0400
Merge branch 'maint-0.4.8'
Diffstat:
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/changes/bug40981 b/changes/bug40981
@@ -0,0 +1,9 @@
+ o Major bugfixes (circuit building):
+ - Conflux circuit building was ignoring the "predicted ports" feature,
+ which aims to make Tor stop building circuits if there have been
+ no user requests lately. This bug led to every idle Tor on the
+ network building and discarding circuits every 30 seconds, which
+ added overall load to the network, used bandwidth and battery from
+ clients that weren't actively using their Tor, and kept sockets open
+ on guards which added connection padding essentially forever. Fixes
+ bug 40981; bugfix on 0.4.8.1-alpha;
diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c
@@ -1202,8 +1202,13 @@ circuit_predict_and_launch_new(void)
int flags = 0;
/* Attempt to launch predicted conflux circuits. This is outside the HS or
- * Exit preemptive circuit set. */
- conflux_predict_new(now);
+ * Exit preemptive circuit set.
+ * As with the other types of preemptive circuits, we only want to
+ * launch them if we have predicted ports. (If we haven't needed a
+ * circuit for a while, maybe we won't need one soon either.) */
+ if (predicted_ports_prediction_time_remaining(now)) {
+ conflux_predict_new(now);
+ }
/* Count how many of each type of circuit we currently have. */
SMARTLIST_FOREACH_BEGIN(circuit_get_global_list(), circuit_t *, circ) {
