commit 04524443d071f3e310067e0a7ecdc52a97e80107
parent 736e7299ce04bd96aa75c50f7dd7ecba36945917
Author: Nick Mathewson <nickm@torproject.org>
Date: Mon, 11 Dec 2017 16:54:14 -0500
Merge branch 'maint-0.3.0' into maint-0.3.1
Diffstat:
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/changes/ticket23856 b/changes/ticket23856
@@ -0,0 +1,4 @@
+ o Minor feature (relay statistics):
+ - Change relay bandwidth reporting stats interval from 4 hours to 24 hours
+ in order to reduce the efficiency of guard discovery attacks. Fixes
+ ticket 23856.
diff --git a/src/or/rephist.c b/src/or/rephist.c
@@ -1239,9 +1239,9 @@ 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? */
-#define NUM_SECS_BW_SUM_INTERVAL (4*60*60)
+#define NUM_SECS_BW_SUM_INTERVAL (24*60*60)
/** How far in the past do we remember and publish bandwidth use? */
-#define NUM_SECS_BW_SUM_IS_VALID (24*60*60)
+#define NUM_SECS_BW_SUM_IS_VALID (5*24*60*60)
/** How many bandwidth usage intervals do we remember? (derived) */
#define NUM_TOTALS (NUM_SECS_BW_SUM_IS_VALID/NUM_SECS_BW_SUM_INTERVAL)
diff --git a/src/or/router.c b/src/or/router.c
@@ -2526,7 +2526,7 @@ mark_my_descriptor_dirty(const char *reason)
/** How frequently will we republish our descriptor because of large (factor
* of 2) shifts in estimated bandwidth? Note: We don't use this constant
* if our previous bandwidth estimate was exactly 0. */
-#define MAX_BANDWIDTH_CHANGE_FREQ (20*60)
+#define MAX_BANDWIDTH_CHANGE_FREQ (3*60*60)
/** Check whether bandwidth has changed a lot since the last time we announced
* bandwidth. If so, mark our descriptor dirty. */
