[tor-commits] [ooni-probe/master] Add a configuration option that allows to prioritise non-onion backends

[art at torproject.org]

commit 2eab4fe68b0dfbb082f3253ace5321afb79777dc
Author: Arturo Filastò <arturo at filasto.net>
Date:   Thu Jun 16 20:03:57 2016 +0300

    Add a configuration option that allows to prioritise non-onion backends
    
    This option allows a user to specify that they wish to use either a https,
    cloudfronted or onion backend server.
    
    Write unittests to use the priority address
---
 ooni/oonicli.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ooni/oonicli.py b/ooni/oonicli.py
index 23c0b85..2eb1d9f 100644
--- a/ooni/oonicli.py
+++ b/ooni/oonicli.py
@@ -44,9 +44,9 @@ class Options(usage.Options):
         ["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", CANONICAL_BOUNCER_ONION, "Specify the bouncer used to "
-                                            "obtain the address of the "
-                                            "collector and test helpers."],
+        ["bouncer", "b", None, "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."],