commit 6b2c1d62a5bb590f35779dd26ced00d41938cdb5 Merge: 73378e9ac 42be1c668 Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 13 08:27:29 2018 -0500

Merge branch 'maint-0.3.4' into release-0.3.4

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