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

[oonib/master] Updates the imports to reflect the repository changes and sets the
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit 661a3034877278ab89d0012c84a68d6ddfffe062 Author: aagbsn <aagbsn(a)extc.org> Date: Thu May 23 16:19:17 2013 -0400 Updates the imports to reflect the repository changes and sets the default paths to the right values for deploying on MLAB. --- scripts/archive_reports.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/archive_reports.py b/scripts/archive_reports.py index c49bd7a..d8c1394 100755 --- a/scripts/archive_reports.py +++ b/scripts/archive_reports.py @@ -8,16 +8,16 @@ import re from ipaddr import IPAddress from datetime import timedelta from datetime import datetime -from ooni.otime import fromTimestamp, timestamp -from ooni.otime import InvalidTimestampFormat, utcDateNow -from ooni.utils import log +from oonib.otime import fromTimestamp, timestamp +from oonib.otime import InvalidTimestampFormat, utcDateNow +from oonib import log ############################################################################### # You can set some config options here # ############################################################################### report_age = 1 # hours -report_archive_dir = '/home/user/oonib/reports/archived' -report_source_dir = '/home/user/oonib/reports' +report_archive_dir = '/var/spool/mlab_ooni/archived' +report_source_dir = '/var/spool/mlab_ooni' valid_test_versions = ['0.1', '0.1.1', '0.4', '0.1.3'] default_probe_cc = '??' target_permission = 0444

1 0

[oonib/master] Merge pull request #3 from aagbsn/fix/update_archive_reports_imports
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit 7aba85b6f7554111885b1745396eec0fa0b6196a Merge: 37e1150 661a303 Author: Isis Agora Lovecruft <isis(a)torproject.org> Date: Wed Jun 5 18:26:15 2013 -0700 Merge pull request #3 from aagbsn/fix/update_archive_reports_imports Updates the imports to reflect the repository changes and sets the scripts/archive_reports.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

1 0

[tor-launcher/master] Bump version to 0.2-alpha for release.
by mikeperry＠torproject.org 05 Jun '13

05 Jun '13

commit 394c303a43dcd0bc26ff6aac48f9eeda4d6d6a10 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 5 12:15:02 2013 -0700 Bump version to 0.2-alpha for release. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 15dadeb..497fa45 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2pre-alpha</em:version> + <em:version>0.2-alpha</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <!-- <em:optionsURL>chrome://torlauncher/content/preferences.xul</em:optionsURL>

1 0

[tor-launcher/master] Fix a typo in translation update script.
by mikeperry＠torproject.org 05 Jun '13

05 Jun '13

commit 1e0c33a6c08f26651dde5bea065d439c105701ca Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 5 12:00:31 2013 -0700 Fix a typo in translation update script. --- localization/import-translations.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/localization/import-translations.sh b/localization/import-translations.sh index bd05bc5..a8d07e4 100755 --- a/localization/import-translations.sh +++ b/localization/import-translations.sh @@ -2,9 +2,9 @@ BUNDLE_LOCALES="de es fa fr it ko nl pl pt ru vi zh-CN" -if [ -d translations ]; +if [ -d translation ]; then - cd translations + cd translation git fetch origin cd .. else

1 0

[tor-launcher/master] Update transifex translations.
by mikeperry＠torproject.org 05 Jun '13

05 Jun '13

commit b6172ef809b2839bd8fed07d70fe35d66f0abf7c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 5 12:03:51 2013 -0700 Update transifex translations. --- src/chrome/locale/fr/network-settings.dtd | 42 ++++++++++++++--------------- src/chrome/locale/fr/progress.dtd | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index 35317f0..634a8e1 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -1,28 +1,28 @@ -<!ENTITY torsettings.dialog.title "Paramètres réseaux de Tor"> +<!ENTITY torsettings.dialog.title "Paramètres du réseau Tor">  -<!ENTITY torsettings.prompt ""> +<!ENTITY torsettings.prompt "Avant que le navigateur Tor ne tente de se connecter au réseau Tor, vous devez fournir quelques informations concernant votre connexion Internet."> <!ENTITY torSettings.yes "Oui"> <!ENTITY torSettings.no "Non"> -<!ENTITY torSettings.firstQuestion ""> -<!ENTITY torSettings.configurePrompt1 ""> -<!ENTITY torSettings.configurePrompt2 ""> -<!ENTITY torSettings.configure ""> -<!ENTITY torSettings.connectPrompt1 ""> -<!ENTITY torSettings.connectPrompt2 ""> +<!ENTITY torSettings.firstQuestion "Laquelle des phrases suivantes décrit le mieux votre situation?"> +<!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurée, filtrée ou détournée."> +<!ENTITY torSettings.configurePrompt2 "J'ai besoin de configuré les paramètres réseau. "> +<!ENTITY torSettings.configure "Configurer"> +<!ENTITY torSettings.connectPrompt1 "La connexion internet de cet ordinateur est libre de tous obstacles."> +<!ENTITY torSettings.connectPrompt2 "Je voudrai me connecté directement au réseau Tor."> <!ENTITY torSettings.connect "Connecter"> -<!ENTITY torSettings.proxyQuestion ""> +<!ENTITY torSettings.proxyQuestion "Est-ce que cet ordinateur à besoin d'un proxy pour accéder à internet ?">  -<!ENTITY torSettings.proxyHelp ""> -<!ENTITY torSettings.enterProxy ""> -<!ENTITY torSettings.firewallQuestion ""> -<!ENTITY torSettings.firewallHelp ""> -<!ENTITY torSettings.enterFirewall ""> -<!ENTITY torSettings.bridgeQuestion ""> +<!ENTITY torSettings.proxyHelp "Si vous n'êtes pas certain de répondre correctement à cette question regardez les paramètres Internet d'un autre navigateur afin de vérifier si vous utilisez un proxy."> +<!ENTITY torSettings.enterProxy "Entrez les paramètres de votre proxy."> +<!ENTITY torSettings.firewallQuestion "Est-ce que votre connexion Internet passe à travers un pare-feu qui ne vous autorise à vous connecter qu'à travers certains ports ?"> +<!ENTITY torSettings.firewallHelp "Si vous n'êtes pas certain de répondre correctement à cette question choisissez Non. Si vous rencontrez des problèmes pour vous connecter au réseau Tor, changez vos paramètres."> +<!ENTITY torSettings.enterFirewall "Entrez la liste de ports, séparés par des virgules, qui sont autorisés par votre pare-feu."> +<!ENTITY torSettings.bridgeQuestion "Si la connexion Internet de cet ordinateur est censurée, vous devrez obtenir et utiliser des pont-relais.&#160; Sinon, cliquez simplement sur Connect.">  @@ -30,8 +30,8 @@ <!ENTITY torsettings.optional "Optionnel"> -<!ENTITY torsettings.useProxy.checkbox ""> -<!ENTITY torsettings.useProxy.type ""> +<!ENTITY torsettings.useProxy.checkbox "Cet ordinateur a besoin d'utiliser un proxy pour accéder à Internet"> +<!ENTITY torsettings.useProxy.type "Type de proxy"> <!ENTITY torsettings.useProxy.address "Adresse :"> <!ENTITY torsettings.useProxy.address.placeholder "Adresse IP ou nom d'hôte"> <!ENTITY torsettings.useProxy.port "Port :"> @@ -40,7 +40,7 @@ <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox ""> +<!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui autorise uniquement les connexions à certains ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :"> <!ENTITY torsettings.useBridges.checkbox "Mon Fournisseur d'Accès Internet (FAI) bloque les connexions au réseau Tor"> <!ENTITY torsettings.useBridges.label "Entrez une ou plusieurs passerelles relais sous la forme adresse:port"> @@ -48,7 +48,7 @@ <!ENTITY torsettings.copyLog "Copier les logs de Tor dans le Press-papier"> <!ENTITY torsettings.bridgeHelpTitle "Aide pour les passerelles relais"> -<!ENTITY torsettings.bridgeHelp1 ""> +<!ENTITY torsettings.bridgeHelp1 "Si vous êtes dans l'incapacité de vous connecter au réseau Tor cela peut venir du fait que votre Fournisseur d'Accès Internet (FAI) bloque Tor. La plupart du temps vous pouvez contourner ce problème en utilisant les passerelles Tor qui sont des relais cachés, plus difficiles à bloquer."> <!ENTITY torsettings.bridgeHelp2 "Pour obtenir quelques passerelles relais utilisez un navigateur web pour aller sur la page suivante : https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3 ""> -<!ENTITY torsettings.bridgeHelp4 ""> +<!ENTITY torsettings.bridgeHelp3 "Une autre façon de trouver les adresses publiques de ponts est d'envoyer un mail à bridges(a)torproject.org avec la ligne "get bridges" dans le corps de l'e-mail. Toutefois, afin que nous puissions rendre plus difficile pour un attaquant d'apprendre beaucoup d'adresses de ponts, vous devez adresser cette demande à partir d'une adresse e-mail appartenant à l'un des domaines suivants: gmail.com ou yahoo.com"> +<!ENTITY torsettings.bridgeHelp4 "Vous pouvez également demander un pont-relais en envoyant un e-mail à help(a)rt.torproject.org."> diff --git a/src/chrome/locale/fr/progress.dtd b/src/chrome/locale/fr/progress.dtd index dd77219..3686a23 100644 --- a/src/chrome/locale/fr/progress.dtd +++ b/src/chrome/locale/fr/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Status de Tor"> <!ENTITY torprogress.openSettings "Ouvrir les paramètres"> <!ENTITY torprogress.heading "Connexion au réseau Tor"> -<!ENTITY torprogress.pleaseWait ""> +<!ENTITY torprogress.pleaseWait "Le Navigateur Tor s'ouvrira après que la connexion au réseau Tor soit établie.">

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 05 Jun '13

05 Jun '13

commit c860a96ecb652d76dc23f2b490db4f5a95e9b0c3 Merge: c03cfc0 fe689de Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 5 11:22:19 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/geoip-june2013 | 3 + src/config/geoip |106050 +++++------------------------------------------- 2 files changed, 9168 insertions(+), 96885 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 05 Jun '13

05 Jun '13

commit 7159e19ea90b16d35beefd09ff84bf69b71d23ee Merge: beec881 c860a96 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 5 11:22:36 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/geoip-june2013 | 3 + src/config/geoip |106050 +++++------------------------------------------- 2 files changed, 9168 insertions(+), 96885 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'karsten/geoip-manual-update-jun2013'
by nickm＠torproject.org 05 Jun '13

05 Jun '13

commit bcdc0022693c75ea1523468e783bf03832e0a358 Merge: 7159e19 9b233ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 5 11:22:48 2013 -0400 Merge remote-tracking branch 'karsten/geoip-manual-update-jun2013' src/config/geoip-manual | 53 ----------------------------------------------- 1 file changed, 53 deletions(-)

1 0

[tor/master] Remove 9 now unused manual A1 substitutions.
by nickm＠torproject.org 05 Jun '13

05 Jun '13

commit 9b233acd03706e9c0274db47be33cd27603847cf Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jun 5 08:40:39 2013 +0200 Remove 9 now unused manual A1 substitutions. --- src/config/geoip-manual | 53 ----------------------------------------------- 1 file changed, 53 deletions(-) diff --git a/src/config/geoip-manual b/src/config/geoip-manual index 6dfac26..1b39251 100644 --- a/src/config/geoip-manual +++ b/src/config/geoip-manual @@ -3,15 +3,6 @@ # directory to process this file when producing a new geoip file. See # README.geoip in the same directory for details. -# IN, though could as well be UA. Previous MaxMind entry -# 5.56.23.0-5.56.23.127 is IN, next MaxMind entry 5.56.24.0-5.56.31.255 is -# UA, and RIR delegation files say the entire block -# 5.56.16.0-5.56.23.255 is DE. -KL 2013-04-08 -# Changed to DE, because range has changed, next MaxMind entry -# 5.56.23.192-5.56.23.255 is DE, and RIR delegation files say the entire -# block 5.56.16.0-5.56.23.255 is DE. -KL 2013-05-13 -"5.56.23.128","5.56.23.191","87562112","87562175","DE","Germany" - # GB, because previous MaxMind entry 31.6.16.0-31.6.25.255 is GB, and RIR # delegation files say entire range 31.6.0.0-31.6.63.255 is GB. # -KL 2013-03-07 @@ -59,19 +50,10 @@ # -KL 2013-03-07 "64.185.237.110","64.185.237.110","1085926766","1085926766","","" -# US, though could as well be UY. Previous MaxMind entry -# 67.15.170.0-67.15.182.255 is US, next MaxMind entry -# 67.15.183.128-67.15.183.159 is UY, and RIR delegation files say the -# entire block 67.15.0.0-67.15.255.255 is US. -KL 2012-11-27 -"67.15.183.0","67.15.183.127","1125103360","1125103487","US","United States" - # US, because next MaxMind entry 67.43.145.0-67.43.155.255 is US, and RIR # delegation files say 67.43.144.0-67.43.159.255 is US. # -KL 2012-11-27 "67.43.144.0","67.43.144.255","1126928384","1126928639","US","United States" -# US, because previous MaxMind entry 68.68.101.232-68.68.102.71 is US, and -# RIR delegation files say 68.68.64.0-68.68.79.255 is US. -KL 2013-05-13 -"68.68.102.72","68.68.102.79","1145333320","1145333327","US","United States" # US, because previous MaxMind entry 70.159.21.51-70.232.244.255 is US, # because next MaxMind entry 70.232.245.58-70.232.245.59 is A2 ("Satellite @@ -87,11 +69,6 @@ # US. -KL 2012-11-27 "70.232.245.60","70.232.245.255","1189672252","1189672447","US","United States" -# GB, because next MaxMind entry 77.242.197.0-77.242.197.255 is GB, and -# RIR delegation files say entire range 77.242.192.0-77.242.207.255 is GB. -# -KL 2013-03-07 -"77.242.196.0","77.242.196.255","1307755520","1307755775","GB","United Kingdom" - # SE, because previous MaxMind entry 80.67.11.200-80.67.13.255 is SE, and # RIR delegation files say entire range 80.67.0.0-80.67.15.255 is SE. # -KL 2013-03-07 @@ -123,13 +100,6 @@ # -KL 2012-11-27 "91.238.214.0","91.238.215.255","1542379008","1542379519","GB","United Kingdom" -# FR, because RIR delegation files say 176.31.0.0-176.31.255.255 is FR, -# even though neither previous nor next MaxMind range is FR. This may be -# wrong, but we don't have any better information to say this range is ES -# (previous range) or IT (next range), so sticking with RIR's FR. -# -KL 2013-03-07 -"176.31.59.140","176.31.59.143","2954836876","2954836879","FR","France" - # NL, because next MaxMind entry 176.56.173.0-176.56.173.63 is NL, and RIR # delegation files say 176.56.160.0-176.56.191.255 is NL. -KL 2013-05-13 "176.56.172.0","176.56.172.255","2956504064","2956504319","NL","Netherlands" @@ -148,23 +118,12 @@ # -KL 2012-11-27 "176.67.86.0","176.67.87.255","2957202944","2957203455","US","United States" -# FR, because next MaxMind entry 178.33.213.216-178.33.213.223 is FR, and -# RIR delegation files say entire range 178.32.0.0-178.33.255.255 is FR. -# -KL 2013-03-07 -"178.33.213.212","178.33.213.215","2988561876","2988561879","FR","France" - # GB, because RIR delegation files say exactly this range # 185.25.84.0-185.25.87.255 is GB, even though neither previous nor next # MaxMind range is GB. Both previous and next MaxMind ranges match RIR # delegation files, too. -KL 2013-05-13 "185.25.84.0","185.25.87.255","3105444864","3105445887","GB","United Kingdom" -# GB, because RIR delegation files say exactly this range -# 193.104.113.0-193.104.113.255 is GB, even though neither previous nor -# next MaxMind range is GB. Both previous and next MaxMind ranges match -# RIR delegation files, too. -KL 2013-03-07 -"193.104.113.0","193.104.113.255","3244847360","3244847615","GB","United Kingdom" - # EU, despite neither previous (RU) nor next (UA) MaxMind entry being EU, # but because RIR delegation files agree with both previous and next # MaxMind entry and say EU for 193.200.150.0-193.200.150.255. @@ -181,11 +140,6 @@ # 199.101.192.0-199.101.199.255 which is US. -KL 2013-05-13 "199.101.192.0","199.101.192.255","3345334272","3345334527","US","United States" -# AU, because previous MaxMind entry 203.98.64.0-203.98.94.255 is AU, and -# RIR delegation files say 203.98.82.0-203.98.95.255 is AU. -# -KL 2013-05-13 -"203.98.95.0","203.98.95.255","3412221696","3412221951","AU","Australia" - # US, because next MaxMind entry 204.12.162.0-204.12.197.119 is US, and # RIR delegation files say 204.12.160.0-204.12.191.255 is US. # -KL 2013-05-13 @@ -196,13 +150,6 @@ # -KL 2012-11-27 "209.59.32.0","209.59.63.255","3510312960","3510321151","US","United States" -# GB, because RIR delegation files say 212.118.224.0-212.118.255.255 is -# GB, even though neither previous nor next MaxMind range is GB. This may -# be wrong, but we don't have any better information to say this range is -# CH (previous range) or US (next range), so sticking with RIR's GB. -# -KL 2013-03-07 -"212.118.232.0","212.118.232.255","3564562432","3564562687","GB","United Kingdom" - # EU, despite neither previous (RU) nor next (SE) MaxMind entry being EU, # but because RIR delegation files agree with previous MaxMind entry and # say EU for 217.15.160.0-217.15.175.255. -KL 2013-05-13

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
by nickm＠torproject.org 05 Jun '13

05 Jun '13

commit fe689de084116bd54eb3f90baba4620eef5d1001 Merge: 78735f8 d347531 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 5 11:22:02 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/geoip-june2013 | 3 + src/config/geoip |106050 +++++------------------------------------------- 2 files changed, 9168 insertions(+), 96885 deletions(-)

1 0