[tor-commits] [ooni-probe/master] Install tor from deb.tpo mirror

[art at torproject.org]

commit 8849deab425618e1289d87dadb13aadbf6e82ec7
Author: Arturo Filastò <arturo at filasto.net>
Date:   Wed Dec 7 00:14:29 2016 +0000

    Install tor from deb.tpo mirror
---
 .travis.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ebec628..f45a576 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,9 +25,12 @@ before_install:
   - mkdir -p $HOME/.ssh/
   - mv secrets/id_rsa_travis $HOME/.ssh/
 
+  # Setup deb.tpo repository to download latest tor version
+  - gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89
+  - gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
+  - echo 'deb http://deb.torproject.org/torproject.org trusty main' | sudo tee /etc/apt/sources.list.d/tor.list
   - sudo apt-get update
-  - sudo apt-get install tor libpcap-dev libgeoip-dev libdumbnet-dev libffi-dev
-    libssl-dev
+  - sudo apt-get install -y libpcap-dev libgeoip-dev libdumbnet-dev libffi-dev libssl-dev tor
   - sudo /etc/init.d/tor start
 python:
   - "2.7"