[tor-commits] [ooni-probe/master] Merge branch 'master' of https://github.com/TheTorProject/ooni-probe

[art at torproject.org]

commit bcb27944ab9dfb99290749e021879f94c667c60e
Merge: 64e5801 96acbc4
Author: Arturo Filastò <art at fuffa.org>
Date:   Thu Feb 7 14:12:53 2013 +0100

    Merge branch 'master' of https://github.com/TheTorProject/ooni-probe
    
    * 'master' of https://github.com/TheTorProject/ooni-probe:
      Fix typo in dnstamper test example docs
      Properly handle errors when DNS lookups
      Fix typo in test writing documentation

 docs/source/tests/dnstamper.rst |    2 +-
 docs/source/writing_tests.rst   |    4 ++--
 nettests/blocking/dnstamper.py  |    9 ++++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)