summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug2704_part15
-rw-r--r--src/or/rephist.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug2704_part1 b/changes/bug2704_part1
new file mode 100644
index 0000000000..eaf22812cc
--- /dev/null
+++ b/changes/bug2704_part1
@@ -0,0 +1,5 @@
+ o Minor bugfixes:
+ - Fix an issue causing calculation of Tor's average bandwidth as saved
+ in the state file to be 10 times smaller than it should be. Fixes the
+ first part of bug 2704, bugfix on tor-0.2.2.23-alpha.
+
diff --git a/src/or/rephist.c b/src/or/rephist.c
index 9b7eefecf2..6034bbcb2b 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -1673,7 +1673,7 @@ rep_hist_load_bwhist_state_section(bw_array_t *b,
mv *= NUM_SECS_ROLLING_MEASURE;
} else {
/* No maxima known; guess average rate to be conservative. */
- mv = v / s_interval;
+ mv = (v / s_interval) * NUM_SECS_ROLLING_MEASURE;
}
if (!ok) {
retval = -1;