June 2016 - tor-commits - lists.torproject.org

[ooni-probe/master] Fix bug in setting annotations and collector address via command line (#534)
by art＠torproject.org 21 Jun '16

21 Jun '16

commit 358a583299fdb1dd2f85f95515c07d1be95ee0fb Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Jun 17 11:00:57 2016 +0300 Fix bug in setting annotations and collector address via command line (#534) * This closes https://github.com/TheTorProject/ooni-probe/issues/529 --- ooni/deck.py | 17 +++++++++++++---- ooni/oonicli.py | 2 +- ooni/tests/test_deck.py | 19 +++++++++++++++++++ 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/ooni/deck.py b/ooni/deck.py index 383845c..657589d 100644 --- a/ooni/deck.py +++ b/ooni/deck.py @@ -120,7 +120,7 @@ class Deck(InputFile): def cached_descriptor(self): return self.cached_file + '.desc' - def loadDeck(self, deckFile): + def loadDeck(self, deckFile, global_options={}): with open(deckFile) as f: self.id = sha256(f.read()).hexdigest() f.seek(0) @@ -133,12 +133,21 @@ class Deck(InputFile): log.err("Could not find %s" % test['options']['test_file']) log.msg("Skipping...") continue + + annotations = test['options'].get('annotations', {}) + if global_options.get('annotations') is not None: + annotations = global_options["annotations"] + + collector_address = test['options'].get('collector', None) + if global_options.get('collector') is not None: + collector_address = global_options['collector'] + net_test_loader = NetTestLoader(test['options']['subargs'], - annotations=test['options'].get('annotations', {}), + annotations=annotations, test_file=nettest_path) - if test['options'].get('collector', None) is not None: + if collector_address is not None: net_test_loader.collector = CollectorClient( - test['options']['collector'] + collector_address ) if test['options'].get('bouncer', None) is not None: self.bouncer = test['options']['bouncer'] diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 5aa538c..56b331d 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -244,7 +244,7 @@ def createDeck(global_options, url=None): try: if global_options['testdeck']: - deck.loadDeck(global_options['testdeck']) + deck.loadDeck(global_options['testdeck'], global_options) else: log.debug("No test deck detected") test_file = nettest_to_path(global_options['test_file'], True) diff --git a/ooni/tests/test_deck.py b/ooni/tests/test_deck.py index fa9b0e8..1e311cf 100644 --- a/ooni/tests/test_deck.py +++ b/ooni/tests/test_deck.py @@ -33,6 +33,7 @@ class BaseTestCase(unittest.TestCase): self.cwd = os.getcwd() self.dummy_deck_content = """- options: collector: null + annotations: null help: 0 logfile: null no-default-reporter: 0 @@ -132,6 +133,24 @@ class TestDeck(BaseTestCase): deck.loadDeck(self.deck_file) assert len(deck.netTestLoaders) == 1 + def test_load_deck_with_global_options(self): + global_options = { + "annotations": {"spam": "ham"}, + "collector": "httpo://thirteenchars123.onion" + } + deck = Deck(bouncer="httpo://foo.onion", + decks_directory=".") + deck.loadDeck(self.deck_file, + global_options=global_options) + self.assertEqual( + deck.netTestLoaders[0].annotations, + global_options['annotations'] + ) + self.assertEqual( + deck.netTestLoaders[0].collector.base_address, + global_options['collector'].replace("httpo://", "http://") + ) + def test_save_deck_descriptor(self): deck = Deck(bouncer="httpo://foo.onion", decks_directory=".")

1 0

[ooni-probe/master] Make sure oonireport receives correct args (#550)
by art＠torproject.org 21 Jun '16

21 Jun '16

commit 8a40d9a3d7764be841dbf23c4bdf986a2b42aca9 Author: Simone Basso <bassosimone(a)gmail.com> Date: Sun Jun 19 19:56:51 2016 +0200 Make sure oonireport receives correct args (#550) > *Tu quoue, argv[0], fili mi!* Closes #457 reported by @anadahz. Tested locally (this time!) by running: ``` export PYTHONPATH=. ./bin/oonireport status ./bin/oonireport --version ./bin/oonireport upload ``` All commands now seem to work as they should. --- ooni/report/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/report/cli.py b/ooni/report/cli.py index 075178c..12ea83c 100644 --- a/ooni/report/cli.py +++ b/ooni/report/cli.py @@ -60,7 +60,7 @@ def tor_check(): sys.exit(1) -def run(args=sys.argv): +def run(args=sys.argv[1:]): options = Options() try: options.parseOptions(args)

1 0

[ooni-probe/master] Fix RST markup
by art＠torproject.org 21 Jun '16

21 Jun '16

commit 439ebeb4fa0ca4b587ad1c38d4ff7310d06709a7 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Jun 21 14:13:28 2016 +0200 Fix RST markup --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 57901d4..e92d19b 100644 --- a/README.rst +++ b/README.rst @@ -63,11 +63,11 @@ On Ubuntu 16.04 (xenial), 15.10 (wily) or 14.04 (trusty):: sudo apt-get update sudo apt-get install ooniprobe -*You'll need to swap out ``$RELEASE`` for either ``xenial``, ``wily``, or +Note: You'll need to swap out ``$RELEASE`` for either ``xenial``, ``wily``, or ``trusty``. This will not happen automatically. You will also need to ensure that you have the ``universe`` repository enabled. The ``universe`` repository is enabled by default in a standard Ubuntu installation but may not be on some -minimal on not standard installations.* +minimal on not standard installations. On unix systems::

1 0

[ooni-probe/master] Update README to use deb.tpo instead of irl's private PPA
by art＠torproject.org 21 Jun '16

21 Jun '16

commit 598f04155d1a8a3b472484e09df846abf049d6fb Author: Iain R. Learmonth <irl(a)debian.org> Date: Sun Jun 19 17:20:51 2016 +0100 Update README to use deb.tpo instead of irl's private PPA --- README.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index af6de55..f82bc40 100644 --- a/README.rst +++ b/README.rst @@ -59,10 +59,13 @@ On Debian stable (jessie):: On Ubuntu 16.04 (xenial), 15.10 (wily) or 14.04 (trusty):: - sudo add-apt-repository ppa:irl/ooni + echo 'deb http://deb.torproject.org/torproject.org $RELEASE main' | sudo tee -a /etc/apt/sources.list sudo apt-get update sudo apt-get install ooniprobe +(You'll need to swap out $RELEASE for either "xenial", "wily", or "trusty". This +will not happen automatically. + On unix systems:: sudo pip install ooniprobe

1 0

[ooni-probe/master] Merge branch 'fix/we-use-deb-tpo-now'
by art＠torproject.org 21 Jun '16

21 Jun '16

commit e859a047b6407b9fc2f5abef4d39239f18a228f2 Merge: 8a40d9a 439ebeb Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Jun 21 14:13:46 2016 +0200 Merge branch 'fix/we-use-deb-tpo-now' * fix/we-use-deb-tpo-now: Fix RST markup Add a note about Ubuntu universe being required for Ubuntu Update README to use deb.tpo instead of irl's private PPA README.rst | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)

1 0

[ooni-probe/master] Add a note about Ubuntu universe being required for Ubuntu
by art＠torproject.org 21 Jun '16

21 Jun '16

commit 8034a3188d957551bf05bb1a13f2b3f2f29b599f Author: Iain R. Learmonth <irl(a)debian.org> Date: Mon Jun 20 23:20:04 2016 +0100 Add a note about Ubuntu universe being required for Ubuntu --- README.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index f82bc40..57901d4 100644 --- a/README.rst +++ b/README.rst @@ -63,8 +63,11 @@ On Ubuntu 16.04 (xenial), 15.10 (wily) or 14.04 (trusty):: sudo apt-get update sudo apt-get install ooniprobe -(You'll need to swap out $RELEASE for either "xenial", "wily", or "trusty". This -will not happen automatically. +*You'll need to swap out ``$RELEASE`` for either ``xenial``, ``wily``, or +``trusty``. This will not happen automatically. You will also need to ensure +that you have the ``universe`` repository enabled. The ``universe`` repository +is enabled by default in a standard Ubuntu installation but may not be on some +minimal on not standard installations.* On unix systems::

1 0

[webwml/master] Remove the ooni job posting
by sebastian＠torproject.org 21 Jun '16

21 Jun '16

commit 1c0d0841571d71bb1d4eeb3226ad4efaadda2f73 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Jun 21 13:20:03 2016 +0200 Remove the ooni job posting --- about/en/jobs-ooni.wml | 151 ------------------------------------------------- about/en/jobs.wml | 22 +++---- 2 files changed, 11 insertions(+), 162 deletions(-) diff --git a/about/en/jobs-ooni.wml b/about/en/jobs-ooni.wml deleted file mode 100644 index cb52c24..0000000 --- a/about/en/jobs-ooni.wml +++ /dev/null @@ -1,151 +0,0 @@ -## translation metadata -# Revision: $Revision$ -# Translation-Priority: 3-low - -#include "head.wmi" TITLE="Tor Project: Jobs (core developer)" CHARSET="UTF-8" -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page about/overview>">About » </a> - <a href="<page about/jobs>">Jobs</a> - </div> - <div id="maincol"> -<h1>The Tor Project is looking for another dedicated core developer to -work on OONI!</h1> - -<p> -Your job will be to work as a software engineer on the Open Observatory -of Network Interference (OONI), a global network measurement platform. -Your initial focus will be on the design and implementation of a -mechanism for instrumenting probes on which measurements should be run -and re-engineering the data processing pipeline to scale to the growing -OONI user-base. - -Moreover you will be expected to be working on improving the existing -measurement instrument (ooni-probe) and the data collection backend -component (ooni-backend). -</p> - -<p> -This dedicated contractor position starts as soon as possible for -a duration of 12 months (or more, depending on further funding and -progression of the project). -</p> - -<p>Deadline for submissions: 20th of June 2016</p> - -<p> -Any candidate must: -</p> - -<ul> - <li>Have extensive experience in python and several other - programming languages.</li> - <li>Be comfortable working remotely.</li> - <li>Be self-directed.</li> - <li>Be comfortable and experienced in getting code and design - reviewed and reviewing the code and design of others.</li> - <li>Be comfortable and experienced in documenting and designing - protocols.</li> - <li>Be comfortable with transparency: as a non-profit, everything - we do is in public, including your name (or company name) and - pay rate.</li> -</ul> - -<p> -An ideal candidate would also: -</p> - -<ul> - <li>Have prior experience with designing and implementing scalable - complex network applications.</li> - <li>Not be afraid of refactoring code and writing unit-tests.</li> - <li>Be familiar with the challenges of developing and scaling data - processing pipelines.</li> - <li>Have prior experience working with the - <a href="https://twistedmatrix.com">Twisted python networking - framework</a>.</li> - <li>Be familiar with the network measurement field.</li> - <li>Have experience with open-source software development, including - working with distributed teams across different time-zones - containing employees and volunteers of differing skill levels.</li> - <li>Have basic familiarity with distributed version control - systems.</li> - <li>Have contributed significant chunks of code to multiple - open-source projects in the past.</li> - <li>Be passionate about internet freedom and interested in - contributing to it in a concrete way.</li> -</ul> - -<p> -Other notes: -</p> - -<ul> - <li>You'll need to be comfortable in this environment! We coordinate - via IRC, instant messaging, email, and bug trackers.</li> - <li>Academic degrees are great, but not required if you have the - right experience.</li> - <li>We only write free and open source software, and we don't - believe in software patents.</li> - <li>Compensation will be determined based on experience and can be - in the range of $6500-$7500 per month.</li> -</ul> - -<p> -How to apply -</p> - -<ul> - <li>Link to a sample of code you've written in the past that you're - allowed to show us and ideally also your github profile.</li> - <li>Provide a CV explaining your background, experience, skills, and - other relevant qualifications.</li> - <li>List some people who can tell us more about you: these - references could be employers or co-workers, open source projects, - etc.</li> - <li>Email the above to oonidevjob(a)torproject.org</li> -</ul> - -<p> -About the project: -</p> - -<p> -The Open Observatory of Network Interference (OONI) is a free software -project under the Tor Project which collects and processes network -measurements with the aim of detecting network interferences, such as -censorship, surveillance and traffic manipulation. Since late 2012, OONI -has collected millions of measurements across more than 90 countries -around the world. -</p> - -<p> -About the company: -</p> - -<p> -The Tor Project is a US 501(c)(3) non-profit dedicated to research, -development, and education about online anonymity and privacy. The Tor -network's 6000 volunteer relays carry 48 Gbps for several million daily -users, including ordinary citizens who want protection from identity -theft and prying corporations, corporations who want to look at a -competitor's website in private, people around the world whose Internet -connections are censored, and even governments and law enforcement. Tor -has a staff of 30 paid developers, researchers, and advocates, plus many -dozen volunteers who help out on a daily basis. Tor is funded in part -by government research and development grants, and in part by individual -and corporate donations. -</p> - - </div> -  - <div id = "sidecol"> -#include "side.wmi" -#include "info.wmi" - </div> -  -</div> - -#include <foot.wmi> - diff --git a/about/en/jobs.wml b/about/en/jobs.wml index eab3af4..4a585f1 100644 --- a/about/en/jobs.wml +++ b/about/en/jobs.wml @@ -12,18 +12,18 @@ <div id="maincol"> <h1>The Tor Project is always looking for more great people to join our team!</h1> -#<p>At the moment, we don't have any official open positions. Please check back -#soon, though! In the meantime, you may want to glance at our -#<a href="<page getinvolved/volunteer>">volunteers</a> page. +<p>At the moment, we don't have any official open positions. Please check back +soon, though! In the meantime, you may want to glance at our +<a href="<page getinvolved/volunteer>">volunteers</a> page. -<p>Specifically, we're looking for the following people currently: -</p> -<ul> -<li><a href="<page about/jobs-ooni>">Core OONI Developer</a></li> -#<li><a href="<page about/jobs-editor>">Writer/Editor</a></li> -#<li><a href="<page about/jobs-admin-assistant>">Administrative Assistant</a></li> -</ul> -</p> +#<p>Specifically, we're looking for the following people currently: +#</p> +#<ul> +#<li><a href="<page about/jobs-ooni>">Core OONI Developer</a></li> +##<li><a href="<page about/jobs-editor>">Writer/Editor</a></li> +##<li><a href="<page about/jobs-admin-assistant>">Administrative Assistant</a></li> +#</ul> +#</p> <p>In the past, we looked for the following people:</p>

1 0

[webwml/master] Update OFTC link.
by sebastian＠torproject.org 21 Jun '16

21 Jun '16

commit 037859bf9ec2e69d80e60ab83075e15edabff5e6 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Jun 21 05:44:32 2016 +0200 Update OFTC link. Patch credit goes to cypherpunks on #19165 --- about/en/contact.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/contact.wml b/about/en/contact.wml index d3a93e6..1668cbd 100644 --- a/about/en/contact.wml +++ b/about/en/contact.wml @@ -62,7 +62,7 @@ <a id="irc"></a> <h3><a class="anchor" href="#irc">IRC</a></h3> <p>Tor users and developers can also be found in the following channels on <a - href="http://www.oftc.net/oftc/">OFTC</a>:</p> + href="https://www.oftc.net/">OFTC</a>:</p> <ul> <li><i>#tor</i> - For questions about using Tor (as a client, as

1 0

[webwml/master] Remove instructions for bypassing Gatekeeper on OS X.
by sebastian＠torproject.org 21 Jun '16

21 Jun '16

commit 3ea8bacac8ec07259b5728b42b5a4f36736d21bb Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jun 1 15:18:11 2016 -0700 Remove instructions for bypassing Gatekeeper on OS X. Tor Browser now works with Gatekeeper (#6540). These instructions were originally added for #14838. This reverts commit 8c308cd6ef7c95b28cf0fc2c4afa1ebf601cd200. This reverts commit 3b647388ec91070e307a9e508f2d7ac597c799d8. This reverts commit 1e96f7e96f192dd341854b5b9ac709775f9a2a50. --- css/layout.css | 14 -------------- download/en/download-easy.wml | 18 ------------------ images/tbb-macosx-step-1.png | Bin 21334 -> 0 bytes images/tbb-macosx-step-2.png | Bin 20451 -> 0 bytes images/tbb-macosx-step-3.png | Bin 13846 -> 0 bytes projects/en/torbrowser.wml | 5 +---- 6 files changed, 1 insertion(+), 36 deletions(-) diff --git a/css/layout.css b/css/layout.css index c65126b..8a79d9d 100644 --- a/css/layout.css +++ b/css/layout.css @@ -660,20 +660,6 @@ table tr img { padding-bottom: 8px; } -.howto th, .howto td { - padding: 2px; -} - -.howto th { - font-weight: bold; - text-align: center; -} - -.howto img { - border: 0; - margin: 0; -} - #download-donate { background-attachment: scroll; background-clip: border-box; diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml index 7a85413..4bb1517 100644 --- a/download/en/download-easy.wml +++ b/download/en/download-easy.wml @@ -75,24 +75,6 @@ </form> <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">Linux</a></p> </div> -  - <table class="howto"> - <tr> - <th>1. Install</th> - <th>2. Control-click</th> - <th>3. Open</th> - </tr> - <tr> - <td><img src="$(IMGROOT)/tbb-macosx-step-1.png" alt="Screenshot showing the contents of the Tor Browser dmg file."></td> - <td><img src="$(IMGROOT)/tbb-macosx-step-2.png" alt="Screenshot of the Applications folder with the Tor Browser icon."></td> - <td><img src="$(IMGROOT)/tbb-macosx-step-3.png" alt="Dialog offering to open Tor Browser."></td> - </tr> - <tr> - <td>Drag the Tor Browser icon to the Applications folder and open the Applications folder.</td> - <td>Control-click on the Tor Browser icon (click the mouse button while pressing the Control key on the keyboard) and choose “Open”.</td> - <td>Click “Open” on the next screen.</td> - </tr> - </table> </div>  <div id="linux" class="easy linux"> diff --git a/images/tbb-macosx-step-1.png b/images/tbb-macosx-step-1.png deleted file mode 100644 index 2dd11fc..0000000 Binary files a/images/tbb-macosx-step-1.png and /dev/null differ diff --git a/images/tbb-macosx-step-2.png b/images/tbb-macosx-step-2.png deleted file mode 100644 index 40f6f92..0000000 Binary files a/images/tbb-macosx-step-2.png and /dev/null differ diff --git a/images/tbb-macosx-step-3.png b/images/tbb-macosx-step-3.png deleted file mode 100644 index 27e98cf..0000000 Binary files a/images/tbb-macosx-step-3.png and /dev/null differ diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index 15ef9e9..261973a 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -570,10 +570,7 @@ <div class="pjtitle"><h2>Mac OS X Instructions</h2></div> <div class="pjtext"> <p>Download the file above, save it somewhere, then click on it. - This opens the .dmg file. (On recent versions of OS X, you might get - a warning that it's from an "unidentified developer" — you can - get around this complaint by <a href="https://tor.stackexchange.com/questions/1187/my-osx-is-saying-torbrowserbun…">control-clicking and selecting "open"</a>.) - Drag the included file into your Applications folder and you will + This opens the .dmg file. Drag the included file into your Applications folder and you will have a Tor Browser application in your chosen language that you can pin on your Dock.</p> </div>

1 0

[webwml/master] Remove mentions of weather on tshirt page (#19354)
by sebastian＠torproject.org 21 Jun '16

21 Jun '16

commit 9b7c479c68182c5d572284d6fb3c4fbd4b8fe8c2 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Jun 21 05:49:47 2016 +0200 Remove mentions of weather on tshirt page (#19354) --- getinvolved/en/tshirt.wml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/getinvolved/en/tshirt.wml b/getinvolved/en/tshirt.wml index 771a81d..7d6336c 100644 --- a/getinvolved/en/tshirt.wml +++ b/getinvolved/en/tshirt.wml @@ -17,7 +17,6 @@ Tor project. There are three primary ways of contributing:</p> <ol> - <li>During our end-of-the-year (2015) fundraising campaign, you can get a special, campaign t-shirt or other cool swag by <a href="<page donate/donate>">donating</a> to the Tor Project.</li> <li>Operate a fast <a href="<page docs/tor-doc-relay>">Tor relay</a> that's been running for the past two months: you are eligible if you allow exits to port 80 and you average 250 KBytes/s traffic, or if you're @@ -33,14 +32,7 @@ </ol> <p> - The <a href="https://weather.torproject.org/">Tor Weather</a> - system watches all of the relays. If you have a valid email address - (lightly obfuscated is acceptable) in your ContactInfo field, - we'll automatically email you when your relay earns you a t-shirt. - </p> - - <p> - If you get such a mail, or you've done something else cool, email + If you're operating a fast relay or you've done something else cool, email us at tshirt(a)torproject.org with the details. (We want to make sure our shirts help outreach happen all around the world, so please understand if we can't send you 5 shirts for your 5 excellent relays.)

1 0