commit 8486dea8d7f2d363c4d0d3d093319caa5c728f4e Merge: e54f8e3 d6b0121 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 14 20:16:46 2016 -0400

Merge branch 'maint-0.2.8'

src/common/aes.c | 22 ++++++++++++++++++++++ src/common/crypto.c | 21 +++++++++++++++++++++ src/test/test_microdesc.c | 21 +++++++++++++++++++++ 3 files changed, 64 insertions(+)