Merge branch 'maint-0.3.3' into maint-0.3.4

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

diff --cc src/or/routerlist.c
index 8788dc0190eb4e2d87fb22025123c279de78ae0b,203895c86775f1e627c79aefe99a196f5f03ee54..97d83213af0e21c35ae2cd49cfa5708e213702d8
--- 1/src/or/routerlist.c
--- 2/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();
  }
--

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