Merge branch 'maint-0.3.3' into maint-0.3.4

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

diff --cc src/or/router.c
index 5485ec913e4d3e8854bf74e1b427456dedc0f520,edaa040dd7da28e565faa380d67b64b8f4069dcd..03959e907d8a36a257cc94aac1f1dfa73e67ab02
--- 1/src/or/router.c
--- 2/src/or/router.c
+++ b/src/or/router.c
@@@ -2642,13 -2544,10 +2658,13 @@@ check_descriptor_bandwidth_changed(time
      return;
  
    prev = my_ri->bandwidthcapacity;
-   cur = we_are_hibernating() ? 0 : rep_hist_bandwidth_assess();
 +
 +  /* Consider ourselves to have zero bandwidth if we're hibernating or
 +   * shutting down. */
+   cur = hibernating ? 0 : rep_hist_bandwidth_assess();
    if ((prev != cur && (!prev || !cur)) ||
-       cur > prev*2 ||
-       cur < prev/2) {
+       cur > (prev * BANDWIDTH_CHANGE_FACTOR) ||
+       cur < (prev / BANDWIDTH_CHANGE_FACTOR) ) {
      if (last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now || !prev) {
        log_info(LD_GENERAL,
                 "Measured bandwidth has changed; rebuilding descriptor.");

diff --cc src/test/log_test_helpers.h
Simple merge