[tor-commits] [tor/release-0.3.3] Merge branch 'bug28413_029' into maint-0.2.9

[nickm at torproject.org]

commit 7f042cbc0a9397c1e5c0f3e9c3bb31ff333d9983
Merge: 46796623f 1a11702a9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 13 08:26:51 2018 -0500

    Merge branch 'bug28413_029' into maint-0.2.9

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