commit 922ddb64b063a1bc57a03f0d98ca8050f8182246 Author: Griffin Boyce griffinboyce@gmail.com Date: Wed Nov 27 12:47:44 2013 -0500

updated requirements --- .gitignore | 4 +++- README.md | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore index ec5a4a0..5733f57 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,6 @@ ooniprobe.resume *.log !before_i_commit.log ## ignore pycharm ide files: -.idea/ \ No newline at end of file +.idea/ +*~ +.c9revisions diff --git a/README.md b/README.md index 5126d9f..3a471be 100644 --- a/README.md +++ b/README.md @@ -114,14 +114,14 @@ Basic system requirements: On Debian or Ubuntu GNU/Linux based systems these can be installed with:

``` -sudo apt-get install git-core python python-pip python-dev build-essential tor tor-geoipdb obfsproxy tcpdump python-geoip python-docutils python-ipaddr python-scapy python-pyrex +sudo apt-get install git-core python python-pip python-dev build-essential tor tor-geoipdb tcpdump python-geoip python-docutils python-ipaddr python-scapy python-pyrex ```

Other packages that may be of interest:

``` -libdumbnet1 python-dumbnet python-libpcap python-pypcap python-pcapy python-dnspython -python-virtualenv virtualenvwrapper tor tor-geoipdb obfsproxy +libdumbnet python-dumbnet python-libpcap python-pypcap pcapy dnspython +python-virtualenv virtualenvwrapper ```

The Python dependencies required for running ooniprobe are: