Add bridge and obfsproxy support to director when starting Tor
Merge pull request #82 from aagbsn/feature/add-obfsproxy-bridges

Add bridge and obfsproxy support to director when starting Tor
Update install
Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe

* 'master' of ssh://git-rw.torproject.org/ooni-probe:
  Add bridge and obfsproxy support to director when starting Tor
Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe:
  Update install
Merge branch 'feature/ui' into staging

* feature/ui: (39 commits)
  Fix bug that resulted in inconsistencies in test_id
  Add example on data_dir
  Actually we are already root, no need for sudo
  Run setup.py script as root Install the stable pip, before upgrading
  Fix bug in importing of geodata
  Place data files into proper sub-directory structure
  Fix import lost in merge
  Fix bug in HTTP api
  Add oonid script to run ooni daemon
  Include jquery as dep
  Bump to version 0.1.0
  Add cyclone as a dependency
  Implement XSRF protection in the HTTP API
  Point to data directory in short-not-root deck
  Implement in-browser input file selection views
  Improve setup.py, fixup paths for reporting.
  Remove oonib related data from ooniprobe
  Add support for viewing test results and uploading inputs
  Initial commit of ooni-probe user interface
  Implement starting and stopping of tests via the HTTP API
  ...

Conflicts:
	data/ooniprobe.conf.sample