Start defining the models of OONIB
* Create runner for OONIB
Continue work on OONIB
Start working on HTTP Requests
Jot down some quick notes
Merge branch 'master' into packetcapture

* master:
  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.
  * Moved /test_inputs/* to /inputs.
  * Adding new Makefile in top dir * Adding saved copy of *.secdev.org SSL cert so we can correctly check for   cert warning. * Updated installation documentation.
  Move peculiar code to wtf directory. * Comment on tor related code and propose that it gets removed.
  Move peculiar unused file to wtf directory.
  * Added brief doctrings to get pylint to shutup about it.
  * Changed the nettest inputParser to no longer be wrapped by @staticmethod, because that might be confusing to test writers.
  * Changed runner.getTestOptions() to return the localoptions, in addition to setting them as an attribute.
  * There are still bugs in the options parser, and inputs is a listiterater, which also needs to be fixed.
  * Fixed oonicli.py trying to catch the wrong exception. * Added a docstring in oonicli.py. * Fixed oonicli.py not printing the help/info message when called without arguments.

Conflicts:
	ooniprobe.conf
Convert header of ooniprobe script to a non docstring
Refactor install documentation.
Rename keyword filtering test to HTTP keyword filtering
Port china trigger to new API
Further progress on packet capture implementation
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
Finish refactor of the core of OONI.
* Everything is passing
* XXX there is a bug in blocking tests not making the reactor stop
Merge branch 'master' into packetcapture

* master:
  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
  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

Conflicts:
	ooni/config.py
	ooni/runner.py
	ooniprobe.conf
Implement logging to PCAP file support
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
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.

* Move daphn3 protocol to to-be-ported
* Remove rfc3339 support, we will use seconds since epoch
* Refactor code that should have been in nettests
* Eliminate code duplication
* Remove python metaclass virtuosism instanity
Merge branch 'cleanup'

* cleanup:
  Do a very big cleanup and refactor of all the code in the repo.

Conflicts:
	to-be-ported/protocols/daphn3.py
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.
Update example for writing scapy tests.
* Make changes to test template of scapy tests