[tor-commits] [tor/master] Combine router_get_advertised_or_port{, by_af_}() functions