commit 31c9bdadbe3ac4d2b7aa8d8036ccf10643b986f8 Merge: 8083e7c 9014dc1 Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 14 19:47:38 2017 -0400

Merge branch 'keccak-load-faster'

changes/faster-keccak | 4 ++ src/ext/byteorder.h | 67 ++++++++++++++++++++++++++++++ src/ext/csiphash.c | 36 +--------------- src/ext/include.am | 1 + src/ext/keccak-tiny/keccak-tiny-unrolled.c | 19 +++------ 5 files changed, 79 insertions(+), 48 deletions(-)