[tor-commits] [ooni-probe/master] Merge pull request #160 from TheTorProject/effhaa/vagrant-precise-ooni

Thu Aug 15 17:29:48 UTC 2013

commit c81d7fecd20dc4d89fe46cc3f98892fa8f62ee3e
Merge: 2d94c90 3e47a9e
Author: Arturo FilastÃ² <arturo at filasto.net>
Date:   Thu Aug 15 10:28:13 2013 -0700

    Merge pull request #160 from TheTorProject/effhaa/vagrant-precise-ooni
    
    Effhaa/vagrant precise ooni

 README.md             |    5 +-
 Vagrantfile           |  147 ++-----------
 data/Makefile         |   12 +-
 ooni/utils/log.py     |    3 +
 requirements.txt      |   18 +-
 setup-dependencies.sh |  563 +++++++++++++++++++++++++++++++++++++++++++------
 setup.py              |    2 +-
 7 files changed, 540 insertions(+), 210 deletions(-)