commit c380562aed5242eab6449b054199d742f02833dd Merge: d1e4ffc71 aeb4be1d5 Author: Nick Mathewson nickm@torproject.org Date: Thu May 24 09:39:46 2018 -0400

Merge branch 'bug26116_029' into maint-0.2.9

changes/bug26116 | 7 +++++++ src/common/crypto.c | 7 ++++++- src/test/test_crypto.c | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-)