[tor-commits] [tor/master] Merge remote-tracking branch 'public/aes256'

[nickm at torproject.org]

commit af01e8211e08fd418365f66c79a04e0db5a74aaa
Merge: 144bd86 6cb9c2c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 19 14:22:27 2016 -0400

    Merge remote-tracking branch 'public/aes256'

 src/common/aes.c       | 28 +++++++++------
 src/common/aes.h       |  3 +-
 src/common/crypto.c    | 98 +++++++++++++++++++++++++-------------------------
 src/common/crypto.h    |  6 +++-
 src/test/bench.c       | 16 ++++++---
 src/test/test_crypto.c | 71 ++++++++++++++++++++++++++----------
 6 files changed, 137 insertions(+), 85 deletions(-)