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

[art at torproject.org]

commit 2764cc2bca9fc60f978b3361ab2e8de372bc5af6
Merge: 852d8e5 da6ac0f
Author: Arturo Filastò <art at fuffa.org>
Date:   Wed May 28 00:10:46 2014 +0200

    Merge branch 'master' of github.com:TheTorProject/ooni-probe
    
    * 'master' of github.com:TheTorProject/ooni-probe:
      Implementation of the v0.3 spec

 ooni/nettests/manipulation/captiveportal.py |   42 +++++++++++++++++++--------
 1 file changed, 30 insertions(+), 12 deletions(-)