commit 0f5f6b8a412615026603954b1760006723026da1 Merge: b645e2f c625ab9 Author: Nick Mathewson <nickm@torproject.org> Date: Sat Feb 6 15:30:22 2016 -0500 Merge remote-tracking branch 'yawning/bug18221' changes/bug18221 | 3 ++ src/common/crypto.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 74 insertions(+), 8 deletions(-)