Merge pull request #2744 from jamescowens/fix_tor_parameter_handling #3028

Job	Run time
Lint	48s
ARM [GOAL install] [buster]	2m 21s
Win32	3m 39s
macOS 12 native [GOAL install] [GUI] [no depends]	9m 41s
Win64	3m 49s
i386 Linux [GOAL install] [focal]	1m 54s
x86_64 Linux [GOAL install] [GUI] [focal] [no depends]	15m 13s
x86_64 Linux [GOAL install] [GUI] [bionic] [no depends]	13m 3s
macOS 10.14 [GOAL deploy] [GUI] [no tests] [focal]	9m 39s
	1h 0m 7s

Provide feedback