commit 7253603e6b32ceb5f766017d95ac0a05002b5ed7 Merge: b44fce671 2b5236044 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 19 12:20:13 2018 -0400

Merge branch 'bug26712'

configure.ac | 1 + src/lib/crypt_ops/crypto_hkdf.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)