Warn if Tor is a relay and a HS

Closes 12908; see #8742
Merge remote-tracking branch 'public/bug12908_025' into maint-0.2.5