diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-09-09 12:58:12 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-09-09 12:58:12 -0400 |
| commit | a41f1fc6127a688485b90c1fc2bfcbeb59e41f0b (patch) | |
| tree | 452abe6e161edc285fea830df0039a1f4efb6de4 /src/or/rephist.c | |
| parent | d3ff167e098fa44e4ec30c7e6f50127a8c99dae7 (diff) | |
| parent | b0695c11ebfff4ca4dc6570e49e27c03ca65e8ab (diff) | |
| download | tor-a41f1fc6127a688485b90c1fc2bfcbeb59e41f0b.tar tor-a41f1fc6127a688485b90c1fc2bfcbeb59e41f0b.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
configure.in
src/or/circuitbuild.c
Diffstat (limited to 'src/or/rephist.c')
| -rw-r--r-- | src/or/rephist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/rephist.c b/src/or/rephist.c index 25aece3d5..de4a1ef43 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -446,7 +446,7 @@ rep_hist_downrate_old_runs(time_t now) alpha *= STABILITY_ALPHA; } - log_info(LD_HIST, "Discounting all old stability info by a factor of %lf", + log_info(LD_HIST, "Discounting all old stability info by a factor of %f", alpha); /* Multiply every w_r_l, t_r_w pair by alpha. */ @@ -894,7 +894,7 @@ rep_hist_format_router_status(or_history_t *hist, time_t now) " weighted-uptime %lu\n" "mtbf %0.1lf\n" " weighted-run-length %lu\n" - " total-run-weights %lf\n", + " total-run-weights %f\n", up?"uptime-started ":"", up?sor_buf:"", up?" UTC\n":"", down?"downtime-started ":"", down?sod_buf:"", down?" UTC\n":"", wfu, |