December 2015 - tor-commits - lists.torproject.org

[tor/maint-0.2.7] Merge branch 'bug17772_024' into maint-0.2.4
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit 35deb4d442da38d7dcfb235665da50f3a4f7c293 Merge: b0867fe 5138f5c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 10:18:31 2015 -0500 Merge branch 'bug17772_024' into maint-0.2.4 changes/bug17772 | 7 +++++++ src/or/routerlist.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.7] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit c3d11b119dbd46fa02a1e26d76ddc74424dd4b18 Merge: 4328525 35deb4d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 10:20:14 2015 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug17772 | 7 +++++++ src/or/routerlist.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.7] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit 1adc2bf66fedb1768c5013dcf5f4778fae453217 Merge: b53ff86 c3d11b1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 10:20:21 2015 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug17772 | 7 +++++++ src/or/routerlist.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit c6a337557ae5c73e8dc8208b18f902e9eeb21404 Merge: eeb9751 1adc2bf Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 10:23:41 2015 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug17772 | 7 +++++++ src/or/routerlist.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --cc src/or/routerlist.c index 03729bd,af8e68e..79a5bb3 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@@ -1501,8 -1498,17 +1501,14 @@@ router_pick_directory_server_impl(dirin if ((type & EXTRAINFO_DIRINFO) && !router_supports_extrainfo(node->identity, is_trusted_extrainfo)) continue; - if (for_guard && node->using_as_guard) - continue; /* Don't make the same node a guard twice. */ - if ((type & MICRODESC_DIRINFO) && !is_trusted && - !node->rs->version_supports_microdesc_cache) - continue; + /* Don't make the same node a guard twice */ + if (for_guard && node->using_as_guard) { + continue; + } + /* Ensure that a directory guard is actually a guard node. */ + if (for_guard && !node->is_possible_guard) { + continue; + } if (try_excluding && routerset_contains_routerstatus(options->ExcludeNodes, status, country)) {

1 0

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 08 Dec '15

08 Dec '15

commit 8574c1482f530ecb33d1868d65b51825e93d4aab Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 8 15:16:10 2015 +0000 Update translations for torbutton-abouttorproperties_completed --- da/abouttor.properties | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/da/abouttor.properties b/da/abouttor.properties index 761a953..610f8cd 100644 --- a/da/abouttor.properties +++ b/da/abouttor.properties @@ -19,3 +19,15 @@ aboutTor.searchDC.privacy=Søg <a href="%1$S">sikkert</a> med <a href="%2$S">Dis aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ + +aboutTor.donationBanner.lp.who=— Laura Poitras +aboutTor.donationBanner.lp.quote=Edward Snowden ville ikke have haft mulighed for at kontakte mig uden brug af Tor og andre gratis krypterings software projekter. Tor er et essentielt værktøj og det behøver vores støtte. +aboutTor.donationBanner.lp.speciality=Oscar-vindende Dokumentar Filmskaber, CitizenFour + +aboutTor.donationBanner.cd.who=— Cory Doctorow +aboutTor.donationBanner.cd.quote=Privatliv og anonymitet er vigtigt for os alle sammen. +aboutTor.donationBanner.cd.speciality= Forfatter, teknologi aktivist, med-redaktør af Boing Boing + +aboutTor.donationBanner.rd.who=— Roger Dingledine +aboutTor.donationBanner.rd.quote=Venligst hjælp det stærkest privatlivs værktøj i verden, med at blive mere levedygtigt! +aboutTor.donationBanner.rd.speciality=Grundlægger, Aktiv fungerende leder af Tor Projektet

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 08 Dec '15

08 Dec '15

commit 442c8bc65c1ef4d6efc41625617234e3dad859e6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 8 15:16:07 2015 +0000 Update translations for torbutton-abouttorproperties --- da/abouttor.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/da/abouttor.properties b/da/abouttor.properties index 20ed939..610f8cd 100644 --- a/da/abouttor.properties +++ b/da/abouttor.properties @@ -21,13 +21,13 @@ aboutTor.searchDC.privacy.link=https://disconnect.me/privacy aboutTor.searchDC.search.link=https://search.disconnect.me/ aboutTor.donationBanner.lp.who=— Laura Poitras -aboutTor.donationBanner.lp.quote=Edward Snowden would not have been able to contact me without Tor and other free software encryption projects. Tor is an essential tool, and it needs our support. -aboutTor.donationBanner.lp.speciality=Oscar-Winning Documentary Filmmaker, CitizenFour +aboutTor.donationBanner.lp.quote=Edward Snowden ville ikke have haft mulighed for at kontakte mig uden brug af Tor og andre gratis krypterings software projekter. Tor er et essentielt værktøj og det behøver vores støtte. +aboutTor.donationBanner.lp.speciality=Oscar-vindende Dokumentar Filmskaber, CitizenFour aboutTor.donationBanner.cd.who=— Cory Doctorow -aboutTor.donationBanner.cd.quote=Privacy and anonymity matter to all of us. -aboutTor.donationBanner.cd.speciality= Novelist, technology activist, co-editor of Boing Boing +aboutTor.donationBanner.cd.quote=Privatliv og anonymitet er vigtigt for os alle sammen. +aboutTor.donationBanner.cd.speciality= Forfatter, teknologi aktivist, med-redaktør af Boing Boing aboutTor.donationBanner.rd.who=— Roger Dingledine -aboutTor.donationBanner.rd.quote=Please help the strongest privacy tool in the world become more sustainable! -aboutTor.donationBanner.rd.speciality=Founder, Acting Executive Director of the Tor Project +aboutTor.donationBanner.rd.quote=Venligst hjælp det stærkest privatlivs værktøj i verden, med at blive mere levedygtigt! +aboutTor.donationBanner.rd.speciality=Grundlægger, Aktiv fungerende leder af Tor Projektet

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 08 Dec '15

08 Dec '15

commit 0b76ec0bfc42b881d83e51d637240e8209feb581 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 8 15:15:46 2015 +0000 Update translations for abouttor-homepage_completed --- da/aboutTor.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/da/aboutTor.dtd b/da/aboutTor.dtd index 809b405..c0d5cfa 100644 --- a/da/aboutTor.dtd +++ b/da/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "Om Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "Denne browser er udløbet."> +<!ENTITY aboutTor.outOfDateTorOn.label "ADVARSEL: denne browser er forældet."> <!ENTITY aboutTor.outOfDateTorOff.label "Denne browser er udløbet."> <!ENTITY aboutTor.outOfDate2.label "Klik på løget og vælg så Check for Tor Browser Update."> <!ENTITY aboutTor.check.label "Test Tor Netværk Inddstillingerne."> -<!ENTITY aboutTor.success.label "TIllykke!"> -<!ENTITY aboutTor.success2.label "Denne browser er konfigureret til at bruge Tor."> +<!ENTITY aboutTor.success.label "Velkommen til Tor Browseren"> +<!ENTITY aboutTor.success2.label "Forbind til Tor netværket."> <!ENTITY aboutTor.success3.label "Du kan nu browse Internettet anonymt"> <!ENTITY aboutTor.failure.label "Noget gik galt!"> <!ENTITY aboutTor.failure2.label "Tor virker ikke i denne browser.">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 08 Dec '15

08 Dec '15

commit 5c058544e05e99774dbde69c7c967d439a738990 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 8 15:15:41 2015 +0000 Update translations for abouttor-homepage --- da/aboutTor.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/da/aboutTor.dtd b/da/aboutTor.dtd index f10e7f3..c0d5cfa 100644 --- a/da/aboutTor.dtd +++ b/da/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "Om Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "ADVARSEL: denne browser er forældet."> <!ENTITY aboutTor.outOfDateTorOff.label "Denne browser er udløbet."> <!ENTITY aboutTor.outOfDate2.label "Klik på løget og vælg så Check for Tor Browser Update."> <!ENTITY aboutTor.check.label "Test Tor Netværk Inddstillingerne."> -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> +<!ENTITY aboutTor.success.label "Velkommen til Tor Browseren"> +<!ENTITY aboutTor.success2.label "Forbind til Tor netværket."> <!ENTITY aboutTor.success3.label "Du kan nu browse Internettet anonymt"> <!ENTITY aboutTor.failure.label "Noget gik galt!"> <!ENTITY aboutTor.failure2.label "Tor virker ikke i denne browser.">

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 08 Dec '15

08 Dec '15

commit 540b61c6d13d860e3e67d9295e5d9cf5b5720dcb Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 8 14:45:54 2015 +0000 Update translations for abouttor-homepage_completed --- fr_CA/aboutTor.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr_CA/aboutTor.dtd b/fr_CA/aboutTor.dtd index ecb212c..6fd1ab0 100644 --- a/fr_CA/aboutTor.dtd +++ b/fr_CA/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "À propos de Tor "> -<!ENTITY aboutTor.outOfDateTorOn.label "CEPENDANT, ce navigateur n'est pas à jour."> +<!ENTITY aboutTor.outOfDateTorOn.label "AVERTISSEMENT : ce navigateur n'est pas à jour."> <!ENTITY aboutTor.outOfDateTorOff.label "DE PLUS, ce navigateur n'est pas à jour."> <!ENTITY aboutTor.outOfDate2.label "Cliquer sur l'oignon, puis choisir Vérifier les màj. du navigateur Tor."> <!ENTITY aboutTor.check.label "Tester les paramètres du réseau Tor"> -<!ENTITY aboutTor.success.label "Félicitations!"> -<!ENTITY aboutTor.success2.label "Ce navigateur est configuré pour utiliser Tor."> +<!ENTITY aboutTor.success.label "Bienvenue dans le navigateur Tor"> +<!ENTITY aboutTor.success2.label "Connecté au réseau Tor."> <!ENTITY aboutTor.success3.label "Vous êtes maintenant libre de naviguer sur Internet anonymement."> <!ENTITY aboutTor.failure.label "Une erreur s'est produite!"> <!ENTITY aboutTor.failure2.label "Tor ne fonctionne pas dans ce navigateur.">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 08 Dec '15

08 Dec '15

commit ab784ac16baf6ea8e2ce561664a7d7263dbf2815 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 8 14:45:46 2015 +0000 Update translations for abouttor-homepage --- fr_CA/aboutTor.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr_CA/aboutTor.dtd b/fr_CA/aboutTor.dtd index d7b4639..6fd1ab0 100644 --- a/fr_CA/aboutTor.dtd +++ b/fr_CA/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "À propos de Tor "> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "AVERTISSEMENT : ce navigateur n'est pas à jour."> <!ENTITY aboutTor.outOfDateTorOff.label "DE PLUS, ce navigateur n'est pas à jour."> <!ENTITY aboutTor.outOfDate2.label "Cliquer sur l'oignon, puis choisir Vérifier les màj. du navigateur Tor."> <!ENTITY aboutTor.check.label "Tester les paramètres du réseau Tor"> -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> +<!ENTITY aboutTor.success.label "Bienvenue dans le navigateur Tor"> +<!ENTITY aboutTor.success2.label "Connecté au réseau Tor."> <!ENTITY aboutTor.success3.label "Vous êtes maintenant libre de naviguer sur Internet anonymement."> <!ENTITY aboutTor.failure.label "Une erreur s'est produite!"> <!ENTITY aboutTor.failure2.label "Tor ne fonctionne pas dans ce navigateur.">

1 0