mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 13:13:44 +01:00
Merge branch 'bug20963_032' into maint-0.3.2
This commit is contained in:
commit
0684e6c6f0
4
changes/bug20963
Normal file
4
changes/bug20963
Normal file
@ -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.
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user