commit 6851a08090325dc51b26e80350395c4a0c778cf8 Merge: bfab7b9d3 d1d66866b Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 24 10:20:41 2018 -0400

Merge branch 'ticket28115_035' into maint-0.3.5

changes/bug28115 | 3 +++ src/lib/crypt_ops/crypto_ope.c | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-)