commit 1cdb839108ef7487aaa516ab003d1afd7abfecc6 Merge: 299f892 d6b0121 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 14 20:21:32 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

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