commit 1d4d38555b8d37006044f2f59a0e263bf0e4742c Merge: 230da42 0c99be6 Author: aagbsn aagbsn@extc.org Date: Wed Mar 20 11:22:25 2013 -0700

Merge pull request #52 from hellais/bug7999

Add support for multiple inheritance in tests

nettests/examples/example_dns_http.py | 11 +++++++++++ ooni/templates/dnst.py | 10 ++++++---- ooni/templates/httpt.py | 8 +++++--- ooni/templates/scapyt.py | 2 ++ ooni/templates/tcpt.py | 2 ++ 5 files changed, 26 insertions(+), 7 deletions(-)