Merge remote-tracking branch 'public/split_relay_crypto'

diff --cc src/or/circuitbuild.c
Simple merge

diff --cc src/or/circuitlist.c
Simple merge

diff --cc src/or/or.h
Simple merge

diff --cc src/or/relay.c
Simple merge

diff --cc src/or/relay.h
Simple merge

diff --cc src/test/bench.c
Simple merge

diff --cc src/test/include.am
Simple merge

diff --cc src/test/test.c
Simple merge

diff --cc src/test/test.h
Simple merge

diff --cc src/test/test_hs_service.c
Simple merge