commit 3f3739c6e064fd5e1c2ac89bfd49fed7a622ac68 Merge: 8340f641c f48fb8a72 Author: Nick Mathewson nickm@torproject.org Date: Thu May 24 09:40:06 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

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