commit 7b0cbf22c0fb347db1e7436464865d395aed0ce5 Merge: 14c9b99 081b159 Author: Nick Mathewson <nickm@torproject.org> Date: Sun Dec 20 14:10:52 2015 -0500 Merge remote-tracking branch 'yawning/feature17783_take2' src/common/crypto.c | 141 +++++++++-- src/common/crypto.h | 9 +- src/ext/README | 4 + src/ext/include.am | 11 + src/ext/keccak-tiny/README.markdown | 82 ++++++ src/ext/keccak-tiny/do.sh | 5 + src/ext/keccak-tiny/keccak-tiny-unrolled.c | 368 +++++++++++++++++++++++++++ src/ext/keccak-tiny/keccak-tiny.c | 163 ++++++++++++ src/ext/keccak-tiny/keccak-tiny.h | 66 +++++ src/or/include.am | 4 +- src/test/bench.c | 40 +++ src/test/include.am | 11 +- src/test/test_crypto.c | 376 ++++++++++++++++++++++++++++ src/tools/include.am | 3 + 14 files changed, 1261 insertions(+), 22 deletions(-)