Refactor Tor settings and add a setting for forcing the use bridges

Merged Torsten Grote requested to merge 1269-bridge-setting into master
Edited by Torsten Grote

Merge request reports