commit 7651775b8f4ce00b36735fbc0dc64102b4bbac87 Merge: 79443fd82 7f042cbc0 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Nov 13 08:26:54 2018 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug28413 | 4 ++++ src/common/aes.c | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-)