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
Add manpages for oonideckgen and ooniresources
Update ooniprobe to 1.2.0
Make it possible to set the data directory via an environment variable OONI_DATA_DIR
Set data_directory to the correct data directory in test_oonicli
Fix type in README and manpage for oonideckgen.

ooniresource is actually ooniresources.
Merge pull request #354 from TheTorProject/fix/settings-config

Make it possible to set the data directory via an environment variable O...
Add ooni.deckgen.processors to the packages listed in setup.py
Fix type in README and manpage for oonideckgen.

ooniresource is actually ooniresources.
Add ooni.deckgen.processors to the packages listed in setup.py
update ooniprobe to 1.2.1
Fix link to README.rst
Add support for test_start_time and test_runtime keys in report.
testDone is no longer called so we can remove it from unittests.
Change the payload of the filename prefix files.

Setting a time too close to epoch makes UTC time conversions not work.
Fix the setting of the test runtime for tests with post processor