[tor-commits] [tor/master] Merge branch 'cleaned_aes_crypt'

[nickm at torproject.org]

commit 03371e3d3cfe6c3a1859b316c24061a0d7e5d1bd
Merge: f3a0de0 ef5f359
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Feb 6 13:54:09 2016 -0500

    Merge branch 'cleaned_aes_crypt'

 changes/bug18258    |  11 ++++
 src/common/aes.c    | 159 ++++++++--------------------------------------------
 src/common/aes.h    |   3 -
 src/common/crypto.c |   7 ++-
 4 files changed, 38 insertions(+), 142 deletions(-)