commit 42be1c668b9f8ec255afb307054e6388f478e837 Merge: 1fce9d129 54d1a2d80 Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 13 08:27:29 2018 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

changes/bug28413 | 4 ++++ src/common/aes.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)