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

[nickm at torproject.org]

commit 5b336f2e0b792b2927b1d3bdc521d81221c5e157
Merge: eede3a1 2a36541
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 5 08:04:04 2016 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8

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