[tor-commits] [ooni-probe/master] Merge branch 'master' into fix/misc

[art at torproject.org]

commit 211532c862e0672e993665dc01ba443a5548f6a2
Merge: 77d60dc 41e4683
Author: Arturo Filastò <art at fuffa.org>
Date:   Mon Dec 30 16:26:49 2013 +0100

    Merge branch 'master' into fix/misc
    
    * master:
      Use the latest version of pygeoip from the github repo
      Remove package python-pypcap
      Issues with GPG homedir
      Make the setup-dependencies script work also on rasberry-pi

 requirements.txt      |    4 +++-
 setup-dependencies.sh |   12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)