Merge branch 'tor-github/pr/1947'

src/feature/control/control_getinfo.c

src/feature/relay/relay_periodic.c

src/feature/relay/router.c

src/feature/relay/selftest.c

src/feature/relay/selftest.h

src/feature/stats/predict_ports.c