[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm at torproject.org]

commit f48fb8a720c7cca79249248f92e3bc99cee3414d
Merge: d3a972561 c380562ae
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 24 09:40:06 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.1

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