commit 15c99be9637fd6c3dfc9f45a24fd06054dffd140 Merge: c079be8c7 54d1a2d80 Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 13 08:27:28 2018 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

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