diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-11 16:54:11 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-11 16:54:11 -0500 |
| commit | bc1ea4f470734f7fa22949318a98e286da5cba49 (patch) | |
| tree | 824af3b85082f81f85fddc9382f5cbdc426bb25f | |
| parent | f97f301b5b5605f559522ffae2159fc4d061817c (diff) | |
| parent | f5d4bdf305d2341f7ff531fc9c8ed08511bd503d (diff) | |
| download | tor-bc1ea4f470734f7fa22949318a98e286da5cba49.tar.gz tor-bc1ea4f470734f7fa22949318a98e286da5cba49.zip | |
Merge branch 'maint-0.2.5' into maint-0.2.8
| -rw-r--r-- | changes/ticket23856 | 4 | ||||
| -rw-r--r-- | src/or/rephist.c | 4 | ||||
| -rw-r--r-- | src/or/router.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/changes/ticket23856 b/changes/ticket23856 new file mode 100644 index 0000000000..049da18d06 --- /dev/null +++ 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 index 04ed7aef0f..651fd43ade 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1131,9 +1131,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 index bc7a2fcfc3..b134f2e315 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2312,7 +2312,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. */ |