From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 9 Jul 2018 14:15:16 +0000 (-0400)
Subject: Merge branch 'maint-0.3.3' into maint-0.3.4
X-Git-Tag: tor-0.3.4.4-rc~5^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=529faef28eb3e8907cfb814516953d6636f50487;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.3' into maint-0.3.4
---

529faef28eb3e8907cfb814516953d6636f50487
diff --cc src/or/router.c
index 3879863e82,a3d7cd373c..5485ec913e
--- a/src/or/router.c
+++ b/src/or/router.c
@@@ -2636,12 -2523,11 +2637,14 @@@ check_descriptor_bandwidth_changed(time
  {
    static time_t last_changed = 0;
    uint64_t prev, cur;
-   if (!router_get_my_routerinfo())
+   const routerinfo_t *my_ri = router_get_my_routerinfo();
+   if (!my_ri) /* make sure routerinfo exists */
      return;
  
-   prev = router_get_my_routerinfo()->bandwidthcapacity;
+   prev = my_ri->bandwidthcapacity;
++
 +  /* Consider ourselves to have zero bandwidth if we're hibernating or
 +   * shutting down. */
    cur = we_are_hibernating() ? 0 : rep_hist_bandwidth_assess();
    if ((prev != cur && (!prev || !cur)) ||
        cur > prev*2 ||
@@@ -3813,4 -3733,4 +3817,3 @@@ router_get_all_orports(const routerinfo
    fake_node.ri = (routerinfo_t *)ri;
    return node_get_all_orports(&fake_node);
  }
--