Merge branch 'ed25519_lookup'

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

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

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

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

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

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

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

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

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

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

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

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