aboutsummaryrefslogtreecommitdiff
path: root/src/or/control.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-06-29 18:57:50 -0400
committerNick Mathewson <nickm@torproject.org>2010-06-29 18:57:50 -0400
commitbea55766af461e4ca78a4919912f3aa9de978bdc (patch)
tree4de1f70487f1f0377e5d11a7c1329f70625ba59a /src/or/control.c
parent1d5b2da3a8273797817747e08a3a0b6726cb060a (diff)
parent5dbf99d9ff59e69c064acda31495486635f8b844 (diff)
downloadtor-bea55766af461e4ca78a4919912f3aa9de978bdc.tar.gz
tor-bea55766af461e4ca78a4919912f3aa9de978bdc.zip
Merge remote branch 'mikeperry/cbt-bugfixes3'
Diffstat (limited to 'src/or/control.c')
-rw-r--r--src/or/control.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/or/control.c b/src/or/control.c
index 61aaed4667..ea6ce4c464 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -3528,10 +3528,14 @@ control_event_buildtimeout_set(const circuit_build_times_t *cbt,
send_control_event(EVENT_BUILDTIMEOUT_SET, ALL_FORMATS,
"650 BUILDTIMEOUT_SET %s TOTAL_TIMES=%lu "
- "TIMEOUT_MS=%lu XM=%lu ALPHA=%lf CUTOFF_QUANTILE=%lf\r\n",
+ "TIMEOUT_MS=%lu XM=%lu ALPHA=%lf CUTOFF_QUANTILE=%lf "
+ "TIMEOUT_RATE=%lf CLOSE_MS=%lu CLOSE_RATE=%lf\r\n",
type_string, (unsigned long)cbt->total_build_times,
(unsigned long)cbt->timeout_ms,
- (unsigned long)cbt->Xm, cbt->alpha, qnt);
+ (unsigned long)cbt->Xm, cbt->alpha, qnt,
+ circuit_build_times_timeout_rate(cbt),
+ (unsigned long)cbt->close_ms,
+ circuit_build_times_close_rate(cbt));
return 0;
}