diff options
author | Nick Mathewson <nickm@torproject.org> | 2016-06-11 10:15:40 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-06-11 10:15:40 -0400 |
commit | d6b2af7a3aba24cf3d77587c41028aad70d59605 (patch) | |
tree | a6d8687d4055a9e27fbcb406cfb518295469bf0c /src/or/rephist.c | |
parent | c274f825da18f33f12eb78260d1c78d5f685d959 (diff) | |
parent | e80a032b61e3c793ad0d1627074b8750f7cfec48 (diff) | |
download | tor-d6b2af7a3aba24cf3d77587c41028aad70d59605.tar.gz tor-d6b2af7a3aba24cf3d77587c41028aad70d59605.zip |
Merge branch 'bug19180_easy_squashed'
Diffstat (limited to 'src/or/rephist.c')
-rw-r--r-- | src/or/rephist.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/rephist.c b/src/or/rephist.c index 8156e078b9..72933550ed 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2738,7 +2738,7 @@ bidi_map_ent_hash(const bidi_map_entry_t *entry) } HT_PROTOTYPE(bidimap, bidi_map_entry_t, node, bidi_map_ent_hash, - bidi_map_ent_eq); + bidi_map_ent_eq) HT_GENERATE2(bidimap, bidi_map_entry_t, node, bidi_map_ent_hash, bidi_map_ent_eq, 0.6, tor_reallocarray_, tor_free_) |