Commit 1385a511 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.2.9' into maint-0.3.1

parents d6d3f848 b426e83f

src/or/routerlist.c

+2 −0
Original line number Diff line number Diff line
@@ -2758,6 +2758,8 @@ frac_nodes_with_descriptors(const smartlist_t *sl, 
      if (node_has_descriptor(node))

        n_with_descs++;

    });



    tor_free(bandwidths);

    return ((double)n_with_descs) / (double)smartlist_len(sl);

  }

src/or/shared_random_state.c

+1 −0
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ disk_state_parse_commits(sr_state_t *state, 
    if (commit == NULL) {

      /* Ignore badly formed commit. It could also be a authority

       * fingerprint that we don't know about so it shouldn't be used. */

      smartlist_free(args);

      continue;

    }

    /* We consider parseable commit from our disk state to be valid because

src/test/test_hs.c

+5 −2
Original line number Diff line number Diff line
@@ -476,10 +476,10 @@ test_hs_auth_cookies(void *arg) 
#define TEST_COOKIE_ENCODED_STEALTH "YWJjZGVmZ2hpamtsbW5vcB"

#define TEST_COOKIE_ENCODED_INVALID "YWJjZGVmZ2hpamtsbW5vcD"



  char *encoded_cookie;

  char *encoded_cookie = NULL;

  uint8_t raw_cookie[REND_DESC_COOKIE_LEN];

  rend_auth_type_t auth_type;

  char *err_msg;

  char *err_msg = NULL;

  int re;



  (void)arg;
@@ -525,6 +525,9 @@ test_hs_auth_cookies(void *arg) 
  tor_free(err_msg);



 done:

  tor_free(encoded_cookie);

  tor_free(err_msg);



  return;

}

src/test/test_shared_random.c

+1 −0
Original line number Diff line number Diff line
@@ -788,6 +788,7 @@ test_sr_setup_commits(void) 
  tt_assert(!commit_has_reveal_value(commit_d));



 done:

  tor_free(place_holder);

  authority_cert_free(auth_cert);

}