August 2013 - tor-commits - lists.torproject.org

[ooni-probe/master] Merge branch 'master' into effhaa/vagrant-precise-ooni
by art＠torproject.org 15 Aug '13

15 Aug '13

commit 3e47a9e6d90ed71d8943d245e21bad81ee566059 Merge: 0417965 296b704 Author: Arturo Filastò <art(a)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(-)

1 0

[ooni-probe/master] Merge pull request #160 from TheTorProject/effhaa/vagrant-precise-ooni
by art＠torproject.org 15 Aug '13

15 Aug '13

commit c81d7fecd20dc4d89fe46cc3f98892fa8f62ee3e Merge: 2d94c90 3e47a9e Author: Arturo Filastò <arturo(a)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(-)

1 0

[ooni-probe/master] Add obfsproxy_binary option to sample config
by art＠torproject.org 15 Aug '13

15 Aug '13

commit 8b4b2d9dabecf7192dccc64251d6c91ff6cf9932 Author: aagbsn <aagbsn(a)extc.org> Date: Thu Jul 4 15:04:39 2013 +0200 Add obfsproxy_binary option to sample config --- data/ooniprobe.conf.sample | 1 + 1 file changed, 1 insertion(+) diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample index f0c2fef..54f7b83 100644 --- a/data/ooniprobe.conf.sample +++ b/data/ooniprobe.conf.sample @@ -25,6 +25,7 @@ advanced: debug: true # enable if auto detection fails #tor_binary: /usr/sbin/tor + #obfsproxy_binary: /usr/bin/obfsproxy # For auto detection interface: auto # Of specify a specific interface

1 0

[ooni-probe/master] added precise and squeeze support to setup-dependencies.sh
by art＠torproject.org 15 Aug '13

15 Aug '13

commit 7e6bc883c0c0cbb99c152d9389994ded42e04de8 Author: Stephen Caraher <moskvax(a)gmail.com> Date: Wed Feb 27 21:45:05 2013 +1100 added precise and squeeze support to setup-dependencies.sh --- setup-dependencies.sh | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/setup-dependencies.sh b/setup-dependencies.sh index c4f356f..cdbd0f0 100755 --- a/setup-dependencies.sh +++ b/setup-dependencies.sh @@ -1,16 +1,19 @@ #!/bin/bash +trap 'sudo -k && exit 1' INT # Discover our Distro release RELEASE="`lsb_release -c|cut -f 2`"; -TOR_DEB_REPO="deb.torproject.org/torproject.org"; +TOR_DEB_REPO="http://deb.torproject.org/torproject.org"; -echo "sudo is annoying, tell us your password once and sudo won't annoy you for the rest of this process..."; -sudo echo "if you read this, we won't ask for your password again during this process unless something goes wrong"; +case $RELEASE in + natty|wheezy|squeeze|precise) + + echo "sudo is annoying, tell us your password once and sudo won't annoy you for the rest of this process..."; + sudo echo "if you read this, we won't ask for your password again during this process unless something goes wrong"; -# This is for Ubuntu's natty -if [ $RELEASE = "natty" ] || [ $RELEASE = "wheezy" ]; then # Add Tor repo HAVE_GPG_KEY="`sudo apt-key finger|grep 'A3C4 F0F9 79CA A22C DBA8 F512 EE8C BC9E 886D DD89'|head -n 1`"; + echo "Checking for torproject.org Debian repository key..." if [ -z "$HAVE_GPG_KEY" ]; then echo "It appears that you do not have the torproject.org Debian repository key installed; installing it..."; cat apt.key | sudo apt-key add -; @@ -21,7 +24,11 @@ if [ $RELEASE = "natty" ] || [ $RELEASE = "wheezy" ]; then HAVE_TOR_REPO="`grep deb.torproject.org/torproject.org /etc/apt/sources.list /etc/apt/sources.list.d/* 2>&1|grep torproject|head -n 1`"; if [ -z "$HAVE_TOR_REPO" ]; then echo "It appears that you do not have the torproject.org Debian repository installed; installing it..."; - sudo apt-add-repository "deb $TOR_DEB_REPO $RELEASE main"; + if [ $RELEASE = "squeeze" ]; then + (echo -e "deb $TOR_DEB_REPO $RELEASE main\ndeb-src $TOR_DEB_REPO $RELEASE main" | sudo tee -a /etc/apt/sources.list) > /dev/null + else + sudo apt-add-repository "deb $TOR_DEB_REPO $RELEASE main" + fi else echo "It appears that you have the torproject.org Debian repository installed!"; fi @@ -34,7 +41,7 @@ if [ $RELEASE = "natty" ] || [ $RELEASE = "wheezy" ]; then if [ ! -f ~/.virtualenvs/ooniprobe/bin/activate ]; then # Set up the virtual environment - mkdir ~/.virtualenvs/ + mkdir -p ~/.virtualenvs virtualenv ~/.virtualenvs/ooniprobe source ~/.virtualenvs/ooniprobe/bin/activate else @@ -74,10 +81,9 @@ if [ $RELEASE = "natty" ] || [ $RELEASE = "wheezy" ]; then echo " fi"; echo ; -else - + ;; +*) echo "It appears that you are using an unsupported OS - please tell us"; echo "by filing a bug: https://trac.torproject.org/projects/tor/newticket"; - -fi - + ;; +esac

1 0

[ooni-probe/master] Merge pull request #129 from aagbsn/fix/add_obfsproxy_binary_option_to_sample_config
by art＠torproject.org 15 Aug '13

15 Aug '13

commit 7908de9974a899ccad181a55be04244a69ed878c Merge: d979704 8b4b2d9 Author: Arturo Filastò <hellais(a)gmail.com> Date: Thu Jul 4 06:24:27 2013 -0700 Merge pull request #129 from aagbsn/fix/add_obfsproxy_binary_option_to_sample_config Add obfsproxy_binary option to sample config data/ooniprobe.conf.sample | 1 + 1 file changed, 1 insertion(+)

1 0

[ooni-probe/master] using precise-capable setup-dependencies from https://github.com/TheTorProject/ooni-probe/pull/54
by art＠torproject.org 15 Aug '13

15 Aug '13

commit 35636cba3fb1c9ae953147cecc13f6983461c529 Author: fh <fh-github(a)fholzhauer.de> Date: Thu Jul 25 16:27:54 2013 +0200 using precise-capable setup-dependencies from https://github.com/TheTorProject/ooni-probe/pull/54 --- setup-dependencies.sh | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/setup-dependencies.sh b/setup-dependencies.sh old mode 100755 new mode 100644 index c4f356f..cdbd0f0 --- a/setup-dependencies.sh +++ b/setup-dependencies.sh @@ -1,16 +1,19 @@ #!/bin/bash +trap 'sudo -k && exit 1' INT # Discover our Distro release RELEASE="`lsb_release -c|cut -f 2`"; -TOR_DEB_REPO="deb.torproject.org/torproject.org"; +TOR_DEB_REPO="http://deb.torproject.org/torproject.org"; -echo "sudo is annoying, tell us your password once and sudo won't annoy you for the rest of this process..."; -sudo echo "if you read this, we won't ask for your password again during this process unless something goes wrong"; +case $RELEASE in + natty|wheezy|squeeze|precise) + + echo "sudo is annoying, tell us your password once and sudo won't annoy you for the rest of this process..."; + sudo echo "if you read this, we won't ask for your password again during this process unless something goes wrong"; -# This is for Ubuntu's natty -if [ $RELEASE = "natty" ] || [ $RELEASE = "wheezy" ]; then # Add Tor repo HAVE_GPG_KEY="`sudo apt-key finger|grep 'A3C4 F0F9 79CA A22C DBA8 F512 EE8C BC9E 886D DD89'|head -n 1`"; + echo "Checking for torproject.org Debian repository key..." if [ -z "$HAVE_GPG_KEY" ]; then echo "It appears that you do not have the torproject.org Debian repository key installed; installing it..."; cat apt.key | sudo apt-key add -; @@ -21,7 +24,11 @@ if [ $RELEASE = "natty" ] || [ $RELEASE = "wheezy" ]; then HAVE_TOR_REPO="`grep deb.torproject.org/torproject.org /etc/apt/sources.list /etc/apt/sources.list.d/* 2>&1|grep torproject|head -n 1`"; if [ -z "$HAVE_TOR_REPO" ]; then echo "It appears that you do not have the torproject.org Debian repository installed; installing it..."; - sudo apt-add-repository "deb $TOR_DEB_REPO $RELEASE main"; + if [ $RELEASE = "squeeze" ]; then + (echo -e "deb $TOR_DEB_REPO $RELEASE main\ndeb-src $TOR_DEB_REPO $RELEASE main" | sudo tee -a /etc/apt/sources.list) > /dev/null + else + sudo apt-add-repository "deb $TOR_DEB_REPO $RELEASE main" + fi else echo "It appears that you have the torproject.org Debian repository installed!"; fi @@ -34,7 +41,7 @@ if [ $RELEASE = "natty" ] || [ $RELEASE = "wheezy" ]; then if [ ! -f ~/.virtualenvs/ooniprobe/bin/activate ]; then # Set up the virtual environment - mkdir ~/.virtualenvs/ + mkdir -p ~/.virtualenvs virtualenv ~/.virtualenvs/ooniprobe source ~/.virtualenvs/ooniprobe/bin/activate else @@ -74,10 +81,9 @@ if [ $RELEASE = "natty" ] || [ $RELEASE = "wheezy" ]; then echo " fi"; echo ; -else - + ;; +*) echo "It appears that you are using an unsupported OS - please tell us"; echo "by filing a bug: https://trac.torproject.org/projects/tor/newticket"; - -fi - + ;; +esac

1 0

[ooni-probe/master] Fetch dnspython and scapy from pypi instead of the tpo mirror
by art＠torproject.org 15 Aug '13

15 Aug '13

commit d4d8b0bb5d44b464b9553bda49be7b86362bfa82 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Jul 10 16:53:09 2013 +0200 Fetch dnspython and scapy from pypi instead of the tpo mirror --- requirements.txt | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/requirements.txt b/requirements.txt index b335716..691c0ce 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,6 +11,7 @@ txsocksx>=0.0.2 Pyrex>=0.9.8.6 parsley>=1.1 cyclone +dnspython>=1.10.0 # Taken from the versions required by twisted 13.0.0 (latest) transaction>=1.1.1 @@ -18,16 +19,6 @@ zope.component>=3.5 zope.event>=3.5 zope.interface>=3.6 -# This is a Tor Project mirror with valid SSL/TLS certs that is stable and fast -# Originally fetched from the hg repo on secdev.org: -# https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy -# Mirrored on Tor's webserver: -# This should be scapy>=2.2.0, but pip does not like it -https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/scapy-02-25-2013-tip.zip -# This was 'dnspython>=1.10.0' above until it failed to download many times. -# Originally fetched from dnspython but it timed out often: -# http://www.dnspython.org/kits/1.10.0/dnspython-1.10.0.zip -# Mirrored on Tor's webserver: -# This should be the below, but pip does not like it. -dnspython>=1.10.0 -https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/dnspython-1.10.0.zip +# Get scapy 2.2 from pypi +# https://pypi.python.org/pypi/scapy-real/2.2.0-dev +scapy-real

1 0

[ooni-probe/master] nettests dir changed
by art＠torproject.org 15 Aug '13

15 Aug '13

commit 47f879c7fa17b1135fba37c68d4402f428b110bf Author: fh <fh-github(a)fholzhauer.de> Date: Thu Jul 25 17:50:20 2013 +0200 nettests dir changed --- README.md | 2 +- inputs/README | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2d931ab..280fe96 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ ooniprobe will be installed in `/data/ooniprobe`. ``` cd /data/ooniprobe/ -./bin/ooniprobe nettests/blocking/http_requests.py -f /data/ooniprobe/inputs/input-pack/alexa-top-1k.txt +./bin/ooniprobe data/nettests/blocking/http_requests.py -f /data/ooniprobe/inputs/input-pack/alexa-top-1k.txt ``` ## The easy way to prep your system for running ooniprobe diff --git a/inputs/README b/inputs/README index 2bbc11e..fb3599d 100644 --- a/inputs/README +++ b/inputs/README @@ -3,38 +3,38 @@ the correct functionality of the various OONIProbe tests. # DNS Tamper -./bin/ooniprobe -o dns_tamper_test.yamloo nettests/blocking/dnsconsistency.py -t +./bin/ooniprobe -o dns_tamper_test.yamloo data/nettests/blocking/dnsconsistency.py -t example_inputs/dns_tamper_test_resolvers.txt -f example_inputs/dns_tamper_file.txt less dns_tamper_test.yamloo # Captive Portal -./bin/ooniprobe -o captive_portal_test.yamloo nettests/core/captiveportal.py +./bin/ooniprobe -o captive_portal_test.yamloo data/nettests/core/captiveportal.py less captive_portal_test.yamloo # HTTP Host -./bin/ooniprobe -o http_host.yamloo nettests/manipulation/http_host.py -b http://ooni.nu/test -f example_inputs/http_host_file.txt +./bin/ooniprobe -o http_host.yamloo data/nettests/manipulation/http_host.py -b http://ooni.nu/test -f example_inputs/http_host_file.txt less http_host.yamloo # Keyword filtering -./bin/ooniprobe -o keyword_filtering.yamloo nettests/core/keyword_filtering.py -b http://ooni.nu/test/ -f test_inputs/keyword_filtering_file.txt +./bin/ooniprobe -o keyword_filtering.yamloo data/nettests/core/keyword_filtering.py -b http://ooni.nu/test/ -f test_inputs/keyword_filtering_file.txt less keyword_filtering.yamloo # URL List -./bin/ooniprobe -o url_lists.yamloo nettests/core/url_list.py -f test_inputs/url_lists_file.txt +./bin/ooniprobe -o url_lists.yamloo data/nettests/core/url_list.py -f test_inputs/url_lists_file.txt less url_lists.yamloo # Squid transparent proxy -./bin/ooniprobe -o squid.yamloo nettests/core/squid.py +./bin/ooniprobe -o squid.yamloo data/nettests/core/squid.py less squid.yamloo

1 0

[ooni-probe/master] Vagrantfile now using setup-dependencies.sh
by art＠torproject.org 15 Aug '13

15 Aug '13

commit 34243f764416716c10d8e9d5cbd39b404920cc34 Author: fh <fh-github(a)fholzhauer.de> Date: Thu Jul 25 17:38:02 2013 +0200 Vagrantfile now using setup-dependencies.sh --- Vagrantfile | 131 +++-------------------------------------------------------- 1 file changed, 6 insertions(+), 125 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 897838f..1434fd2 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -5,145 +5,26 @@ Vagrant.configure("2") do |config| # All Vagrant configuration is done here. The most common configuration # options are documented and commented below. For a complete reference, # please see the online documentation at vagrantup.com. - - # Every Vagrant virtual environment requires a box to build off of. config.vm.box = "precise32" - - # The url from where the 'config.vm.box' box will be fetched if it - # doesn't already exist on the user's system. config.vm.box_url = "http://files.vagrantup.com/precise32.box" - # Create a forwarded port mapping which allows access to a specific port - # within the machine from a port on the host machine. In the example below, - # accessing "localhost:8080" will access port 80 on the guest machine. - # config.vm.network :forwarded_port, guest: 80, host: 8080 - - # Create a private network, which allows host-only access to the machine - # using a specific IP. - # config.vm.network :private_network, ip: "192.168.33.10" - - # Create a public network, which generally matched to bridged network. - # Bridged networks make the machine appear as another physical device on - # your network. - # config.vm.network :public_network - - # Share an additional folder to the guest VM. The first argument is - # the path on the host to the actual folder. The second argument is - # the path on the guest to mount the folder. And the optional third - # argument is a set of non-required options. config.vm.synced_folder ".", "/data/ooniprobe" - # Provider-specific configuration so you can fine-tune various - # backing providers for Vagrant. These expose provider-specific options. - # Example for VirtualBox: - # - # config.vm.provider :virtualbox do |vb| - # # Don't boot with headless mode - # vb.gui = true - # - # # Use VBoxManage to customize the VM. For example to change memory: - # vb.customize ["modifyvm", :id, "--memory", "1024"] - # end - # - # View the documentation for the provider you're using for more - # information on available options. - - # Enable provisioning with Puppet stand alone. Puppet manifests - # are contained in a directory path relative to this Vagrantfile. - # You will need to create the manifests directory and a manifest in - # the file base.pp in the manifests_path directory. - # - # An example Puppet manifest to provision the message of the day: - # - # # group { "puppet": - # # ensure => "present", - # # } - # # - # # File { owner => 0, group => 0, mode => 0644 } - # # - # # file { '/etc/motd': - # # content => "Welcome to your Vagrant-built virtual machine! - # # Managed by Puppet.\n" - # # } - # - # config.vm.provision :puppet do |puppet| - # puppet.manifests_path = "manifests" - # puppet.manifest_file = "init.pp" - # end - - # Enable provisioning with chef solo, specifying a cookbooks path, roles - # path, and data_bags path (all relative to this Vagrantfile), and adding - # some recipes and/or roles. - # - # config.vm.provision :chef_solo do |chef| - # chef.cookbooks_path = "../my-recipes/cookbooks" - # chef.roles_path = "../my-recipes/roles" - # chef.data_bags_path = "../my-recipes/data_bags" - # chef.add_recipe "mysql" - # chef.add_role "web" - # - # # You may also specify custom JSON attributes: - # chef.json = { :mysql_password => "foo" } - # end - - # Enable provisioning with chef server, specifying the chef server URL, - # and the path to the validation key (relative to this Vagrantfile). - # - # The Opscode Platform uses HTTPS. Substitute your organization for - # ORGNAME in the URL and validation key. - # - # If you have your own Chef Server, use the appropriate URL, which may be - # HTTP instead of HTTPS depending on your configuration. Also change the - # validation key to validation.pem. - # - # config.vm.provision :chef_client do |chef| - # chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME" - # chef.validation_key_path = "ORGNAME-validator.pem" - # end - # - # If you're using the Opscode platform, your validator client is - # ORGNAME-validator, replacing ORGNAME with your organization name. - # - # If you have your own Chef Server, the default validation client name is - # chef-validator, unless you changed the configuration. - # - # chef.validation_client_name = "ORGNAME-validator" end $script = <<SCRIPT -apt-get -y install curl python-setuptools python-dev - -echo "Installing Tor..." - -echo "deb http://deb.torproject.org/torproject.org precise main" >> /etc/apt/source.list - -gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 -gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add - - apt-get update -apt-get -y install deb.torproject.org-keyring tor tor-geoipdb - -apt-get -y install git-core python python-pip python-dev build-essential libdumbnet1 python-dumbnet python-libpcap python-pypcap python-dnspython python-virtualenv virtualenvwrapper tor tor-geoipdb libpcap-dev - -echo "Updating to the latest version of PIP" -cd /tmp/ - -curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py -python ./get-pip.py ## pip (>=1.3.0) is recommended for security reasons - -update-alternatives --install /usr/bin/pip pip /usr/local/bin/pip 0 +apt-get -y install curl python-setuptools python-dev python-software-properties python-virtualenv virtualenvwrapper vim cd /data/ooniprobe +./setup-dependencies.sh -echo "Installing dependencies" -pip install pyrex -pip install -r requirements.txt +echo "source ~/.virtualenvs/ooniprobe/bin/activate" >> ~root/.bashrc -echo "Installing ooniprobe" -python setup.py install +mkdir -p ~/.ooni +cp /data/ooniprobe/data/ooniprobe.conf.sample ~/.ooni/ooniprobe.conf -cd /usr/share/ooni/ -make geoip +echo Login using 'vagrant ssh', and dont forget to run ooniprobe as root. SCRIPT diff --git a/setup-dependencies.sh b/setup-dependencies.sh old mode 100644 new mode 100755

1 0

[ooni-probe/master] back to upstream master
by art＠torproject.org 15 Aug '13

15 Aug '13

commit d80f269f62fd8d6bd4cefc28f81b774b0312109b Author: fh <fh-github(a)fholzhauer.de> Date: Thu Jul 25 17:52:42 2013 +0200 back to upstream master --- setup-dependencies.sh | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/setup-dependencies.sh b/setup-dependencies.sh index cdbd0f0..c4f356f 100644 --- a/setup-dependencies.sh +++ b/setup-dependencies.sh @@ -1,19 +1,16 @@ #!/bin/bash -trap 'sudo -k && exit 1' INT # Discover our Distro release RELEASE="`lsb_release -c|cut -f 2`"; -TOR_DEB_REPO="http://deb.torproject.org/torproject.org"; +TOR_DEB_REPO="deb.torproject.org/torproject.org"; -case $RELEASE in - natty|wheezy|squeeze|precise) - - echo "sudo is annoying, tell us your password once and sudo won't annoy you for the rest of this process..."; - sudo echo "if you read this, we won't ask for your password again during this process unless something goes wrong"; +echo "sudo is annoying, tell us your password once and sudo won't annoy you for the rest of this process..."; +sudo echo "if you read this, we won't ask for your password again during this process unless something goes wrong"; +# This is for Ubuntu's natty +if [ $RELEASE = "natty" ] || [ $RELEASE = "wheezy" ]; then # Add Tor repo HAVE_GPG_KEY="`sudo apt-key finger|grep 'A3C4 F0F9 79CA A22C DBA8 F512 EE8C BC9E 886D DD89'|head -n 1`"; - echo "Checking for torproject.org Debian repository key..." if [ -z "$HAVE_GPG_KEY" ]; then echo "It appears that you do not have the torproject.org Debian repository key installed; installing it..."; cat apt.key | sudo apt-key add -; @@ -24,11 +21,7 @@ case $RELEASE in HAVE_TOR_REPO="`grep deb.torproject.org/torproject.org /etc/apt/sources.list /etc/apt/sources.list.d/* 2>&1|grep torproject|head -n 1`"; if [ -z "$HAVE_TOR_REPO" ]; then echo "It appears that you do not have the torproject.org Debian repository installed; installing it..."; - if [ $RELEASE = "squeeze" ]; then - (echo -e "deb $TOR_DEB_REPO $RELEASE main\ndeb-src $TOR_DEB_REPO $RELEASE main" | sudo tee -a /etc/apt/sources.list) > /dev/null - else - sudo apt-add-repository "deb $TOR_DEB_REPO $RELEASE main" - fi + sudo apt-add-repository "deb $TOR_DEB_REPO $RELEASE main"; else echo "It appears that you have the torproject.org Debian repository installed!"; fi @@ -41,7 +34,7 @@ case $RELEASE in if [ ! -f ~/.virtualenvs/ooniprobe/bin/activate ]; then # Set up the virtual environment - mkdir -p ~/.virtualenvs + mkdir ~/.virtualenvs/ virtualenv ~/.virtualenvs/ooniprobe source ~/.virtualenvs/ooniprobe/bin/activate else @@ -81,9 +74,10 @@ case $RELEASE in echo " fi"; echo ; - ;; -*) +else + echo "It appears that you are using an unsupported OS - please tell us"; echo "by filing a bug: https://trac.torproject.org/projects/tor/newticket"; - ;; -esac + +fi +

1 0