commit b402a0887fc6a0c6426c65491f9559ee13bed341 Merge: 2a44ee9b8 d3b122485 Author: David Goulet dgoulet@torproject.org Date: Tue Feb 26 11:30:44 2019 -0500

Merge branch 'tor-github/pr/655'

changes/ticket28837 | 4 + configure.ac | 30 ++++--- src/core/crypto/hs_ntor.c | 14 +--- src/ext/include.am | 2 + src/lib/crypt_ops/crypto_digest.c | 159 +++++++++++++++++++++++++++++++++++++- src/lib/crypt_ops/crypto_digest.h | 2 + src/test/test_crypto.c | 8 +- 7 files changed, 196 insertions(+), 23 deletions(-)