From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 27 Nov 2017 15:02:03 +0000 (-0500)
Subject: Merge branch 'ticket23856_025_01' into maint-0.3.2
X-Git-Tag: tor-0.3.2.6-alpha~8^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ef54610442ee2f2a9143c6c55edb98da19cc3344;p=thirdparty%2Ftor.git

Merge branch 'ticket23856_025_01' into maint-0.3.2
---

ef54610442ee2f2a9143c6c55edb98da19cc3344
diff --cc src/or/router.c
index 8ad5d038ef,e1c2d20b3a..010ee339a0
--- 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. */