diff options
author | Roger Dingledine <arma@torproject.org> | 2013-01-15 15:40:17 -0500 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2013-01-15 15:40:17 -0500 |
commit | 6e4a4002c5f988615299f0160ff4bbfb9dfdda3e (patch) | |
tree | 99949e023db9ecebfa8c855a74e76dc323fc684e /src/or/circuituse.c | |
parent | 23dd7c901287d7d8282945cb22950a39f5bcdfd2 (diff) | |
download | tor-6e4a4002c5f988615299f0160ff4bbfb9dfdda3e.tar.gz tor-6e4a4002c5f988615299f0160ff4bbfb9dfdda3e.zip |
Clean up odds and ends
Diffstat (limited to 'src/or/circuituse.c')
-rw-r--r-- | src/or/circuituse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index bdaf7d8119..ada2d69b13 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -452,15 +452,15 @@ circuit_expire_building(void) SET_CUTOFF(stream_cutoff, MAX(options->CircuitStreamTimeout,15)*1000 + 1000); /* Be lenient with cannibalized circs. They already survived the official - * CBT, and they're usually not perf-critical. */ + * CBT, and they're usually not performance-critical. */ SET_CUTOFF(cannibalized_cutoff, MAX(circ_times.close_ms*(4/6.0), options->CircuitStreamTimeout * 1000) + 1000); - // Intro circs have an extra round trip (and are also 4 hops long) + /* Intro circs have an extra round trip (and are also 4 hops long) */ SET_CUTOFF(c_intro_cutoff, circ_times.timeout_ms * (14/6.0) + 1000); - // Server intro circs have an extra round trip + /* Server intro circs have an extra round trip */ SET_CUTOFF(s_intro_cutoff, circ_times.timeout_ms * (9/6.0) + 1000); SET_CUTOFF(close_cutoff, circ_times.close_ms); |