From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 29 Jun 2018 17:02:56 +0000 (-0400)
Subject: Merge branch 'maint-0.3.3' into maint-0.3.4
X-Git-Tag: tor-0.3.4.4-rc~21^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ab23e03fa0a8bce11798cbf025139e9653b9be4;p=thirdparty%2Ftor.git

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

5ab23e03fa0a8bce11798cbf025139e9653b9be4
diff --cc src/or/routerlist.c
index 8788dc0190,203895c867..97d83213af
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@@ -2764,7 -2761,9 +2764,8 @@@ frac_nodes_with_descriptors(const smart
        if (node_has_any_descriptor(node))
          n_with_descs++;
      });
 -
+     tor_free(bandwidths);
 -    return ((double)n_with_descs) / (double)smartlist_len(sl);
 +    return ((double)n_with_descs) / smartlist_len(sl);
    }
  
    present = 0.0;
@@@ -5819,4 -5818,4 +5820,3 @@@ refresh_all_country_info(void
  
    nodelist_refresh_countries();
  }
--