PR description:
> Currently, the hidden service is published on the same port as the public listening port.
> But if a non-standard port is configured, this can be used to guess (pretty reliably) that the public IP and the hidden service are the same node.
This is a backport of Core [[https://github.com/bitcoin/bitcoin/pull/15651 | PR15651]]