commit 2fce1274de5bcfd053d6b4b4b5858f6061eb2989 Merge: f7dc920f4 f55598f87 Author: David Goulet <dgoulet@torproject.org> Date: Tue Jul 23 09:43:36 2019 -0400 Merge branch 'tor-github/pr/1153' changes/ticket31025 | 5 +++++ src/ext/csiphash.c | 8 ++++++++ 2 files changed, 13 insertions(+)