Pep8 fixes
Randomly pick the socks and control port in test_settings.

This fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763264
Set the datadirectory to be that of the repo.
Determine the sample config dynamically and not from self.data_directory

Call setUp also in test_nettest and test_oonicli
Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe:
  Override skipTest so that it does not produce an error inside of twisted 12.2
  Polyfill the connectProtocol to fix compatibility with Twisted 12.2
  Add tests to verify if ooniprobe will work with the various versions of Twisted we are supposed to support.

Conflicts:
	ooni/tests/bases.py