Combine router_get_advertised_or_port{,by_af_}() functions

src/core/mainloop/connection.c

src/feature/dirauth/dirvote.c

src/feature/relay/router.c

src/feature/relay/router.h

src/test/test_router.c