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

[art at torproject.org]

commit 2adc991557e39797821e5dd0f66a01ab7ccc2835
Merge: b4f14c0 a9d48f3
Author: Arturo Filastò <arturo at filasto.net>
Date:   Fri Feb 5 17:09:27 2016 +0100

    Merge branch 'master' of github.com:TheTorProject/ooni-probe
    
    * 'master' of github.com:TheTorProject/ooni-probe:
      Fix: Typo correction
      Consistency fix: lowercase ooni backend/probe words
      Fix typos in Readme.md

 README.rst                           |  6 +++---
 docs/source/writing_test_helpers.rst | 26 +++++++++++++-------------
 2 files changed, 16 insertions(+), 16 deletions(-)