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

[nickm at torproject.org]

commit 61f1838cdc3dc11c6154c137b39817081dc0849f
Merge: 1e54bdd f5cc8da
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Apr 7 09:58:21 2017 -0400

    Merge branch 'isolate_openssl'

 changes/ticket21841                         |   4 ++
 src/common/crypto.c                         |  12 ++++
 src/common/crypto.h                         |   4 ++
 src/common/crypto_ed25519.c                 |  16 ++---
 src/common/tortls.c                         |  19 +++++
 src/common/tortls.h                         |  46 ++++++++----
 src/ext/ed25519/donna/ed25519-hash-custom.h |  31 ++++++++
 src/ext/ed25519/ref10/crypto_hash_sha512.h  |  30 ++++----
 src/ext/include.am                          |   1 +
 src/or/main.c                               |   5 +-
 src/test/include.am                         |   1 +
 src/test/test.c                             |   1 +
 src/test/test.h                             |   1 +
 src/test/test_crypto.c                      |  72 -------------------
 src/test/test_crypto_openssl.c              | 107 ++++++++++++++++++++++++++++
 src/test/test_crypto_slow.c                 |   3 -
 src/test/test_link_handshake.c              |  24 ++-----
 src/test/test_microdesc.c                   |   6 --
 src/test/test_rendcache.c                   |   1 -
 src/test/test_tortls.c                      |   1 +
 src/test/testing_common.c                   |   5 +-
 21 files changed, 249 insertions(+), 141 deletions(-)