[tor-commits] [tor/master] Merge branch 'bug25120'

[nickm at torproject.org]

commit 627974b02ed9e5c286055272f34bd8c1ba268267
Merge: 1df701c08 14c47a0b5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Feb 11 16:10:58 2018 -0500

    Merge branch 'bug25120'

 src/common/crypto.c | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)