TOR_SOCKS_PORT and TOR_SOCKS_HOST are ignored if TOR_SKIP_LAUNCH=1 is set but control port is unavailable

Summary

In 13.0a6 for Linux, if TOR_SKIP_LAUNCH=1 is set and no control port is available (which may be intentional) then Tor Browser will ignore TOR_SOCKS_PORT and TOR_SOCKS_HOST, instead of using them to populate the network.proxy.socks_port and network.proxy.socks prefs like in 12.x and before.

Steps to reproduce:

For example TOR_SKIP_LAUNCH=1 TOR_SOCKS_HOST=10.152.152.10 ./start-tor-browser to point Tor Browser to an external tor daemon does not work.

Environment

Linux (x86_64)