Start defining the models of OONIB
* Create runner for OONIB
Continue work on OONIB
Start working on HTTP Requests
Start plotting out the multi protocol traceroute test
Merge branch 'master' into http_requests

* master: (35 commits)
  Update example for writing scapy tests. * Make changes to test template of scapy tests
  Completely rewrite the txscapy. * It is now much cleaner and does not start the packet capture in a separate thread.   It subclasses the twisted filedescriptor protocol and returns a deferred that will   fire the callback with the packets it received and the ones it considers answers   to the request.
  Do a very big cleanup and refactor of all the code in the repo.
  Do a very big cleanup and refactor of all the code in the repo.
  Add txscapy to the commit This should have been in the previous commit and I should not have tagged the release I must run git clean -r;./before_i_commit.sh; before pushing to master. Disregard the v0.0.2-alpha tag
  Implement logging to PCAP file support
  Finish refactor of the core of OONI. * Everything is passing * XXX there is a bug in blocking tests not making the reactor stop
  Completely refactor the logic for running tests * We no longer rely on calling trial * The code is now *much* more clean and readable * The purpose of this is to make room for the threadpool to   capture packets
  Further progress on packet capture implementation
  Port china trigger to new API
  Rename keyword filtering test to HTTP keyword filtering
  Refactor install documentation.
  Convert header of ooniprobe script to a non docstring
  Move test inputs back to where they were.
  Disabled debug log in default config file * Make runner rename file to .old if it already exists
  Refactor reporting system * Fix import error in http host test
  * Moved metaclass code to separate branch 'meta'.
  * Removed unused code from assertions.py. * Deleted config.py and process.py.
  * Removed bug as a result of merging which reintroduced the bug for log   messages being printed twice.
  * Made the submit-patch script create the /patches directory if it doesn't already exist.
  ...
Refactor the logic for running of tests
* There was a bug related to generators not being rewindable we now convert the
  generator of one input unit to a list
Add backend to the required options of http_requests test
Merge branch 'master' into oonib

* master: (43 commits)
  Update example for writing scapy tests. * Make changes to test template of scapy tests
  Completely rewrite the txscapy. * It is now much cleaner and does not start the packet capture in a separate thread.   It subclasses the twisted filedescriptor protocol and returns a deferred that will   fire the callback with the packets it received and the ones it considers answers   to the request.
  Do a very big cleanup and refactor of all the code in the repo.
  Do a very big cleanup and refactor of all the code in the repo.
  Add txscapy to the commit This should have been in the previous commit and I should not have tagged the release I must run git clean -r;./before_i_commit.sh; before pushing to master. Disregard the v0.0.2-alpha tag
  Implement logging to PCAP file support
  Finish refactor of the core of OONI. * Everything is passing * XXX there is a bug in blocking tests not making the reactor stop
  Completely refactor the logic for running tests * We no longer rely on calling trial * The code is now *much* more clean and readable * The purpose of this is to make room for the threadpool to   capture packets
  Further progress on packet capture implementation
  Port china trigger to new API
  Rename keyword filtering test to HTTP keyword filtering
  Refactor install documentation.
  Convert header of ooniprobe script to a non docstring
  Move test inputs back to where they were.
  Disabled debug log in default config file * Make runner rename file to .old if it already exists
  Refactor reporting system * Fix import error in http host test
  * Moved metaclass code to separate branch 'meta'.
  * Removed unused code from assertions.py. * Deleted config.py and process.py.
  * Removed bug as a result of merging which reintroduced the bug for log   messages being printed twice.
  * Made the submit-patch script create the /patches directory if it doesn't already exist.
  ...
Fully switch to using only cyclone for HTTP related test helpers
* Implement HTTP Request handler backend
* Fix the startup script of OONIB
* Disable daphn3 test helper script
* Various cleanups
Start defining the models of OONIB
* Create runner for OONIB
Continue work on OONIB
Fully switch to using only cyclone for HTTP related test helpers
* Implement HTTP Request handler backend
* Fix the startup script of OONIB
* Disable daphn3 test helper script
* Various cleanups
Add basic configuration support to oonib
Add database support to oonib
* We have function to automatically create tables based on the Storm db definition
  (borrowed from code I wrote for GLBackend)
* Start plotting out the structure of the database support.
Merge branch 'oonib'

* oonib:
  Fully switch to using only cyclone for HTTP related test helpers * Implement HTTP Request handler backend * Fix the startup script of OONIB * Disable daphn3 test helper script * Various cleanups
  Continue work on OONIB
  Start defining the models of OONIB * Create runner for OONIB

Conflicts:
	oonib/oonibackend.py
	oonib/report/db/__init__.py
Fix some docstrings
Merge branch 'master' into http_requests

* master:
  Add database support to oonib * We have function to automatically create tables based on the Storm db definition   (borrowed from code I wrote for GLBackend) * Start plotting out the structure of the database support.
  Add basic configuration support to oonib
  Fully switch to using only cyclone for HTTP related test helpers * Implement HTTP Request handler backend * Fix the startup script of OONIB * Disable daphn3 test helper script * Various cleanups
  Continue work on OONIB
  Start defining the models of OONIB * Create runner for OONIB
  Fully switch to using only cyclone for HTTP related test helpers * Implement HTTP Request handler backend * Fix the startup script of OONIB * Disable daphn3 test helper script * Various cleanups
  Continue work on OONIB
  Start defining the models of OONIB * Create runner for OONIB
Clean up unused code
* Fix imports in oonib
Merge branch 'master' into http_requests

* master:
  Clean up unused code * Fix imports in oonib
Merge branch 'master' into multiprotocoltraceroute

* master:
  Clean up unused code * Fix imports in oonib
  Add database support to oonib * We have function to automatically create tables based on the Storm db definition   (borrowed from code I wrote for GLBackend) * Start plotting out the structure of the database support.
  Add basic configuration support to oonib
  Fully switch to using only cyclone for HTTP related test helpers * Implement HTTP Request handler backend * Fix the startup script of OONIB * Disable daphn3 test helper script * Various cleanups
  Continue work on OONIB
  Start defining the models of OONIB * Create runner for OONIB
  Fully switch to using only cyclone for HTTP related test helpers * Implement HTTP Request handler backend * Fix the startup script of OONIB * Disable daphn3 test helper script * Various cleanups
  Update example for writing scapy tests. * Make changes to test template of scapy tests
  Continue work on OONIB
  Start defining the models of OONIB * Create runner for OONIB