Fix Onion Circuits
Commit 3b50f92e broke Onion Circuits because it set TOR_CONTROL_PORT before calling /usr/local/lib/run-with-env. That script only passes through allowed environment variables, which TOR_CONTROL_PORT is not.
We now set TOR_CONTROL_PORT after calling run-with-env.
Closes #20233 (closed), #18338 (closed)
Edited by intrigeri