[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.8

[nickm at torproject.org]

commit bc1ea4f470734f7fa22949318a98e286da5cba49
Merge: f97f301b5 f5d4bdf30
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 11 16:54:11 2017 -0500

    Merge branch 'maint-0.2.5' into maint-0.2.8

 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 bc7a2fcfc,e1c2d20b3..b134f2e31
--- a/src/or/router.c
+++ b/src/or/router.c
@@@ -2310,9 -2063,8 +2310,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. */