commit 44ea3dc3311564a9b7f6f67a106be0fa56b38554
Merge: a3ec811 6d375f1
Author: Nick Mathewson <[email protected]>
Date: Wed May 25 10:21:15 2016 -0400
Merge branch '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(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
