commit e6d6347690d085dddb57d087a952750131b80758 Merge: 01d729cbf 89cafc4af Author: Nick Mathewson <nickm@torproject.org> Date: Wed May 9 08:23:27 2018 -0400 Merge remote-tracking branch 'public/bug26005_034' src/common/aes.c | 2 +- src/common/crypto.c | 10 +++++----- src/common/tortls.c | 4 ++-- src/test/test_tortls.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-)