commit 9d199893feabefc6fcc6849f939ec5cd4d8891b8 Merge: b5e2b38 6d375f1 Author: Nick Mathewson nickm@torproject.org Date: Wed May 25 10:21:04 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

changes/bug19161 | 3 +++ configure.ac | 1 + src/common/crypto_s2k.c | 2 +- src/test/test_crypto_slow.c | 15 ++++++++------- 4 files changed, 13 insertions(+), 8 deletions(-)