[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

[nickm at torproject.org]

commit a415fee58abf7285e4d42652755b8f34da273f6d
Merge: 4e15c2c ce8a1e2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 7 09:09:06 2016 -0500

    Merge branch 'maint-0.2.9'

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