[tor-commits] [tor/maint-0.3.2] Merge branch 'ticket23856_025_01' into maint-0.3.2

[nickm at torproject.org]

commit ef54610442ee2f2a9143c6c55edb98da19cc3344
Merge: 4bb287aa3 8be50ca3e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 27 10:02:03 2017 -0500

    Merge branch 'ticket23856_025_01' into maint-0.3.2

 changes/ticket23856 | 4 ++++
 src/or/rephist.c    | 4 ++--
 src/or/router.c     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --cc src/or/router.c
index 8ad5d038e,e1c2d20b3..010ee339a
--- a/src/or/router.c
+++ b/src/or/router.c
@@@ -2511,9 -2063,8 +2511,9 @@@ mark_my_descriptor_dirty(const char *re
  }
  
  /** How frequently will we republish our descriptor because of large (factor
 - * of 2) shifts in estimated bandwidth? */
 + * 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. */