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

[art at torproject.org]

commit 90df873decaf035a5e3ac0b734d5d926a065b209
Merge: 3bad940 ae8debc
Author: Arturo Filastò <art at fuffa.org>
Date:   Fri Feb 27 15:41:55 2015 +0100

    Merge branch 'master' of github.com:TheTorProject/ooni-probe
    
    * 'master' of github.com:TheTorProject/ooni-probe:
      Fix typo.
      Fix typo.

 ooni/nettests/manipulation/daphne.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)