commit c6d7e0becf33409f87c41c369cd3b561f477df2b
Merge: 2933f73b3 a9fa48300
Author: Nick Mathewson <[email protected]>
Date: Thu Apr 5 12:12:18 2018 -0400
Merge remote-tracking branch 'public/split_relay_crypto'
src/or/circuitbuild.c | 77 +----------
src/or/circuitlist.c | 19 +--
src/or/include.am | 2 +
src/or/or.h | 36 +++--
src/or/relay.c | 179 +------------------------
src/or/relay.h | 3 -
src/or/relay_crypto.c | 326 +++++++++++++++++++++++++++++++++++++++++++++
src/or/relay_crypto.h | 31 +++++
src/test/bench.c | 18 ++-
src/test/include.am | 1 +
src/test/test.c | 1 +
src/test/test.h | 1 +
src/test/test_hs_client.c | 16 +--
src/test/test_hs_service.c | 8 +-
src/test/test_relaycrypt.c | 184 +++++++++++++++++++++++++
15 files changed, 597 insertions(+), 305 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
