Merge branch 'maint-0.3.2' into maint-0.3.3

diff --cc src/or/routerlist.c
index 1bfbd9f670109d2c06589b9d559c781b31038c4d,95b39d357161c31e0505ede783d7e76f9d338b82..203895c86775f1e627c79aefe99a196f5f03ee54
--- 1/src/or/routerlist.c
--- 2/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@@ -2758,9 -2755,11 +2758,11 @@@ frac_nodes_with_descriptors(const smart
        total <= 0.0) {
      int n_with_descs = 0;
      SMARTLIST_FOREACH(sl, const node_t *, node, {
 -      if (node_has_descriptor(node))
 +      if (node_has_any_descriptor(node))
          n_with_descs++;
      });
+ 
+     tor_free(bandwidths);
      return ((double)n_with_descs) / (double)smartlist_len(sl);
    }
  

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

diff --cc src/test/test_hs.c
Simple merge

diff --cc src/test/test_shared_random.c
Simple merge