commit 6a542ccfc7d4507219398b088fa9dc56a292c874 Merge: 4ab90f8 e8fdc80 Author: Arturo Filastò <art@fuffa.org> Date: Fri Feb 1 16:28:03 2013 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe * 'master' of ssh://git-rw.torproject.org/ooni-probe: Fix #7936, minor typo in dnsspoof docs. docs/source/tests/dnsspoof.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)