sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.3.2' into release-0.3.2

This commit is contained in:
Nick Mathewson 2017-11-17 08:34:08 -05:00
parent 2367b1ed31 0684e6c6f0
commit 066904e758
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug20963 Normal file
View 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.

11
src/or/circuitstats.c
View File

@ -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);