February 2014 - tor-commits - lists.torproject.org

[ooni-probe/master] Bump to version 1.0.0
by art＠torproject.org 20 Feb '14

20 Feb '14

commit f229dcdc19902b313944108cacc0da8c67eea89f Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Feb 20 13:02:28 2014 +0000 Bump to version 1.0.0 --- ooni/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/__init__.py b/ooni/__init__.py index dbf546e..7b6630e 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- __author__ = "Arturo Filastò" -__version__ = "1.0.0-rc6" +__version__ = "1.0.0-rc7" __all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'reporter',

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 20 Feb '14

20 Feb '14

commit 4aa7a8d25159ab93f46a6615b5ae3f72f12d4aa1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 20 12:45:29 2014 +0000 Update translations for tails-greeter --- en_GB/en_GB.po | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po index d70ddec..17a6d6f 100644 --- a/en_GB/en_GB.po +++ b/en_GB/en_GB.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# richardshaylor <rshaylor(a)me.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-10 12:01+0100\n" -"PO-Revision-Date: 2012-10-03 17:36+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2014-01-29 14:26+0100\n" +"PO-Revision-Date: 2014-02-20 12:30+0000\n" +"Last-Translator: richardshaylor <rshaylor(a)me.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,15 +24,15 @@ msgstr "" #: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1 msgid "Login" -msgstr "" +msgstr "Login" #: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2 msgid "Welcome to Tails" -msgstr "" +msgstr "Welcome to Tails" #: ../glade/persistencewindow.glade.h:4 msgid "Use persistence?" -msgstr "" +msgstr "Use persistence?" #: ../glade/persistencewindow.glade.h:5 msgid "Yes" @@ -43,29 +44,29 @@ msgstr "No" #: ../glade/persistencewindow.glade.h:7 msgid "Passphrase:" -msgstr "" +msgstr "Passphrase:" #: ../glade/persistencewindow.glade.h:8 msgid "Read-Only?" -msgstr "" +msgstr "Read-Only?" #: ../glade/persistencewindow.glade.h:9 msgid "<i>Wrong passphrase. Please try again.</i>" -msgstr "" +msgstr "<i>Wrong passphrase. Please try again.</i>" #: ../glade/persistencewindow.glade.h:10 msgid "More options?" -msgstr "" +msgstr "More options?" #: ../glade/optionswindow.glade.h:3 msgid "Administration password" -msgstr "" +msgstr "Administration password" #: ../glade/optionswindow.glade.h:4 msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." -msgstr "" +msgstr "Enter an administration password in case you need to perform administration tasks.\nOtherwise it will be disabled for better security." #: ../glade/optionswindow.glade.h:6 msgid "Password:" @@ -73,48 +74,48 @@ msgstr "Password:" #: ../glade/optionswindow.glade.h:7 msgid "Verify Password:" -msgstr "" +msgstr "Verify Password:" #: ../glade/optionswindow.glade.h:8 msgid "<i>Passwords do not match</i>" -msgstr "" +msgstr "<i>Passwords do not match</i>" #: ../glade/optionswindow.glade.h:9 msgid "Windows Camouflage" -msgstr "" +msgstr "Windows Camouflage" #: ../glade/optionswindow.glade.h:10 msgid "" "This option makes Tails look more like Microsoft Windows XP. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "" +msgstr "This option makes Tails look more like Microsoft Windows XP. This may be useful in public places in order to avoid attracting suspicion." #: ../glade/optionswindow.glade.h:11 msgid "Activate Microsoft Windows XP Camouflage" -msgstr "" +msgstr "Activate Microsoft Windows XP Camouflage" #: ../glade/langpanel.glade.h:1 msgid " " -msgstr "" +msgstr " " #: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 msgid "Language" -msgstr "" +msgstr "Language" #: ../glade/langpanel.glade.h:3 msgid "Locale" -msgstr "" +msgstr "Locale" #: ../glade/langpanel.glade.h:4 msgid "Layout" -msgstr "" +msgstr "Layout" #: ../GdmGreeter/persistence.py:59 #, python-format msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stderr)s" -msgstr "" +msgstr "live-persist failed with return code %(returncode)s:\n%(stderr)s" #: ../GdmGreeter/persistence.py:99 #, python-format @@ -122,7 +123,7 @@ msgid "" "cryptsetup failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "" +msgstr "cryptsetup failed with return code %(returncode)s:\n%(stdout)s\n%(stderr)s" #: ../GdmGreeter/persistence.py:124 #, python-format @@ -130,9 +131,9 @@ msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "" +msgstr "live-persist failed with return code %(returncode)s:\n%(stdout)s\n%(stderr)s" #: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 #: ../GdmGreeter/langpanel.py:181 msgid "Other..." -msgstr "" +msgstr "Other..."

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 20 Feb '14

20 Feb '14

commit 51f517902099c7ea2c4bbf227803bc5b999ddc51 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 20 12:45:25 2014 +0000 Update translations for tails-persistence-setup --- en_GB/en_GB.po | 93 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 47 insertions(+), 46 deletions(-) diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po index 048c796..fb0b13c 100644 --- a/en_GB/en_GB.po +++ b/en_GB/en_GB.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# richardshaylor <rshaylor(a)me.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2013-11-07 16:37+0100\n" -"PO-Revision-Date: 2013-11-15 09:19+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-01-18 21:00+0100\n" +"PO-Revision-Date: 2014-02-20 12:30+0000\n" +"Last-Translator: richardshaylor <rshaylor(a)me.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,59 +20,59 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:48 msgid "Personal Data" -msgstr "" +msgstr "Personal Data" #: ../lib/Tails/Persistence/Configuration/Presets.pm:50 msgid "Keep files stored in the `Persistent' directory" -msgstr "" +msgstr "Keep files stored in the `Persistent' directory" #: ../lib/Tails/Persistence/Configuration/Presets.pm:58 msgid "GnuPG" -msgstr "" +msgstr "GnuPG" #: ../lib/Tails/Persistence/Configuration/Presets.pm:60 msgid "GnuPG keyrings and configuration" -msgstr "" +msgstr "GnuPG keyrings and configuration" #: ../lib/Tails/Persistence/Configuration/Presets.pm:68 msgid "SSH Client" -msgstr "" +msgstr "SSH Client" #: ../lib/Tails/Persistence/Configuration/Presets.pm:70 msgid "SSH keys, configuration and known hosts" -msgstr "" +msgstr "SSH keys, configuration and known hosts" #: ../lib/Tails/Persistence/Configuration/Presets.pm:78 msgid "Pidgin" -msgstr "" +msgstr "Pidgin" #: ../lib/Tails/Persistence/Configuration/Presets.pm:80 msgid "Pidgin profiles and OTR keyring" -msgstr "" +msgstr "Pidgin profiles and OTR keyring" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 msgid "Claws Mail" -msgstr "" +msgstr "Claws Mail" #: ../lib/Tails/Persistence/Configuration/Presets.pm:90 msgid "Claws Mail profiles and locally stored email" -msgstr "" +msgstr "Claws Mail profiles and locally stored email" #: ../lib/Tails/Persistence/Configuration/Presets.pm:98 msgid "GNOME Keyring" -msgstr "" +msgstr "GNOME Keyring" #: ../lib/Tails/Persistence/Configuration/Presets.pm:100 msgid "Secrets stored by GNOME Keyring" -msgstr "" +msgstr "Secrets stored by GNOME Keyring" #: ../lib/Tails/Persistence/Configuration/Presets.pm:108 msgid "Network Connections" -msgstr "" +msgstr "Network Connections" #: ../lib/Tails/Persistence/Configuration/Presets.pm:110 msgid "Configuration of network devices and connections" -msgstr "" +msgstr "Configuration of network devices and connections" #: ../lib/Tails/Persistence/Configuration/Presets.pm:118 msgid "Browser bookmarks" @@ -91,94 +92,94 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "APT Packages" -msgstr "" +msgstr "APT Packages" #: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Packages downloaded by APT" -msgstr "" +msgstr "Packages downloaded by APT" #: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Lists" -msgstr "" +msgstr "APT Lists" #: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "Lists downloaded by APT" -msgstr "" +msgstr "Lists downloaded by APT" #: ../lib/Tails/Persistence/Configuration/Presets.pm:158 msgid "Dotfiles" -msgstr "" +msgstr "Dotfiles" #: ../lib/Tails/Persistence/Configuration/Presets.pm:160 msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" -msgstr "" +msgstr "Symlink into $HOME every file or directory found in the `dotfiles' directory" #: ../lib/Tails/Persistence/Setup.pm:227 msgid "Setup Tails persistent volume" -msgstr "" +msgstr "Setup Tails persistent volume" -#: ../lib/Tails/Persistence/Setup.pm:331 +#: ../lib/Tails/Persistence/Setup.pm:337 #, perl-format msgid "Device %s already has a persistent volume." -msgstr "" +msgstr "Device %s already has a persistent volume." -#: ../lib/Tails/Persistence/Setup.pm:339 +#: ../lib/Tails/Persistence/Setup.pm:345 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:347 ../lib/Tails/Persistence/Setup.pm:361 +#: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367 #, perl-format msgid "Device %s has no persistent volume." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:353 +#: ../lib/Tails/Persistence/Setup.pm:359 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:372 +#: ../lib/Tails/Persistence/Setup.pm:378 msgid "Persistence volume is not unlocked." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:377 +#: ../lib/Tails/Persistence/Setup.pm:383 msgid "Persistence volume is not mounted." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:382 +#: ../lib/Tails/Persistence/Setup.pm:388 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:387 +#: ../lib/Tails/Persistence/Setup.pm:393 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:396 +#: ../lib/Tails/Persistence/Setup.pm:402 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:402 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Device %s is optical." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format msgid "Device %s was not created using Tails USB installer." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:444 +#: ../lib/Tails/Persistence/Setup.pm:450 msgid "Error" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:680 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "Persistence wizard - Finished" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:683 +#: ../lib/Tails/Persistence/Setup.pm:673 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -215,7 +216,7 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 msgid "Passphrase:" -msgstr "" +msgstr "Passphrase:" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 msgid "Verify Passphrase:" @@ -287,28 +288,28 @@ msgstr "" msgid "Saving persistence configuration..." msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:40 +#: ../lib/Tails/Persistence/Step/Delete.pm:41 msgid "Persistence wizard - Persistent volume deletion" msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:43 +#: ../lib/Tails/Persistence/Step/Delete.pm:44 msgid "Your persistent data will be deleted." msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:47 +#: ../lib/Tails/Persistence/Step/Delete.pm:48 #, perl-format msgid "" "The persistent volume %s (%s), on the <b>%s %s</b> device, will be deleted." msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:53 +#: ../lib/Tails/Persistence/Step/Delete.pm:54 msgid "Delete" msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:91 +#: ../lib/Tails/Persistence/Step/Delete.pm:101 msgid "Deleting..." msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:94 +#: ../lib/Tails/Persistence/Step/Delete.pm:104 msgid "Deleting the persistent volume..." msgstr ""

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 20 Feb '14

20 Feb '14

commit 98b010c2fbc58ae3d418ee1a47405dc3247a6586 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 20 12:45:19 2014 +0000 Update translations for https_everywhere --- en_GB/https-everywhere.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/en_GB/https-everywhere.properties b/en_GB/https-everywhere.properties index 43706aa..a7a8af1 100644 --- a/en_GB/https-everywhere.properties +++ b/en_GB/https-everywhere.properties @@ -1,8 +1,8 @@ https-everywhere.menu.globalEnable = Enable HTTPS Everywhere https-everywhere.menu.globalDisable = Disable HTTPS Everywhere -# https-everywhere.menu.enableDisable = Enable / Disable Rules -# https-everywhere.menu.noRules = (No Rules for This Page) -# https-everywhere.menu.unknownRules = (Rules for This Page Unknown) +https-everywhere.menu.enableDisable = Enable / Disable Rules +https-everywhere.menu.noRules = (No Rules for This Page) +https-everywhere.menu.unknownRules = (Rules for This Page Unknown) # https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar. # https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values. # https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 20 Feb '14

20 Feb '14

commit 2632b081e62a76817a65c6b0a7f0d47bfd201295 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 20 12:45:08 2014 +0000 Update translations for tsum --- en_GB/short-user-manual_en_GB_noimg.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en_GB/short-user-manual_en_GB_noimg.xhtml b/en_GB/short-user-manual_en_GB_noimg.xhtml index 681e5b7..8c4ef4a 100644 --- a/en_GB/short-user-manual_en_GB_noimg.xhtml +++ b/en_GB/short-user-manual_en_GB_noimg.xhtml @@ -126,7 +126,7 @@ sub 2048R/EB399FD7 2003-10-16 <p>Please see the <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton FAQ</a> for more information.</p> <h3 id="i-want-to-use-another-browser">I want to use another browser</h3> <p>For security reasons, we recommend that you only browse the web through Tor using the Tor Browser Bundle. It is technically possible to use Tor with other browsers, but by doing so you open yourself up to potential attacks.</p> - <h3 id="why-tor-is-slow">Why Tor is slow</h3> + <h3 id="why-tor-is-slow">Why is Tor slow</h3> <p>Tor can sometimes be a bit slower than your normal Internet connection. After all, your traffic is sent through many different countries, sometimes across oceans around the world!</p> </body> </html>

1 0

[tor-browser-bundle/master] Add prep-alpha target back in.
by mikeperry＠torproject.org 20 Feb '14

20 Feb '14

commit 1249896fb3e965157987c57b23ba07166cba0e41 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 20 12:20:09 2014 +0000 Add prep-alpha target back in. "Think once, commit twice!" --- gitian/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gitian/Makefile b/gitian/Makefile index c63fdfe..e483735 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -62,6 +62,10 @@ prep-nightly: ./check-prerequisites.sh ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.nightly +prep-alpha: + ./check-prerequisites.sh + torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.alpha + prep-beta: ./check-prerequisites.sh torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.beta

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 20 Feb '14

20 Feb '14

commit 5469467dfd6d9111b8bd0898ff27bc21885897af Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 20 12:15:20 2014 +0000 Update translations for https_everywhere_completed --- en_GB/ssl-observatory.dtd | 95 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/en_GB/ssl-observatory.dtd b/en_GB/ssl-observatory.dtd new file mode 100644 index 0000000..df8f34d --- /dev/null +++ b/en_GB/ssl-observatory.dtd @@ -0,0 +1,95 @@ + +<!ENTITY ssl-observatory.popup.details "Details and Privacy Information"> +<!ENTITY ssl-observatory.popup.later "Ask Me Later"> +<!ENTITY ssl-observatory.popup.no "No"> + +<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks +against your browser by sending the certificates you receive to the +Observatory. Turn this on?"> + + + +<!ENTITY ssl-observatory.popup.title +"Should HTTPS Everywhere use the SSL Observatory?"> + +<!ENTITY ssl-observatory.popup.yes "Yes"> + + + +<!ENTITY ssl-observatory.prefs.adv_priv_opts1 +"It is safe to enable this, unless you use a very +intrusive corporate network:"> + +<!ENTITY ssl-observatory.prefs.adv_priv_opts2 +"Safe, unless you use a corporate network with secret intranet server names:"> + +<!ENTITY ssl-observatory.prefs.alt_roots +"Submit and check certificates signed by non-standard root CAs"> + +<!ENTITY ssl-observatory.prefs.alt_roots_tooltip +"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority. If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce. So we leave it off by default."> + +<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity"> +<!ENTITY ssl-observatory.prefs.anonymous_unavailable +"Check certificates using Tor for anonymity (requires Tor)"> +<!ENTITY ssl-observatory.prefs.anonymous_tooltip +"This option requires Tor to be installed and running"> + +<!ENTITY ssl-observatory.prefs.asn +"When you see a new certificate, tell the Observatory which ISP you are connected to"> + +<!ENTITY ssl-observatory.prefs.asn_tooltip +"This will fetch and send the "Autonomous System number" of your network. This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common."> + +<!ENTITY ssl-observatory.prefs.done "Done"> + +<!ENTITY ssl-observatory.prefs.explanation +"HTTPS Everywhere can use EFF's SSL Observatory. This does two things: (1) +sends copies of HTTPS certificates to the Observatory, to help us +detect 'man in the middle' attacks and improve the Web's security; and (2) +lets us warn you about insecure connections or attacks on your browser."> + + + +<!ENTITY ssl-observatory.prefs.explanation2 + +"For example, when you visit https://www.something.com, the certificate +received by the Observatory will indicate that somebody visited +www.something.com, but not who visited the site, or what specific page they +looked at. Mouseover the options for further details:"> + +<!ENTITY ssl-observatory.prefs.hide "Hide advanced options"> + +<!ENTITY ssl-observatory.prefs.nonanon +"Check certificates even if Tor is not available"> + +<!ENTITY ssl-observatory.prefs.nonanon_tooltip +"We will still try to keep the data anonymous, but this option is less secure"> + +<!ENTITY ssl-observatory.prefs.priv_dns +"Submit and check certificates for non-public DNS names"> + +<!ENTITY ssl-observatory.prefs.priv_dns_tooltip +"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system."> + +<!ENTITY ssl-observatory.prefs.show "Show advanced options"> + +<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences"> + +<!ENTITY ssl-observatory.prefs.use "Use the Observatory?"> +<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory"> +<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain"> +<!ENTITY ssl-observatory.warning.okay "I understand"> +<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificate(s) for this site:"> +<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection."> + +<!ENTITY ssl-observatory.prefs.self_signed +"Submit and check self-signed certificates"> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +"This is recommended; cryptographic problems are especially common in self-signed embedded devices">

1 0

[ooni-probe/master] Make GeoIP AS and GeoIP City soft dependencies.
by art＠torproject.org 20 Feb '14

20 Feb '14

commit 0daffadb44d61fcf3eb31f7e7192cbbc46f52c33 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Feb 20 12:02:48 2014 +0000 Make GeoIP AS and GeoIP City soft dependencies. Allows ooniprobe to report back the country of the probe even if no GeoIP ASN and City database is present. --- ooni/geoip.py | 35 ++++++++++++++++++----------------- ooni/nettest.py | 28 +++++++++++----------------- 2 files changed, 29 insertions(+), 34 deletions(-) diff --git a/ooni/geoip.py b/ooni/geoip.py index a97a6f5..2792126 100644 --- a/ooni/geoip.py +++ b/ooni/geoip.py @@ -30,30 +30,31 @@ def IPToLocation(ipaddr): country_file = os.path.join(config.advanced.geoip_data_dir, 'GeoIP.dat') asn_file = os.path.join(config.advanced.geoip_data_dir, 'GeoIPASNum.dat') - location = {'city': None, 'countrycode': None, 'asn': None} - try: - city_dat = GeoIP(city_file) - try: - location['city'] = city_dat.record_by_addr(ipaddr)['city'] - except TypeError: - location['city'] = None + location = {'city': None, 'countrycode': 'ZZ', 'asn': 'AS0'} + try: country_dat = GeoIP(country_file) location['countrycode'] = country_dat.country_code_by_addr(ipaddr) if not location['countrycode']: location['countrycode'] = 'ZZ' - - asn_dat = GeoIP(asn_file) - try: - location['asn'] = asn_dat.org_by_addr(ipaddr).split(' ')[0] - except AttributeError: - location['asn'] = 'AS0' - except IOError: - log.err("Could not find GeoIP data files. Go into %s " - "and run make geoip or change the geoip_data_dir " + log.err("Could not find GeoIP data file. Go into %s " + "and make sure GeoIP.dat is present or change the location " "in the config file" % config.advanced.geoip_data_dir) - raise GeoIPDataFilesNotFound + try: + city_dat = GeoIP(city_file) + location['city'] = city_dat.record_by_addr(ipaddr)['city'] + except: + log.err("Could not find the city your IP is from. " + "Download the GeoLiteCity.dat file into the geoip_data_dir" + " or install geoip-database-contrib.") + try: + asn_dat = GeoIP(asn_file) + location['asn'] = asn_dat.org_by_addr(ipaddr).split(' ')[0] + except: + log.err("Could not find the ASN for your IP. " + "Download the GeoIPASNum.dat file into the geoip_data_dir" + " or install geoip-database-contrib.") return location diff --git a/ooni/nettest.py b/ooni/nettest.py index 526de5d..1780953 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -238,17 +238,19 @@ class NetTestLoader(object): def testDetails(self): from ooni import __version__ as software_version - client_geodata = {} + client_geodata = { + 'city': None, + 'countrycode': 'ZZ', + 'asn': 'AS0', + 'ip': '127.0.0.1' + } + if config.probe_ip.address and (config.privacy.includeip or \ config.privacy.includeasn or \ config.privacy.includecountry or \ config.privacy.includecity): log.msg("We will include some geo data in the report") - try: - client_geodata = geoip.IPToLocation(config.probe_ip.address) - except e.GeoIPDataFilesNotFound: - log.err("Unable to find the geoip data files") - client_geodata = {'city': None, 'countrycode': None, 'asn': None} + client_geodata = geoip.IPToLocation(config.probe_ip.address) if config.privacy.includeip: client_geodata['ip'] = config.probe_ip.address @@ -257,21 +259,13 @@ class NetTestLoader(object): # Here we unset all the client geodata if the option to not include then # has been specified - if client_geodata and not config.privacy.includeasn: + if not config.privacy.includeasn: client_geodata['asn'] = 'AS0' - elif 'asn' in client_geodata: - # XXX this regexp should probably go inside of geodata - client_geodata['asn'] = client_geodata['asn'] - log.msg("Your AS number is: %s" % client_geodata['asn']) - else: - client_geodata['asn'] = None - if (client_geodata and not config.privacy.includecity) \ - or ('city' not in client_geodata): + if not config.privacy.includecity: client_geodata['city'] = None - if (client_geodata and not config.privacy.includecountry) \ - or ('countrycode' not in client_geodata): + if not config.privacy.includecountry: client_geodata['countrycode'] = None input_file_hashes = []

1 0

[ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe
by art＠torproject.org 20 Feb '14

20 Feb '14

commit 0c702b6f957992d2dbe0be8356b80c3efc2e129d Merge: 0daffad de4a8ea Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Feb 20 12:08:50 2014 +0000 Merge branch 'master' of github.com:TheTorProject/ooni-probe * 'master' of github.com:TheTorProject/ooni-probe: Minor fixes to comments DNS-host-resolution-for-tls_handshake Bug-Fixes-for-tls_handshake ooni/nettests/experimental/tls_handshake.py | 36 ++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-)

1 0

[ooni-probe/master] Bug-Fixes-for-tls_handshake
by art＠torproject.org 20 Feb '14

20 Feb '14

commit 6833c8897a94a651ba330673d9cd72239f352de0 Author: Arun Pandian G <arunpandianp(a)gmail.com> Date: Thu Feb 6 17:36:52 2014 +0530 Bug-Fixes-for-tls_handshake --- ooni/nettests/experimental/tls_handshake.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ooni/nettests/experimental/tls_handshake.py b/ooni/nettests/experimental/tls_handshake.py index 5da2e8b..c3da9a9 100644 --- a/ooni/nettests/experimental/tls_handshake.py +++ b/ooni/nettests/experimental/tls_handshake.py @@ -38,9 +38,10 @@ from OpenSSL import SSL, crypto from twisted.internet import defer, threads from twisted.python import usage, failure -from ooni import nettest, config +from ooni import nettest from ooni.utils import log from ooni.errors import InsufficientPrivileges +from ooni.settings import config ## For a way to obtain the current version of Firefox's default ciphersuite ## list, see https://trac.torproject.org/projects/tor/attachment/ticket/4744/ @@ -100,7 +101,7 @@ class SSLContextError(usage.UsageError): message = self.errors[message] super(usage.UsageError, self).__init__(message) -class HostUnreachable(Exception): +class HostUnreachableError(Exception): """Raised when the host IP address appears to be unreachable.""" pass @@ -162,6 +163,7 @@ class HandshakeTest(nettest.NetTestCase): if not (options['ssl2'] or options['ssl3'] or options['tls1']): try: raise SSLContextError('NO_CONTEXT') except SSLContextError as sce: log.err(sce.message) + context = None else: ## If incompatible contexts were chosen, inform the user: if options['tls1'] and (options['ssl2'] or options['ssl3']):

1 0