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

[nickm at torproject.org]

commit ce8a1e25a2a7ea7f4c7ce72932b7ee08fa05b7d3
Merge: f6a3d21 0bd55ed
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 7 09:08:58 2016 -0500

    Merge branch 'bug20588' into maint-0.2.9

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