diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-29 13:03:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-29 13:03:00 -0400 |
| commit | 1a5be3c5e76a9ce07c64499b6cb8a6bad9323113 (patch) | |
| tree | a718cc6d292691c82e92883b5a9113499b513619 /src/or | |
| parent | 9d5b815dcabc7344f4e0613246d061064f6d1bd1 (diff) | |
| parent | 5ab23e03fa0a8bce11798cbf025139e9653b9be4 (diff) | |
| download | tor-1a5be3c5e76a9ce07c64499b6cb8a6bad9323113.tar.gz tor-1a5be3c5e76a9ce07c64499b6cb8a6bad9323113.zip | |
Merge branch 'maint-0.3.4'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/dirauth/shared_random_state.c | 1 | ||||
| -rw-r--r-- | src/or/routerlist.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/or/dirauth/shared_random_state.c b/src/or/dirauth/shared_random_state.c index f77a64dfc9..c30a024425 100644 --- a/src/or/dirauth/shared_random_state.c +++ b/src/or/dirauth/shared_random_state.c @@ -373,6 +373,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 diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 68fd763441..98e1f69bb8 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2784,6 +2784,7 @@ frac_nodes_with_descriptors(const smartlist_t *sl, if (node_has_preferred_descriptor(node, for_direct_conn)) n_with_descs++; }); + tor_free(bandwidths); return ((double)n_with_descs) / smartlist_len(sl); } |