diff options
author | Nick Mathewson <nickm@torproject.org> | 2020-03-05 08:23:32 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2020-03-05 08:23:32 -0500 |
commit | 686494f0f71b9235399b8241aba3e0c2fcb03ea1 (patch) | |
tree | 39256173e40ef50d45cc35c22561da9279f9753b /src/core/or/circuitmux.c | |
parent | edc0bf5089df13d1d6a246e67bddb484ac99ad59 (diff) | |
parent | b5ccdd978ea138cde92b3513c9d653ba18b8b463 (diff) | |
download | tor-686494f0f71b9235399b8241aba3e0c2fcb03ea1.tar.gz tor-686494f0f71b9235399b8241aba3e0c2fcb03ea1.zip |
Merge branch 'clang_format_prep_3'
Diffstat (limited to 'src/core/or/circuitmux.c')
-rw-r--r-- | src/core/or/circuitmux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/or/circuitmux.c b/src/core/or/circuitmux.c index da95e93657..b770e40bf2 100644 --- a/src/core/or/circuitmux.c +++ b/src/core/or/circuitmux.c @@ -176,10 +176,10 @@ chanid_circid_entry_hash(chanid_circid_muxinfo_t *a) /* Emit a bunch of hash table stuff */ HT_PROTOTYPE(chanid_circid_muxinfo_map, chanid_circid_muxinfo_t, node, - chanid_circid_entry_hash, chanid_circid_entries_eq) + chanid_circid_entry_hash, chanid_circid_entries_eq); HT_GENERATE2(chanid_circid_muxinfo_map, chanid_circid_muxinfo_t, node, chanid_circid_entry_hash, chanid_circid_entries_eq, 0.6, - tor_reallocarray_, tor_free_) + tor_reallocarray_, tor_free_); /* * Circuitmux alloc/free functions |