commit 3d3bd21cf45cb070296208bccd00e6e6b30fc90b Merge: 744b8d5 7c82e5d Author: Arturo Filastò arturo@filasto.net Date: Tue Apr 5 14:38:51 2016 +0200

Merge pull request #49 from TheTorProject/feature/df-0.2

Feature/df 0.2

Release-Procedure.md | 18 +- data-formats/df-000-base.md | 174 +- data-formats/df-001-httpt.md | 328 ++-- data-formats/df-002-dnst.md | 270 ++- data-formats/df-003-scapy.md | 663 ++++++- data-formats/df-004-tcpt.md | 63 + oonib.md | 78 +- test-specs/ts-001-bridget.md | 2 + test-specs/ts-002-dns-consistency.md | 247 +++ test-specs/ts-002-dnsconsistency.md | 178 -- test-specs/ts-003-http-requests.md | 321 ++-- test-specs/ts-004-http-host.md | 234 +++ test-specs/ts-004-httphost.md | 257 --- test-specs/ts-005-dns-spoof.md | 151 ++ test-specs/ts-005-dnsspoof.md | 149 -- test-specs/ts-006-header-field-manipulation.md | 186 +- test-specs/ts-007-http-invalid-request-line.md | 129 +- test-specs/ts-008-tcp-connect.md | 96 + test-specs/ts-008-tcpconnect.md | 98 - test-specs/ts-009-multi-port-traceroute.md | 2384 ------------------------ test-specs/ts-009-multi-protocol-traceroute.md | 619 ++++++ test-specs/ts-010-captive-portal.md | 125 +- test-specs/ts-011-bridge-reachability.md | 31 +- test-specs/ts-012-dns-injection.md | 2 +- 24 files changed, 3034 insertions(+), 3769 deletions(-)