Refactor Tor settings and add a setting for forcing the use bridges Closes #1269 See merge request !895