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

[nickm at torproject.org]

commit 6d375f17fc6df89e9eaf2b9b69f3d69bb78dfc4d
Merge: fdfc528 be3875c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 25 10:17:26 2016 -0400

    Merge branch 'bug19161_028_v2' into maint-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(-)