added precise and squeeze support to setup-dependencies.sh
nettests dir changed
back to upstream master
fixing rights
Add disclaimer

fixes: https://github.com/TheTorProject/ooni-probe/issues/145
Merge pull request #54 from moskvax/squeeze-precise-setup-support

added precise and squeeze support to setup-dependencies.sh
Merge pull request #155 from effhaa/readme-fix

Readme Fix: nettests location changed
Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe:
  Add disclaimer
  fixing rights
  back to upstream master
  nettests dir changed
  using precise-capable setup-dependencies from https://github.com/TheTorProject/ooni-probe/pull/54
  Add obfsproxy_binary option to sample config
  added precise and squeeze support to setup-dependencies.sh
Merge branch 'master' into effhaa/vagrant-precise-ooni

* master:
  Add disclaimer
  fixing rights
  back to upstream master
  nettests dir changed
  added precise and squeeze support to setup-dependencies.sh

Conflicts:
	README.md