[tor-commits] [ooni-probe/master] Merge branch 'master' into effhaa/vagrant-precise-ooni

[art at torproject.org]

commit 041796597b144754c091e10d46e25b5591355aa3
Merge: eb75f19 d4d8b0b
Author: Arturo Filastò <art at fuffa.org>
Date:   Thu Aug 15 19:14:50 2013 +0200

    Merge branch 'master' into effhaa/vagrant-precise-ooni
    
    * master:
      Fetch dnspython and scapy from pypi instead of the tpo mirror

 requirements.txt |   17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)