commit 230a3d1400939eddf17c3df26e398104a38f5fb1 Merge: 8340bec 8f292f1 Author: Nick Mathewson nickm@torproject.org Date: Tue May 3 16:12:29 2016 -0400

Merge branch 'maint-0.2.8'

changes/bug18943 | 6 +++ src/ext/keccak-tiny/keccak-tiny-unrolled.c | 72 +++++++++++++++++++++--------- 2 files changed, 57 insertions(+), 21 deletions(-)