[tor-commits] [tor/release-0.2.5] Increase bandwidth usage report interval to 4 hours.

[nickm at torproject.org]

commit 6830667d58815219476593901334b2e19554d8af
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 22 12:24:13 2014 -0500

    Increase bandwidth usage report interval to 4 hours.
---
 changes/bug13988 |    3 +++
 src/or/rephist.c |    4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/changes/bug13988 b/changes/bug13988
new file mode 100644
index 0000000..e816335
--- /dev/null
+++ b/changes/bug13988
@@ -0,0 +1,3 @@
+  o Minor bugfixes (statistics):
+    - Increase period over which bandwidth observations are aggregated
+      from 15 minutes to 4 hours. Fixes bug 13988; bugfix on 0.0.8pre1.
diff --git a/src/or/rephist.c b/src/or/rephist.c
index 72de54c..cedc56a 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -1131,9 +1131,7 @@ rep_hist_load_mtbf_data(time_t now)
  * totals? */
 #define NUM_SECS_ROLLING_MEASURE 10
 /** How large are the intervals for which we track and report bandwidth use? */
-/* XXXX Watch out! Before Tor 0.2.2.21-alpha, using any other value here would
- * generate an unparseable state file. */
-#define NUM_SECS_BW_SUM_INTERVAL (15*60)
+#define NUM_SECS_BW_SUM_INTERVAL (4*60*60)
 /** How far in the past do we remember and publish bandwidth use? */
 #define NUM_SECS_BW_SUM_IS_VALID (24*60*60)
 /** How many bandwidth usage intervals do we remember? (derived) */