[tor-commits] [tor/master] Merge branch 'libscrypt_eq_openssl_squashed'

[nickm at torproject.org]

commit 0ca98c1ee5f81f95fefde984a474391ea8a9842a
Merge: 4438b2a a13d0fd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 9 16:31:42 2015 -0400

    Merge branch 'libscrypt_eq_openssl_squashed'

 changes/ticket16189         |    6 +++
 configure.ac                |    4 ++
 src/test/test_crypto_slow.c |  112 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 122 insertions(+)