Merge branch 'maint-0.2.5' into maint-0.2.8

diff --cc src/or/rephist.c
Simple merge

diff --cc src/or/router.c
index bc7a2fcfc34f1c3481a9fbc882d9c3e3f93e1c8c,e1c2d20b3a1a409d688b34b3473c411f3788af00..b134f2e315ecab7d6c1ee529177ac94e7f0c667f
--- 1/src/or/router.c
--- 2/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. */