diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-27 10:04:16 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-27 10:04:16 -0500 |
| commit | b23086060866c1541a607e0e9082ef9d9464549e (patch) | |
| tree | 3d7c1dfc4401588781ffe355ce3d37a4cd7ed798 /src | |
| parent | 722c64fc234e43d3b8d1facb327765d7b3518991 (diff) | |
| parent | ef54610442ee2f2a9143c6c55edb98da19cc3344 (diff) | |
| download | tor-b23086060866c1541a607e0e9082ef9d9464549e.tar.gz tor-b23086060866c1541a607e0e9082ef9d9464549e.zip | |
Merge branch 'maint-0.3.2'
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 51e800bc31..87b5a93713 100644 --- 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 index 8ad5d038ef..010ee339a0 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2513,7 +2513,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. */ |