[tor-commits] [ooni-probe/master] Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe

[art at torproject.org]

commit f5fd154d8f34447f513664deb39fd7bd12363741
Merge: ea4cf26 80c99cb
Author: Arturo Filastò <art at fuffa.org>
Date:   Tue May 14 17:50:27 2013 +0200

    Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe
    
    * 'master' of ssh://git-rw.torproject.org/ooni-probe:
      Add Dominic Hamon's nettest for running tests written with other interpreters.

 nettests/experimental/script.py |   90 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 90 insertions(+), 0 deletions(-)