- tor-commits - lists.torproject.org

[ooni-probe/master] Update documentation to reflect changes in oonideckgen
by art＠torproject.org 29 Apr '16

29 Apr '16

commit b2dbd382c030c80cf09fcefe52ce5a1116bf0159 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Apr 26 21:42:26 2016 +0200 Update documentation to reflect changes in oonideckgen --- README.rst | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/README.rst b/README.rst index 384f71b..f137b88 100644 --- a/README.rst +++ b/README.rst @@ -58,7 +58,6 @@ To install it from the current master run:: Then run:: mkdir my_decks - sudo ooniresources --update-inputs --update-geoip oonideckgen -o my_decks/ **BUG** Note: @@ -174,17 +173,11 @@ To generate decks you will have to update the input resources of ooniprobe. This can be done with:: - ooniresources --update-inputs + ooniresources If you get a permission error, you may have to run the command as root or change the ooniprobe data directory inside of `ooniprobe.conf`. -On some platforms, for example debian contrib, you will not get all the geoip -related files needed. In that case it is possible to manually download them -with ``ooniresources``:: - - ooniresources --update-geoip - Generating decks ---------------- @@ -195,7 +188,7 @@ you can do so (be sure to have updated the input resources first) by running:: oonideckgen --country-code IT --output ~/ -You will now have in your home a folder called `deck-it`, containing the ooni +You will now have in your home a folder called `deck-YOUR_COUNTRY_CODE`, containing the ooni deck (ends with .deck) and the inputs. Note: that you should not move the `deck-*` directory once it has been generated as the paths to the inputs referenced by the test in the deck are

1 0

[ooni-probe/master] Print messages about how to use the boxes after they have both been deployed.
by art＠torproject.org 29 Apr '16

29 Apr '16

commit bc416be172786b7e58e5ad2d5da4ed09f2c452d3 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Apr 26 16:09:08 2016 +0200 Print messages about how to use the boxes after they have both been deployed. --- Vagrantfile | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index e61bf68..3eeb54c 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -17,11 +17,6 @@ apt-get install -y build-essential libdumbnet-dev libpcap-dev libgeoip-dev libff cd /data/ooni-probe python setup.py install -echo "Now:" -echo "1. vagrant ssh probe" -echo "2. oonideckgen" -echo "3. ooniprobe -i deck-*/*.deck" - SCRIPT $setup_oonibackend = <<SCRIPT @@ -52,12 +47,6 @@ cp oonib.conf.example /etc/oonibackend.conf echo "Installing ooni-backend" python setup.py install -echo "Now:" -echo "1. vagrant ssh" -echo "2. vi /etc/oonibackend.conf # possibly" -echo "3. cd /data/ooni-backend" -echo "4. sudo ./bin/oonib -c /etc/oonibackend.conf" - SCRIPT Vagrant.configure("2") do |config| @@ -76,6 +65,22 @@ Vagrant.configure("2") do |config| backend.vm.synced_folder "../ooni-backend", "/data/ooni-backend" backend.vm.provision :shell, :inline => $setup_oonibackend end + + config.vm.provision "shell", inline: <<-EOF + echo "To run oonibackend:" + echo "1. vagrant ssh backend" + echo "2. vi /etc/oonibackend.conf # possibly" + echo "3. cd /data/ooni-backend" + echo "4. sudo ./bin/oonib -c /etc/oonibackend.conf" + EOF + end + config.vm.provision "shell", inline: <<-EOF + echo "To run ooniprobe:" + echo "1. vagrant ssh probe" + echo "2. oonideckgen" + echo "3. ooniprobe -i deck-*/*.deck" + EOF + end

1 0

[ooni-probe/master] Change the order in which decks get generated by default
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 6d49b3fbbbebf824c106f2257d6c774839cd6703 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Apr 26 15:46:45 2016 +0200 Change the order in which decks get generated by default * Give priority to country specific lists * Give priority to faster tests * Run dns consistency for last --- ooni/deckgen/cli.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/ooni/deckgen/cli.py b/ooni/deckgen/cli.py index b1a6b87..664842e 100644 --- a/ooni/deckgen/cli.py +++ b/ooni/deckgen/cli.py @@ -71,17 +71,15 @@ class Deck(object): def generate_deck(options): - + url_list_country = None try: url_list_country = citizenlab_test_lists.generate_country_input( options['country-code'], options['output'] ) - except Exception: print "Could not generate country specific url list" print "We will just use the global one." - url_list_country = None url_list_global = citizenlab_test_lists.generate_global_input( options['output'] @@ -92,19 +90,19 @@ def generate_deck(options): ) deck = Deck() - # deck.add_test('manipulation/http_host', ['-f', 'somefile.txt']) + deck.add_test('manipulation/http_invalid_request_line') + deck.add_test('manipulation/http_header_field_manipulation') + + if url_list_country is not None: + deck.add_test('blocking/http_requests', ['-f', url_list_country]) deck.add_test('blocking/http_requests', ['-f', url_list_global]) - deck.add_test('blocking/dns_consistency', - ['-f', url_list_global, '-T', dns_servers]) if url_list_country is not None: deck.add_test('blocking/dns_consistency', ['-f', url_list_country, '-T', dns_servers]) - deck.add_test('blocking/http_requests', ['-f', url_list_country]) + deck.add_test('blocking/dns_consistency', + ['-f', url_list_global, '-T', dns_servers]) - deck.add_test('manipulation/http_invalid_request_line') - deck.add_test('manipulation/http_header_field_manipulation') - # deck.add_test('manipulation/traceroute') if config.advanced.debug: deck.pprint() deck_filename = os.path.join(options['output'],

1 0

[ooni-probe/master] Update manpages for ooniprobe, ooniresources, oonideckgen and oonireport.
by art＠torproject.org 29 Apr '16

29 Apr '16

commit a6897988fb96bae8816dd1bd7973a6e1781757f1 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Apr 26 21:40:32 2016 +0200 Update manpages for ooniprobe, ooniresources, oonideckgen and oonireport. * Update versions of oonideckgen and ooniresources * Clean up the help text of ooniprobe options --- data/oonideckgen.1 | 7 +++++- data/ooniprobe.1 | 18 ++++++++++++---- data/oonireport.1 | 4 ++-- data/ooniresources.1 | 22 ++++++++----------- ooni/deckgen/__init__.py | 2 +- ooni/oonicli.py | 54 +++++++++++++++++++++++++++------------------- ooni/resources/__init__.py | 2 +- 7 files changed, 65 insertions(+), 44 deletions(-) diff --git a/data/oonideckgen.1 b/data/oonideckgen.1 index f808165..e2c8fed 100644 --- a/data/oonideckgen.1 +++ b/data/oonideckgen.1 @@ -35,6 +35,8 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .B oonideckgen .RB [ --version ] .RB [ --help ] +.RB [ --collector +.IR httpo://collector-address.onion ] .RB [ \-c .IR country-code] .RB [ \-o @@ -56,6 +58,9 @@ Display this help and exit. .BR \-\^c " or " \-\-country-code Specify the country code for which a test deck should be geneated .TP +.BR \-\-collector +Specify the address of the collector to use for submitting reports. +.TP .BR \-\^o " or " \-\-output Specify in which directory the deck should be written. .TP @@ -81,5 +86,5 @@ In order to run deckgen you must have first have run ooniresources --update-inpu .SH AUTHOR The Tor Project .SH COPYRIGHT -2014, The Tor Project +2016, The Tor Project . diff --git a/data/ooniprobe.1 b/data/ooniprobe.1 index cf3f593..5fa47b4 100644 --- a/data/ooniprobe.1 +++ b/data/ooniprobe.1 @@ -1,6 +1,5 @@ -.\" Man page generated from reStructuredText. . -.TH "ooniprobe" "1" "April 29, 2014" "1.0.2" "ooniprobe" +.TH "ooniprobe" "1" "April 26, 2016" "1.4.0" "ooniprobe" .SH NAME ooniprobe - a network censorship measurement tool. . @@ -33,7 +32,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .SH SYNOPSIS .B ooniprobe -.RB [ \-hnsp ] +.RB [ \-hnspgN ] .RB [ --version ] .RB [ --spew ] .RB [ \-o @@ -52,6 +51,8 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .IR configfile ] .RB [ \-d .IR datadir ] +.RB [ \-a +.IR annotations] .I "test_name" .SH DESCRIPTION @@ -69,6 +70,12 @@ Display this help and exit. .BR \-\^n " or " \-\-no\-collector Disable reporting the net test results to an oonib collector. .TP +.BR \-\^N " or " \-\-no\-yamloo +Disable writing report file to disk. +.TP +.BR \-\^g " or " \-\-no\-geoip +Disable performing geoip lookup. +.TP .BR \-\^s " or " \-\-list List all of the available net tests. .TP @@ -103,6 +110,9 @@ Specify a path to the ooniprobe configuration file. .BR \-\^d " or " \-\-datadir Specify a path to the ooniprobe data directory .TP +.BR \-\^a " or " \-\-annotations +Annotate the report with a key:value[, key:value] format. +.TP .BR \-\-spew Print an insanely verbose log of everything that happens. Useful when debugging freezes or locks in complex code. @@ -1096,5 +1106,5 @@ require for a researcher to assess what is the output of a test. .SH AUTHOR The Tor Project .SH COPYRIGHT -2014, The Tor Project +2016, The Tor Project . diff --git a/data/oonireport.1 b/data/oonireport.1 index 7910e67..8a91009 100644 --- a/data/oonireport.1 +++ b/data/oonireport.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "oonireport" "1" "June 26, 2014" "1.0.2" "oonireport" +.TH "oonireport" "1" "April 26, 2016" "0.1.0" "oonireport" .SH NAME oonireport - tool for managing ooniprobe reports. . @@ -96,5 +96,5 @@ of the collector did not support the specified test. .SH AUTHOR The Tor Project .SH COPYRIGHT -2014, The Tor Project +2016, The Tor Project . diff --git a/data/ooniresources.1 b/data/ooniresources.1 index 5cd66cf..1e16822 100644 --- a/data/ooniresources.1 +++ b/data/ooniresources.1 @@ -1,8 +1,8 @@ .\" Man page generated from reStructuredText. . -.TH "ooniresources" "1" "October 1, 2014" "1.1.4" "ooniresources" +.TH "ooniresources" "1" "April 26, 2016" "0.2.0" "ooniresources" .SH NAME -ooniresources - tool for generating ooniprobe test decks +ooniresources - tool for updating resources for OONI tests . .nr rst2man-indent-level 0 . @@ -35,14 +35,15 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .B ooniresources .RB [ --version ] .RB [ --help ] -.RB [ --update-inputs ] -.RB [ --update-geoip ] .SH DESCRIPTION .sp ooniresources will update the resources that are needed for the functioning of ooniprobe and related tools. +By invoking this command with no arguments the inputs and GeoIP data files +shall be updated. + .SH OPTIONS .TP @@ -50,11 +51,11 @@ ooniprobe and related tools. Display this help and exit. .TP .BR \-\-update\-inputs -This will update the inputs that are used for generating test decks with +(DEPRECATED) This will update the inputs that are used for generating test decks with oonideckgen. .TP .BR \-\-update\-geoip -This will update the maxmind geoip databases that are used for detecting the +(DEPRECATED) This will update the maxmind geoip databases that are used for detecting the probes country and ASN. .TP @@ -63,16 +64,11 @@ probes country and ASN. This tools will update the resources needed for running ooniprobe and oonideckgen. You don't need to run it very often, but it's just sufficient to run it once -every month of so as the data usually does not update or change that often. -If you are seeing some errors related to the geoip subsystem not having some -Maxmind databases, you probably want to run: -ooniresources --update-geoip. -If on the other hand you are interested in using oonideckgen, you should run: -ooniresources --update-inputs. +every month or so as the data usually does not update or change that often. .sp .SH AUTHOR The Tor Project .SH COPYRIGHT -2014, The Tor Project +2016, The Tor Project . diff --git a/ooni/deckgen/__init__.py b/ooni/deckgen/__init__.py index 3dc1f76..d3ec452 100644 --- a/ooni/deckgen/__init__.py +++ b/ooni/deckgen/__init__.py @@ -1 +1 @@ -__version__ = "0.1.0" +__version__ = "0.2.0" diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 4da81bc..09936b6 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -25,31 +25,41 @@ class Options(usage.Options): " files listed on the command line.") optFlags = [["help", "h"], - ["no-collector", "n", "disable writing to collector"], - ["no-yamloo", "N", "disable writing to YAML file"], - ["no-geoip", "g"], - ["list", "s"], - ["printdeck", "p"], - ["verbose", "v"] + ["no-collector", "n", "Disable writing to collector"], + ["no-yamloo", "N", "Disable writing to YAML file"], + ["no-geoip", "g", "Disable geoip lookup on start"], + ["list", "s", "List the currently installed ooniprobe " + "nettests"], + ["printdeck", "p", "Print the equivalent deck for the " + "provided command"], + ["verbose", "v", "Show more verbose information"] ] optParameters = [ - ["reportfile", "o", None, "report file name"], - ["testdeck", "i", None, - "Specify as input a test deck: a yaml file containing the tests to run and their arguments"], - ["collector", "c", None, - "Address of the collector of test results. This option should not be used, but you should always use a bouncer."], - ["bouncer", "b", 'httpo://nkvphnp3p6agi5qq.onion', - "Address of the bouncer for test helpers."], - ["logfile", "l", None, "log file name"], - ["pcapfile", "O", None, "pcap file name"], - ["configfile", "f", None, - "Specify a path to the ooniprobe configuration file"], - ["datadir", "d", None, - "Specify a path to the ooniprobe data directory"], - ["annotations", "a", None, - "Annotate the report with a key:value[, key:value] format."], - ["queue", "Q", None, "AMQP Queue URL amqp://user:pass@host:port/vhost/queue"]] + ["reportfile", "o", None, "Specify the report file name to write to."], + ["testdeck", "i", None, "Specify as input a test deck: a yaml file " + "containing the tests to run and their " + "arguments."], + ["collector", "c", None, "Specify the address of the collector for " + "test results. In most cases a user will " + "prefer to specify a bouncer over this."], + ["bouncer", "b", 'httpo://nkvphnp3p6agi5qq.onion', "Specify the " + "bouncer used to " + "obtain the " + "address of the " + "collector and " + "test helpers."], + ["logfile", "l", None, "Write to this logs to this filename."], + ["pcapfile", "O", None, "Write a PCAP of the ooniprobe session to " + "this filename."], + ["configfile", "f", None, "Specify a path to the ooniprobe " + "configuration file."], + ["datadir", "d", None, "Specify a path to the ooniprobe data " + "directory."], + ["annotations", "a", None, "Annotate the report with a key:value[, " + "key:value] format."], + ["queue", "Q", None, "AMQP Queue URL amqp://user:pass@host:port/vhost/queue"] + ] compData = usage.Completions( extraActions=[usage.CompleteFiles( diff --git a/ooni/resources/__init__.py b/ooni/resources/__init__.py index 8b7e63b..4b163bb 100644 --- a/ooni/resources/__init__.py +++ b/ooni/resources/__init__.py @@ -1,6 +1,6 @@ from ooni import __version__ as ooniprobe_version -__version__ = "0.1.0" +__version__ = "0.2.0" ooni_resources_url = ("https://github.com/TheTorProject/ooni-probe/releases" "/download/v{}/ooni-resources.tar.gz").format(ooniprobe_version)

1 0

[ooni-probe/master] Remove obsolete install method on Debian/Ubuntu
by art＠torproject.org 29 Apr '16

29 Apr '16

commit f73a26aa1c2d62a2e2ebe0c335ac29da4d4c4702 Author: anadahz <kojgelo(a)inbox.com> Date: Fri Mar 11 00:12:38 2016 -0300 Remove obsolete install method on Debian/Ubuntu Currently the ooniprobe packages offered in Debian and Ubuntu are old, unavailable in some releases or very old version. Removing obsolete install instructions until the ooniprobe packages in the repositories are available and up-to-date --- README.rst | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/README.rst b/README.rst index 59c7afa..6234b62 100644 --- a/README.rst +++ b/README.rst @@ -47,15 +47,6 @@ probe is a liability for you, please be aware of this risk. OONI in 5 minutes ================= -On debian testing or unstable:: - - sudo apt-get install ooniprobe - -If you are running debian stable you can get it from backports via:: - - sudo sh -c 'echo "deb http://http.debian.net/debian jessie-backports main" >> /etc/apt/sources.list' - sudo apt-get update && sudo apt-get install ooniprobe - On unix systems:: sudo pip install ooniprobe @@ -94,29 +85,6 @@ Run this command to automatically update your crontab:: Installation ============ -Debian based systems --------------------- - -If you are running Debian testing or Debian unstable you can install ooniprobe -simply with:: - - apt-get install ooniprobe - -If you are running Debian stable you can get it from backports via:: - - sudo sh -c 'echo "deb http://http.debian.net/debian wheezy-backports main" >> /etc/apt/sources.list' - sudo apt-get update && sudo apt-get install ooniprobe - -If you are running Ubuntu 14.04 LTS, 14.10 or 15.04 you can install it from the PPA -(https://launchpad.net/~irl/+archive/ubuntu/ooni/):: - - sudo add-apt-repository ppa:irl/ooni - sudo apt-get update && sudo apt-get install ooniprobe - -You will be warned that the packages are unauthenticated. This is due to the -PPA not being signed and is normal behaviour. If you would prefer to verify the -integrity of the package, use our private Debian repository below. - Mac OS X --------

1 0

[ooni-probe/master] Fix invalid references to http_requests test
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 6e4af441525a6b96858eb5e517a12f133a49f2e1 Author: anadahz <kojgelo(a)inbox.com> Date: Mon Mar 14 20:40:24 2016 -0300 Fix invalid references to http_requests test --- docs/source/tests/psiphon.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/tests/psiphon.rst b/docs/source/tests/psiphon.rst index 5050b79..b05f1f0 100644 --- a/docs/source/tests/psiphon.rst +++ b/docs/source/tests/psiphon.rst @@ -32,7 +32,7 @@ To test Psiphon with a different URL run: To test Psiphon when it is installed in a different path other than the user home: -`ooniprobe blocking/http_requests -p <path to Psiphon repository>` +`ooniprobe third_party/psiphon -p <path to Psiphon repository>` How to install Psiphon =================== @@ -49,7 +49,7 @@ To run Psiphon manually, it must be run inside of the proper directory: Sample report ============= -`ooniprobe blocking/http_requests -f example_inputs/url_lists_file.txt` +`ooniprobe third_party/psiphon -u http://google.com` ::

1 0

[ooni-probe/master] Fix install doc on virtualenv setup
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 8a8500ab97a2eba292f93f05d129b9f627e59c6e Author: anadahz <kojgelo(a)inbox.com> Date: Mon Mar 14 19:09:06 2016 -0300 Fix install doc on virtualenv setup --- README.rst | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 6234b62..58c8376 100644 --- a/README.rst +++ b/README.rst @@ -350,7 +350,12 @@ On Debian based systems a development environment can be setup as follows: (prer sudo apt-get install libgeoip-dev libffi-dev libdumbnet-dev libssl-dev libpcap-dev git clone https://github.com/TheTorProject/ooni-probe cd ooni-probe - mkvirtualenv ooniprobe # . ~/.virtualenvs/ooniprobe/bin/activate to access later + virtualenv venv +`virtualenv venv` will create a folder in the current directory which will +contain the Python executable files, and a copy of the pip library which you can +use to install other packages. To begin using the virtual environment, it needs +to be activated: + source venv/bin/activate pip install -r requirements.txt pip install -r requirements-dev.txt python setup.py install

1 0

[ooni-probe/master] Merge pull request #462 from TheTorProject/fix/install-doc
by art＠torproject.org 29 Apr '16

29 Apr '16

commit e1c428dbb24b81edccd67bb38188ccfcd756f9a0 Merge: 3a4d9ef f73a26a Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Mar 11 16:05:48 2016 +0100 Merge pull request #462 from TheTorProject/fix/install-doc Remove obsolete install method on Debian/Ubuntu README.rst | 32 -------------------------------- 1 file changed, 32 deletions(-)

1 0

[ooni-probe/master] Always use the same URL when testing psiphon
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 959b84003e579398a3ecb1b91dd0b8a91efd9db2 Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Mar 11 18:52:12 2016 +0100 Always use the same URL when testing psiphon * Minor refactoring --- ooni/nettests/third_party/psiphon.py | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/ooni/nettests/third_party/psiphon.py b/ooni/nettests/third_party/psiphon.py index bfdec70..7c1462b 100644 --- a/ooni/nettests/third_party/psiphon.py +++ b/ooni/nettests/third_party/psiphon.py @@ -13,9 +13,8 @@ from ooni.templates import process, httpt class UsageOptions(usage.Options): log.debug("UsageOptions") optParameters = [ - ['url', 'u', None, 'Specify a single URL to test.'], - ['psiphonpath', 'p', None, 'Specify psiphon python client path.'], - ['socksproxy', 's', None, 'Specify psiphon socks proxy ip:port.'],] + ['psiphonpath', 'p', None, 'Specify psiphon python client path.'] + ] class PsiphonTest(httpt.HTTPTest, process.ProcessTest): @@ -33,16 +32,11 @@ class PsiphonTest(httpt.HTTPTest, process.ProcessTest): description = "Bootstraps Psiphon and \ does a HTTP GET for the specified URL" author = "juga" - version = "0.0.1" - timeout = 20 + version = "0.1.0" + timeout = 120 usageOptions = UsageOptions def _setUp(self): - # it is necessary to do this in _setUp instead of setUp - # because it needs to happen before HTTPTest's _setUp. - # incidentally, setting this option in setUp results in HTTPTest - # *saying* it is using this proxy while not actually using it. - log.debug('PiphonTest._setUp: setting socksproxy') self.localOptions['socksproxy'] = '127.0.0.1:1080' super(PsiphonTest, self)._setUp() @@ -50,10 +44,7 @@ class PsiphonTest(httpt.HTTPTest, process.ProcessTest): log.debug('PsiphonTest.setUp') self.bootstrapped = defer.Deferred() - if self.localOptions['url']: - self.url = self.localOptions['url'] - else: - self.url = 'https://check.torproject.org' + self.url = 'http://www.google.com/humans.txt' if self.localOptions['psiphonpath']: self.psiphonpath = self.localOptions['psiphonpath'] @@ -128,7 +119,11 @@ connect(False) d = self.doRequest(self.url) def addSuccessToReport(res): log.debug("PsiphonTest.callDoRequest.addSuccessToReport") - self.report['request_success'] = True + if res.body.startswith('Google is built by a large'): + self.report['request_success'] = True + else: + self.report['request_success'] = False + return res d.addCallback(addSuccessToReport) def addFailureToReport(res):

1 0

[ooni-probe/master] Merge pull request #464 from TheTorProject/fix/psiphon-doc
by art＠torproject.org 29 Apr '16

29 Apr '16

commit 9bc3006d48f8d037958e1db7fc0011120f1f4e93 Merge: e1c428d 6e4af44 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Mar 15 14:39:28 2016 +0100 Merge pull request #464 from TheTorProject/fix/psiphon-doc Fix invalid references to http_requests test docs/source/tests/psiphon.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0