- tor-commits - lists.torproject.org

[ooni-probe/master] Allow test resolver file to have comments
by art＠torproject.org 02 Dec '12

02 Dec '12

commit 813ba31ecf0e97bf4f620ef869492087825aac4c Author: aagbsn <aagbsn(a)extc.org> Date: Sat Dec 1 19:09:16 2012 +0000 Allow test resolver file to have comments The test resolver file may contain comments like so: 8.8.8.8 # google public dns 208.67.222.222 # open dns --- nettests/blocking/dnstamper.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/nettests/blocking/dnstamper.py b/nettests/blocking/dnstamper.py index f663276..67f02c9 100644 --- a/nettests/blocking/dnstamper.py +++ b/nettests/blocking/dnstamper.py @@ -61,7 +61,7 @@ class DNSTamperTest(dnst.DNSTest): try: with open(test_resolvers_file) as f: - self.test_resolvers = [x.strip() for x in f.readlines()] + self.test_resolvers = [x.split('#')[0].strip() for x in f.readlines()] self.report['test_resolvers'] = self.test_resolvers fp.close()

1 0

[ooni-probe/master] Autostart Tor in default configuration
by art＠torproject.org 02 Dec '12

02 Dec '12

commit b6f19d97075592cc161a4893d6bc7f486c203598 Author: aagbsn <aagbsn(a)extc.org> Date: Sat Dec 1 18:54:30 2012 +0000 Autostart Tor in default configuration On debian with tor installed this option works out-the-box: mv ooniprobe.conf.example ooniprobe.conf --- ooniprobe.conf.sample | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ooniprobe.conf.sample b/ooniprobe.conf.sample index 551e4f0..ed77dfe 100644 --- a/ooniprobe.conf.sample +++ b/ooniprobe.conf.sample @@ -29,7 +29,7 @@ advanced: #interface: wlan0 # If you do not specify start_tor, you will have to have Tor running and # explicitly set the control port and orport. - start_tor: false + start_tor: true tor: #socks_port: 9050 #control_port: 9051

1 0

[ooni-probe/master] Add inputProcessor that can handle urls, e.g. alexa-top-1m
by art＠torproject.org 02 Dec '12

02 Dec '12

commit eb40c95c7fdf114622ee0919144fca50e64d003e Author: aagbsn <aagbsn(a)extc.org> Date: Sun Dec 2 16:36:53 2012 +0000 Add inputProcessor that can handle urls, e.g. alexa-top-1m --- nettests/blocking/dnstamper.py | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/nettests/blocking/dnstamper.py b/nettests/blocking/dnstamper.py index 6185e1b..b9dfc1b 100644 --- a/nettests/blocking/dnstamper.py +++ b/nettests/blocking/dnstamper.py @@ -151,3 +151,16 @@ class DNSTamperTest(dnst.DNSTest): lookup_details() log.msg("tampering: true") self.report['tampering'][test_resolver] = True + + def inputProcessor(self, filename=None): + """ + This inputProcessor extracts domain names from urls + """ + log.debug("Running dnstamper default processor") + if filename: + fp = open(filename) + for x in fp.readlines(): + yield x.strip().split('//')[-1].split('/')[0] + fp.close() + else: + pass

1 0

[ooni-probe/master] Fix variable name
by art＠torproject.org 02 Dec '12

02 Dec '12

commit 5a9d66c80afcf78e6cabcb6fe0d6dbc714618055 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Dec 2 15:01:32 2012 +0000 Fix variable name fp.close should be f.close() --- nettests/blocking/dnstamper.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/nettests/blocking/dnstamper.py b/nettests/blocking/dnstamper.py index 6d6acf5..6185e1b 100644 --- a/nettests/blocking/dnstamper.py +++ b/nettests/blocking/dnstamper.py @@ -63,7 +63,7 @@ class DNSTamperTest(dnst.DNSTest): with open(test_resolvers_file) as f: self.test_resolvers = [x.split('#')[0].strip() for x in f.readlines()] self.report['test_resolvers'] = self.test_resolvers - fp.close() + f.close() except IOError: log.exception(e)

1 0

[ooni-probe/master] Add debug log for control dns resolution failure
by art＠torproject.org 02 Dec '12

02 Dec '12

commit 924c1a706e757d586fe7ade6bfc0bafa88d024df Author: aagbsn <aagbsn(a)extc.org> Date: Sat Dec 1 19:35:55 2012 +0000 Add debug log for control dns resolution failure --- nettests/blocking/dnstamper.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/nettests/blocking/dnstamper.py b/nettests/blocking/dnstamper.py index 67f02c9..6d6acf5 100644 --- a/nettests/blocking/dnstamper.py +++ b/nettests/blocking/dnstamper.py @@ -104,6 +104,11 @@ class DNSTamperTest(dnst.DNSTest): self.report['tampering'] = {} control_answers = yield self.performALookup(hostname, self.control_dns_server) + if not control_answers: + log.err("Got no response from control DNS server %s," \ + " perhaps the DNS resolver is down?" % self.control_dns_server[0]) + self.report['tampering'][self.control_dns_server] = 'no_answer' + return for test_resolver in self.test_resolvers: log.msg("Testing %s test resolver" % test_resolver)

1 0

[ooni-probe/master] Update docstring
by art＠torproject.org 02 Dec '12

02 Dec '12

commit 6897342ddf30499eb6cebcb95977fa5be1f22677 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Dec 2 16:50:50 2012 +0000 Update docstring --- ooni/nettest.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 5e62adb..8374db1 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -152,7 +152,7 @@ class NetTestCase(object): def inputProcessor(self, filename=None): """ You may replace this with your own custom input processor. It takes as - input a file descriptor so remember to close it when you are done. + input a file name. This can be useful when you have some input data that is in a certain format and you want to set the input attribute of the test to something

1 0

[ooni-probe/master] Merge pull request #14 from aagbsn/dnstamper_fixes
by art＠torproject.org 02 Dec '12

02 Dec '12

commit 2f584dcb30f32c920f3e73cd1f25fd46f4756ec5 Merge: 6e1aa81 80fce04 Author: Arturo Filastò <hellais(a)gmail.com> Date: Sun Dec 2 09:48:38 2012 -0800 Merge pull request #14 from aagbsn/dnstamper_fixes Dnstamper fixes docs/source/tests/dnstamper.rst | 2 +- nettests/blocking/dnstamper.py | 22 ++++++++++++++++++++-- ooni/nettest.py | 2 +- ooniprobe.conf.sample | 2 +- 4 files changed, 23 insertions(+), 5 deletions(-)

1 0

[ooni-probe/master] This test may now read URLs as input, e.g. the alexa-top-1m
by art＠torproject.org 02 Dec '12

02 Dec '12

commit 80fce04b54ba8038df04abc7900680d13324d186 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Dec 2 16:57:29 2012 +0000 This test may now read URLs as input, e.g. the alexa-top-1m --- docs/source/tests/dnstamper.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/source/tests/dnstamper.rst b/docs/source/tests/dnstamper.rst index b97131b..c4e6f17 100644 --- a/docs/source/tests/dnstamper.rst +++ b/docs/source/tests/dnstamper.rst @@ -34,7 +34,7 @@ How to run the test *test resolvers file* is a file containing the IP addresses of the resolvers to test for censorship, one per line. -*input file* is a file containing the hostnames to check for tampering. +*input file* is a file containing hostnames or urls to check for tampering. *IP:PORT* is the address of the known good "control" resolver.

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 02 Dec '12

02 Dec '12

commit 477928484c52c4565553bb88b7fb3c90158eec74 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 2 10:15:32 2012 +0000 Update translations for vidalia_help --- eu/troubleshooting.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eu/troubleshooting.po b/eu/troubleshooting.po index f9f64b3..3044e1e 100644 --- a/eu/troubleshooting.po +++ b/eu/troubleshooting.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2012-05-08 14:56+0000\n" +"PO-Revision-Date: 2012-12-02 10:12+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: eu\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" # type: Content of: <html><body><h1> #: en/troubleshooting.html:16 @@ -123,7 +123,7 @@ msgid "" "Usually this process of generating and setting a random control password " "happens in the background. There are three common situations, though, where " "Vidalia may prompt you for a password:" -msgstr "" +msgstr "Orokorrean ausazko kontrol pasahitz bat sortu eta ezartzearen prozesu hau atzeko planoan gertatzen da. Hiru egoera arrunt daude, hala ere, zeinetan Vidaliak pasahitz bat eska zaitzake:" # type: Content of: <html><body><ul><li> #: en/troubleshooting.html:82 @@ -132,7 +132,7 @@ msgid "" "happen if you installed the Vidalia bundle and now you're trying to run the " "Tor Browser Bundle. In that case, you'll need to close the old Vidalia and " "Tor before you can run this one." -msgstr "" +msgstr "Dagoeneko Vidalia eta Tor exekutatzen ari zara. Adibidez, Vidalia sorta instalatu bazenuen eta orain Tor Browser Bundlea exekutatzen ari bazara egoera hau gerta daiteke. Kasu horretan, Vidalia eta Tor zaharrak itxi beharko dituzu berri hau exekutatu baino lehen." # type: Content of: <html><body><ul><li> #: en/troubleshooting.html:89 @@ -140,7 +140,7 @@ msgid "" "Vidalia crashed, but left Tor running with the last known random password. " "After you restart Vidalia, it generates a new random password, but Vidalia " "can't talk to Tor, because the random passwords are different." -msgstr "" +msgstr "Vidaliak huts egin du, baina Tor exekutatzen utzi du azken ausazko pasahitz ezagunarekin. Vidalia berrabiarazten duzun ostean, ausazko pasahitz berri bat sortzen du, baina Vidaliak ezin dio Tori hitz egin, ausazko pasahitzak ezberdinak direlako." # type: Content of: <html><body><ul><li> #: en/troubleshooting.html:94 @@ -148,7 +148,7 @@ msgid "" "If the dialog that prompts you for a control password has a Reset " "button, you can click the button and Vidalia will restart Tor with a new " "random control password." -msgstr "" +msgstr "Kontrol pasahitz bat eskatuz agertzen zaizun elkarrizketa-dialogoak Berrezarri botoi bat baldin badu, botoia sakatu dezakezu eta Vidaliak Tor ausazko pasahitz berri batekin berrabiaraziko du." # type: Content of: <html><body><ul><li> #: en/troubleshooting.html:99 @@ -157,7 +157,7 @@ msgid "" "Tor for you, you can still fix the problem manually. Simply go into your " "process or task manager, and terminate the Tor process. Then use Vidalia to " "restart Tor and all will work again." -msgstr "" +msgstr "Berrabiarazi botoirik ikusten ez baduzu, edo Vidaliak Tor berrabiarazi ezin badu, eskuz konpondu dezakezu arazoa oraindik. Besterik gabe, zure prozesu edo zeregin kudeatzailera joan eta Tor prozesua amaitu. Ondoren erabili ezazu Vidalia Tor berrabiarazteko eta berriz ondo funtzionatuko du." # type: Content of: <html><body><ul><li> #: en/troubleshooting.html:106

1 0

r25924: {website} tweaks from talking to weasel (website/trunk/projects/en)
by Roger Dingledine 02 Dec '12

02 Dec '12

Author: arma Date: 2012-12-02 09:28:11 +0000 (Sun, 02 Dec 2012) New Revision: 25924 Modified: website/trunk/projects/en/obfsproxy-debian-instructions.wml Log: tweaks from talking to weasel Modified: website/trunk/projects/en/obfsproxy-debian-instructions.wml =================================================================== --- website/trunk/projects/en/obfsproxy-debian-instructions.wml 2012-11-29 16:25:02 UTC (rev 25923) +++ website/trunk/projects/en/obfsproxy-debian-instructions.wml 2012-12-02 09:28:11 UTC (rev 25924) @@ -28,7 +28,7 @@ Add the <a href="<page docs/debian>#development">development Tor APT repository</a> and run the specified commands to install tor - and deb.torproject.org-keyring. You need Tor 0.2.4.x Tor because + and deb.torproject.org-keyring. You need Tor 0.2.4.x because it knows how to automatically report your obfsproxy address to <a href="https://bridges.torproject.org/?transport=obfs2">BridgeDB</a>. @@ -62,7 +62,7 @@ Exitpolicy reject *:* \## CHANGEME_1 -> provide a nickname for your bridge, can be anything you like -Nickname CHANGEME_1 +\#Nickname CHANGEME_1 \## CHANGEME_2 -> provide some email address so we can contact you if there's a problem \#ContactInfo CHANGEME_2 @@ -70,7 +70,7 @@ </pre> - Don't forget to edit the CHANGEME fields! + Don't forget to uncomment and edit the CHANGEME fields! <h3>Step 3: Launch Tor and verify that it bootstraps</h3> @@ -100,7 +100,7 @@ </pre> - If Tor is earlier in the bootstrapping phase, wait till it gets to + If Tor is earlier in the bootstrapping phase, wait until it gets to 100%.

1 0