tor

commit 0684e6c6f0b1d6dad12d4a7e40f163671ee44f84
parent 56b7407a9096eeed8af1b45bda5a149e7ffabb2c
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri, 17 Nov 2017 08:34:05 -0500

Merge branch 'bug20963_032' into maint-0.3.2

Diffstat:
A
changes/bug20963
 | 
4
++++
M
src/or/circuitstats.c
 | 
11
++++++++---

2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/changes/bug20963 b/changes/bug20963
@@ -0,0 +1,4 @@
+  o Minor features (logging):
+    - Improve the message we log when re-enabling circuit build timeouts
+      after having received a consensus. Closes ticket 20963.
+
diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c
@@ -431,9 +431,14 @@ circuit_build_times_new_consensus_params(circuit_build_times_t *cbt,
     if (num > 0) {
       if (num != cbt->liveness.num_recent_circs) {
         int8_t *recent_circs;
-        log_notice(LD_CIRC, "The Tor Directory Consensus has changed how many "
-                   "circuits we must track to detect network failures from %d "
-                   "to %d.", cbt->liveness.num_recent_circs, num);
+        if (cbt->liveness.num_recent_circs > 0) {
+          log_notice(LD_CIRC, "The Tor Directory Consensus has changed how "
+                     "many circuits we must track to detect network failures "
+                     "from %d to %d.", cbt->liveness.num_recent_circs, num);
+        } else {
+          log_notice(LD_CIRC, "Upon receiving a consensus directory, "
+                     "re-enabling circuit-based network failure detection.");
+        }
 
         tor_assert(cbt->liveness.timeouts_after_firsthop ||
                    cbt->liveness.num_recent_circs == 0);