diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-12-25 23:22:54 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-12-25 23:22:54 -0500 |
| commit | 265aab298ad923425e136013f6c439b5fba32558 (patch) | |
| tree | 89e923f121b91bdc4b7b4bf6f5f85d25e1b8d2a8 /src/or/circuituse.c | |
| parent | 68dae4cf3563e536e0693648cefcd0c69e512bff (diff) | |
| parent | c2c6e8e5b2262ccbeeb3e3f954a9b52bc2096bd1 (diff) | |
| download | tor-265aab298ad923425e136013f6c439b5fba32558.tar.gz tor-265aab298ad923425e136013f6c439b5fba32558.zip | |
Merge branch 'directory_guards_rebased'
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index e14f9d03ca..298f31a8dc 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -467,7 +467,7 @@ circuit_expire_building(void) "No circuits are opened. Relaxing timeout for " "a circuit with channel state %s. %d guards are live.", channel_state_to_string(victim->n_chan->state), - num_live_entry_guards()); + num_live_entry_guards(0)); /* We count the timeout here for CBT, because technically this * was a timeout, and the timeout value needs to reset if we @@ -484,7 +484,7 @@ circuit_expire_building(void) "However, it appears the circuit has timed out anyway. " "%d guards are live. ", channel_state_to_string(victim->n_chan->state), - (long)circ_times.close_ms, num_live_entry_guards()); + (long)circ_times.close_ms, num_live_entry_guards(0)); } } |