[tor-commits] [ooni-probe/master] Merge branch 'david-fixdeps'

commit bea2e9c534b35aa7c0f5c819c0a8852db7588ecf Merge: 6fb109c 056af4c Author: Arturo Filastò <art@fuffa.org> Date: Mon Jan 13 15:44:45 2014 +0100 Merge branch 'david-fixdeps' * david-fixdeps: Add libgeoip also to travis build script Add libgeoip-dev to the apt-get install .travis.yml | 2 +- setup-dependencies.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)