[tor-commits] [tor/master] Merge remote-tracking branch 'github/ticket19429_034'

commit a9736f1f3800a7f10de72c6c847e48a502dd5643 Merge: cb0af6157 d6a773f57 Author: Nick Mathewson nickm@torproject.org Date: Mon Apr 30 09:41:33 2018 -0400

Merge remote-tracking branch 'github/ticket19429_034'

changes/feature19429 | 5 +++++ configure.ac | 15 ++++++++++++--- src/common/aes.c | 4 ++++ src/common/crypto.c | 16 ++++++++++++++++ src/common/tortls.c | 19 +++++++++++++++++++ src/test/test_tortls.c | 41 ++++++++++++++++++++++------------------- 6 files changed, 78 insertions(+), 22 deletions(-)