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

[nickm at torproject.org]

commit 96cd6c402871625ad6a063c9ba4830315109a701
Merge: 27039cb ce8a1e2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 7 09:09:14 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug20588 | 3 +++
 src/common/aes.c | 9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)