mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
Merge branch 'maint-0.3.2' into maint-0.3.3
This commit is contained in:
commit
df896ed632
@ -2761,6 +2761,8 @@ frac_nodes_with_descriptors(const smartlist_t *sl,
|
|||||||
if (node_has_any_descriptor(node))
|
if (node_has_any_descriptor(node))
|
||||||
n_with_descs++;
|
n_with_descs++;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
tor_free(bandwidths);
|
||||||
return ((double)n_with_descs) / (double)smartlist_len(sl);
|
return ((double)n_with_descs) / (double)smartlist_len(sl);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -449,6 +449,7 @@ disk_state_parse_commits(sr_state_t *state,
|
|||||||
if (commit == NULL) {
|
if (commit == NULL) {
|
||||||
/* Ignore badly formed commit. It could also be a authority
|
/* Ignore badly formed commit. It could also be a authority
|
||||||
* fingerprint that we don't know about so it shouldn't be used. */
|
* fingerprint that we don't know about so it shouldn't be used. */
|
||||||
|
smartlist_free(args);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
/* We consider parseable commit from our disk state to be valid because
|
/* We consider parseable commit from our disk state to be valid because
|
||||||
|
@ -567,10 +567,10 @@ test_hs_auth_cookies(void *arg)
|
|||||||
#define TEST_COOKIE_ENCODED_STEALTH "YWJjZGVmZ2hpamtsbW5vcB"
|
#define TEST_COOKIE_ENCODED_STEALTH "YWJjZGVmZ2hpamtsbW5vcB"
|
||||||
#define TEST_COOKIE_ENCODED_INVALID "YWJjZGVmZ2hpamtsbW5vcD"
|
#define TEST_COOKIE_ENCODED_INVALID "YWJjZGVmZ2hpamtsbW5vcD"
|
||||||
|
|
||||||
char *encoded_cookie;
|
char *encoded_cookie = NULL;
|
||||||
uint8_t raw_cookie[REND_DESC_COOKIE_LEN];
|
uint8_t raw_cookie[REND_DESC_COOKIE_LEN];
|
||||||
rend_auth_type_t auth_type;
|
rend_auth_type_t auth_type;
|
||||||
char *err_msg;
|
char *err_msg = NULL;
|
||||||
int re;
|
int re;
|
||||||
|
|
||||||
(void)arg;
|
(void)arg;
|
||||||
@ -616,6 +616,9 @@ test_hs_auth_cookies(void *arg)
|
|||||||
tor_free(err_msg);
|
tor_free(err_msg);
|
||||||
|
|
||||||
done:
|
done:
|
||||||
|
tor_free(encoded_cookie);
|
||||||
|
tor_free(err_msg);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -880,6 +880,7 @@ test_sr_setup_commits(void)
|
|||||||
tt_assert(!commit_has_reveal_value(commit_d));
|
tt_assert(!commit_has_reveal_value(commit_d));
|
||||||
|
|
||||||
done:
|
done:
|
||||||
|
tor_free(place_holder);
|
||||||
authority_cert_free(auth_cert);
|
authority_cert_free(auth_cert);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user