commit d000e798acce374225ead0bd074169ad611bf001 Merge: d1e9285b1 ae4c94bb6 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Nov 13 08:27:29 2018 -0500 Merge branch 'maint-0.3.5' changes/bug28413 | 4 ++++ src/lib/crypt_ops/aes_openssl.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)