diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-11 16:53:02 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-11 16:53:02 -0500 |
| commit | f5d4bdf305d2341f7ff531fc9c8ed08511bd503d (patch) | |
| tree | 96471d8dd7118171b0d852845e710caaee589edf /src | |
| parent | 461e34bb3dec0f4f7234584806a224040f44c7ed (diff) | |
| parent | 8be50ca3ea90ac04b8a18c7d9a33f5ec3f3a6e28 (diff) | |
| download | tor-f5d4bdf305d2341f7ff531fc9c8ed08511bd503d.tar.gz tor-f5d4bdf305d2341f7ff531fc9c8ed08511bd503d.zip | |
Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/rephist.c | 4 | ||||
| -rw-r--r-- | src/or/router.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/or/rephist.c b/src/or/rephist.c index cedc56af07..5acc8f3513 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 90b2431a22..e1c2d20b3a 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2064,7 +2064,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? */ -#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. */ |