Merge remote-tracking branch 'public/ed25519_hup_v2'

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

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