[tor-commits] [tor/master] Merge remote-tracking branch 'gtank/feature17663'

commit 74e5385da701392c3fb72487753831b30a0b0c5c Merge: 2079ec9 1a7f6df Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 25 09:00:01 2015 -0500

Merge remote-tracking branch 'gtank/feature17663'

changes/feature17663 | 2 ++ src/common/crypto.c | 89 +++++++++++++++++++++++++++++++++++++++++------- src/common/crypto.h | 19 ++++++++--- src/test/test_crypto.c | 28 +++++++++++++++ 4 files changed, 122 insertions(+), 16 deletions(-)