commit 987174cc6fb4915299236fd76e3bb6c893e78653 Merge: 4e439cd40 8483241b4 Author: Nick Mathewson nickm@torproject.org Date: Sun Jun 17 19:28:59 2018 -0400

Merge remote-tracking branch 'github/bug26152_035'

changes/bug26152 | 4 ++++ src/test/test_crypto.c | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-)