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

[art at torproject.org]

commit 3e47a9e6d90ed71d8943d245e21bad81ee566059
Merge: 0417965 296b704
Author: Arturo Filastò <art at fuffa.org>
Date:   Thu Aug 15 19:27:15 2013 +0200

    Merge branch 'master' into effhaa/vagrant-precise-ooni
    
    * master:
      Add disclaimer
      fixing rights
      back to upstream master
      nettests dir changed
      added precise and squeeze support to setup-dependencies.sh
    
    Conflicts:
    	README.md

 README.md     |    7 +++++++
 inputs/README |   12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)