[tor-commits] [ooni-probe/master] Merge pull request #35 from hellais/dnstamper-dnsconsistency

[isis at torproject.org]

commit f92307be0325d500c953b7543eda5ab70cce4897
Merge: bcb2794 70ecad5
Author: aagbsn <aagbsn at extc.org>
Date:   Sat Feb 16 10:04:00 2013 -0800

    Merge pull request #35 from hellais/dnstamper-dnsconsistency
    
    Rename Dnstamper to dnsconsistency

 decks/before_i_commit.testdeck             |    2 +-
 docs/source/index.rst                      |    2 +-
 docs/source/nettests/nettests.blocking.rst |    4 +-
 docs/source/tests/dnsconsistency.rst       |  180 ++++++++++++++++++++++++++++
 docs/source/tests/dnstamper.rst            |  180 ----------------------------
 docs/source/writing_tests.rst              |    2 +-
 inputs/README                              |    2 +-
 nettests/blocking/dnsconsistency.py        |  173 ++++++++++++++++++++++++++
 nettests/blocking/dnstamper.py             |  173 --------------------------
 9 files changed, 359 insertions(+), 359 deletions(-)