Merge branch 'maint-0.3.4'

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

diff --cc src/or/routerlist.c
index 68fd763441755cc7cafaec0acf5efd2adc208465,97d83213af0e21c35ae2cd49cfa5708e213702d8..98e1f69bb856942bdaf1fb6c0143e094c15c019d
--- 1/src/or/routerlist.c
--- 2/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@@ -2781,9 -2761,10 +2781,10 @@@ frac_nodes_with_descriptors(const smart
        total <= 0.0) {
      int n_with_descs = 0;
      SMARTLIST_FOREACH(sl, const node_t *, node, {
 -      if (node_has_any_descriptor(node))
 +      if (node_has_preferred_descriptor(node, for_direct_conn))
          n_with_descs++;
      });
+     tor_free(bandwidths);
      return ((double)n_with_descs) / smartlist_len(sl);
    }
  

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

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