September 2019 - tor-commits - lists.torproject.org

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 16 Sep '19

16 Sep '19

commit 1ec90b061bf30cdf9075d4bd31ef33c9a751bf37 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 16 15:15:05 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- ja/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/aboutTor.dtd b/ja/aboutTor.dtd index f4bc37731..b657853f3 100644 --- a/ja/aboutTor.dtd +++ b/ja/aboutTor.dtd @@ -22,7 +22,7 @@ <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> <!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser マニュアル"> -<!ENTITY aboutTor.tor_mission.label "Torプロジェクトはフリーオープンソース匿名性やプライバシーソフトウェアの開発と展開によって人権や自由の向上に尽力するUS 501(c)(3)非営利団体である。ソフトウェアへの無制限アクセスと利用をサポート、そしてその科学的と国民の理解を深めたいと思います。"> +<!ENTITY aboutTor.tor_mission.label "Tor Project はフリー・オープンソースの匿名性技術・プライバシー技術の開発と展開によって人権と自由を向上し、その制限されない有効性と利用を支援し、また、人々の正確な理解を促進している US 501(c)(3) 非営利団体です。"> <!ENTITY aboutTor.getInvolved.label "参加しよう »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en">

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 16 Sep '19

16 Sep '19

commit 0c277b34e5da0fc49fe9fea330014cf82115ad4d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 16 14:52:37 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- ja/network-settings.dtd | 2 +- ml/network-settings.dtd | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ja/network-settings.dtd b/ja/network-settings.dtd index 1107994be..40b8739dd 100644 --- a/ja/network-settings.dtd +++ b/ja/network-settings.dtd @@ -29,7 +29,7 @@ <!ENTITY torsettings.useProxy.type "ãããã·ã®çš®é¡:"> <!ENTITY torsettings.useProxy.type.placeholder "ãããã·ã®çš®é¡ãéžæ"> <!ENTITY torsettings.useProxy.address "ã¢ãã¬ã¹:"> -<!ENTITY torsettings.useProxy.address.placeholder "IPã¢ãã¬ã¹ãŸãã¯ãã¹ãå"> +<!ENTITY torsettings.useProxy.address.placeholder "IP ã¢ãã¬ã¹ãŸãã¯ãã¹ãå"> <!ENTITY torsettings.useProxy.port "ããŒã"> <!ENTITY torsettings.useProxy.username "ãŠãŒã¶ãŒå:"> <!ENTITY torsettings.useProxy.password "ãã¹ã¯ãŒã:"> diff --git a/ml/network-settings.dtd b/ml/network-settings.dtd index 7c700be7f..93f3e79ff 100644 --- a/ml/network-settings.dtd +++ b/ml/network-settings.dtd @@ -52,11 +52,11 @@ <!ENTITY torsettings.copyLog "àŽàµàµŒ àŽµàŽ¿àŽµàŽ°àŽªàµàŽªàŽàµàŽàŽ¿àŽ àŽàµàŽ³àŽ¿àŽªàµ àŽ¬àµàµŒàŽ¡àŽ¿àŽ²àµàŽàµàŽàµ àŽàµàµŒàŽàµàŽàµàŽ "> <!ENTITY torsettings.proxyHelpTitle "àŽªàµàŽ°àµàŽàµàŽžàŽ¿ àŽžàŽ¹àŽŸàŽ¯àŽ "> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> +<!ENTITY torsettings.proxyHelp1 "àŽàŽ®àµàŽªàŽšàŽ¿ , àŽžàµâàŽàµàµŸ àŽàŽ²àµàŽ²àµàŽàµàŽàŽ¿àµœ àŽ¯àµàŽ£àŽ¿àŽµàµàŽŽàµàŽžàŽ¿àŽ±àµàŽ±àŽ¿ àŽàŽšàµàŽšàŽ¿àŽµàŽ¿àŽàŽàµàŽàŽ³àŽ¿àµœ àŽšàŽ¿àŽšàµàŽšàµàŽ àŽ±àµàŽ±àµàŽ±àŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽ¿àŽªàµàŽªàŽ¿àŽàµàŽàµàŽ®àµàŽªàµàµŸ àŽàŽ°àµ àŽªàµàŽ°àµàŽàµàŽžàŽ¿ àŽàŽµàŽ¶àµàŽ¯àŽ®àŽŸàŽ¯àŽ¿ àŽµàŽ°àµàŽ &#160 , àŽàŽ°àµ àŽªàµàŽ°àµàŽàµàŽžàŽ¿ àŽàŽµàŽžàŽŸàŽ¯àŽ®àŽŸàŽ£àµ àŽàŽ²àµàŽ²àŽ¯àµ àŽàŽšàµàŽšàµ àŽšàŽ¿àŽàµàŽàµŸàŽàµ àŽàŽ±àŽ¿àŽ¯àŽ¿àŽ²àµàŽ²àµàŽàµàŽàŽ¿àµœ , àŽšàŽ¿àŽàµàŽàŽ³àµàŽàµ àŽàŽšàµàŽ±àµŒàŽšàµàŽ±àµàŽ±àµ àŽžàµàŽ±àµàŽ±àŽ¿àŽàµàŽžàŽ¿àŽ²àµ àŽàŽ²àµàŽ²àµàŽàµàŽàŽ¿àµœ àŽ®àŽ±àµàŽ±àµàŽ°àµ àŽ¬àµàŽ°àµàŽžàµàŽ°àŽ¿àŽ²àµ àŽàŽ€àµàŽ àŽàŽ²àµàŽ²àµàŽàµàŽàŽ¿àµœ àŽšàŽ¿àŽàµàŽàŽ³àµàŽàµ àŽžàŽ¿àŽžàµàŽ±àµàŽ±àŽ€àµàŽ€àŽ¿àŽšàµàŽ±àµ àŽšàµàŽ±àµàŽ±àµâàŽµàµŒàŽàµàŽàµ àŽžàµàŽ±àµàŽ±àŽ¿àŽàµàŽžàŽ¿àŽ²àµ àŽšàµàŽàµàŽàµàŽ "> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelpTitle "àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµ àŽ±àŽ¿àŽ²àµ àŽžàŽ¹àŽŸàŽ¯àŽ "> +<!ENTITY torsettings.bridgeHelp1 "àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµàŽàµŸ àŽàŽšàµàŽšàµ àŽªàŽ±àŽ¯àµàŽšàµàŽšàŽ€àµ àŽµàŽ¿àŽµàŽ°àŽªàµàŽªàŽàµàŽàŽ¿àŽàŽ¯àŽ¿àµœ àŽàµàµŒàŽàµàŽàŽªàµàŽàŽŸàŽ€àµàŽ€ àŽ±àµàŽ²àŽ¯àµàŽàŽ³àŽŸàŽ£àµ àŽàŽ€àµ àŽ±àµàŽ±àµàŽ±àŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽšàµàŽšàŽ€àµ àŽ€àŽàŽžàµàŽžàŽªàµàŽªàµàŽàµàŽ€àµàŽ€àµàŽšàµàŽšàŽ€àŽ¿àŽšàµ àŽàµàŽàµàŽ€àµœ àŽŠàµàŽ·àµàŽàŽ°àŽ®àŽŸàŽàµàŽàµàŽšàµàŽšàµ &#160. àŽàŽ°àµ àŽ¬àµàŽ°àŽ¿àŽ¡àµâàŽàµàŽ àŽžàµàŽšàµàŽžàŽ°àµàŽ·àŽ¿àŽªàµ àŽ€àŽàŽ¯àµàŽšàµàŽšàŽ€àŽ¿àŽšàµ àŽµàµàŽ£àµàŽàŽ¿ àŽµàµàŽ¯àŽ€àµàŽ¯àŽžàµàŽ€àŽ®àŽŸàŽ¯ àŽ°àµàŽ€àŽ¿àŽàµŸ àŽàŽªàŽ¯àµàŽàŽ¿àŽàµàŽàµàŽšàµàŽšàµ &#160. obfs àŽšàŽ¿àŽàµàŽàŽ³àµàŽàµ àŽªàµàŽàµàŽàµàŽµàŽ°àŽµàŽ¿àŽšàµ àŽàŽàµàŽàµàŽàŽ¿àŽ²àµàŽ²àŽŸàŽ€àµàŽ€ àŽ°àµàŽ€àŽ¿àŽ¯àŽ¿àŽ²àµàŽ àŽ®àµàŽàµ àŽªàµàŽ²àµàŽ³àµàŽ³àŽ€àµ àŽžàµàŽ°àŽ¿àŽàµàŽàµàŽ àŽ±àµàŽ±àµàŽ±àŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽ€àµàŽ€àµàŽšàµ àŽš àŽ°àµàŽ€àŽ¿àŽ¯àŽ¿àµœ àŽ€àŽšàµàŽšàµàŽ¯àµàŽ àŽªàµàŽ°àµàŽµàŽ°àµàŽ€àŽ¿àŽàµàŽàµàŽšàµàŽšàµ "> +<!ENTITY torsettings.bridgeHelp2 "àŽ°àŽŸàŽàµàŽ¯àŽàµàŽàµŸ àŽàŽ€àµàŽàµàŽàµ àŽ°àµàŽ€àŽ¿àŽ¯àŽ¿àŽ²àµàŽ àŽàµàŽ±àŽ¿àŽšàµ àŽ€àŽàŽ¯àŽŸàµ» àŽ¶àµàŽ°àµàŽ®àŽ¿àŽàµàŽàŽŸàŽ²àµàŽ , àŽªàµàŽ°àŽ€àµàŽ¯àµàŽàŽ àŽ¬àµàŽ°àŽ¿àŽ¡àµàŽàµàŽàµŸ àŽªàµàŽ°àŽ€àµàŽ¯àµàŽàŽ àŽ°àŽŸàŽàµàŽ¯àŽàµàŽàµŸ àŽªàµàŽ°àµàŽµàŽ°àµàŽ€àŽ¿àŽàµàŽàµàŽšàµàŽšàµàŽ£àµàŽàµ &#160. àŽšàŽ¿àŽàµàŽàŽ³àµàŽàµ àŽ°àŽŸàŽàµàŽ¯àŽ€àµàŽ€àµ àŽàŽ€àµàŽàµàŽàµ àŽ¬àµàŽ°àŽ¿àŽ¡àµâàŽàµàŽàŽ³àŽŸàŽ£àµ àŽªàµàŽ°àµàŽµàŽ°àµàŽ€àŽ¿àŽàµàŽàµàŽšàµàŽšàŽ€àµ àŽàŽšàµàŽšàµ àŽšàŽ¿àŽàµàŽàµŸàŽàµàŽàµ àŽàŽ±àŽªàµàŽªàŽ¿àŽ²àµàŽ²àµàŽàµàŽàŽ¿àµœ torproject.org/about/contact.html#support àŽàŽŸàŽ£àµàŽ ">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "àŽ±àµàŽ±àµàŽ±àŽ¿àŽ²àµàŽàµàŽàµ àŽ¬àŽšàµàŽ§àŽªàµàŽªàµàŽàµàŽ€àµàŽ€àµàŽšàµàŽšàŽ€àµ àŽµàŽ°àµ àŽŠàŽ¯àŽµàŽŸàŽ¯àŽ¿ àŽàµàŽ·àµàŽ®àŽ¿àŽàµàŽàµàŽ &#160. àŽàŽ€àµ àŽšàŽ¿àŽ°àŽµàŽ§àŽ¿ àŽžàŽ®àŽ¯àŽ àŽàŽàµàŽàµàŽàµàŽ ">

1 0

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 16 Sep '19

16 Sep '19

commit 051ef950479a9f0eaf6c61da33ea4d6cb5aecc0c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 16 14:51:06 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- ml/torbutton.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ml/torbutton.properties b/ml/torbutton.properties index 8591898fa..c1113dc28 100644 --- a/ml/torbutton.properties +++ b/ml/torbutton.properties @@ -1,20 +1,20 @@ torbutton.circuit_display.internet = ഇന്റര്‍നെറ്റ് torbutton.circuit_display.ip_unknown = അജ്ഞാതമായ ഐ.പി -torbutton.circuit_display.onion_site = Onion site +torbutton.circuit_display.onion_site = ഒണിയൻ സൈറ്റ് . torbutton.circuit_display.this_browser = ഈ ബ്രൗസർ torbutton.circuit_display.relay = റിലേ -torbutton.circuit_display.tor_bridge = Bridge -torbutton.circuit_display.unknown_country = Unknown country -torbutton.circuit_display.guard = Guard -torbutton.circuit_display.guard_note = Your [Guard] node may not change. +torbutton.circuit_display.tor_bridge = ബ്രിഡ്ജ് +torbutton.circuit_display.unknown_country = അപരിചിതമായ രാജ്യം +torbutton.circuit_display.guard = സൂക്ഷിക്കുന്ന ആൾ +torbutton.circuit_display.guard_note = നിങ്ങളുടെ [സൂക്ഷിക്കുന്ന ആൾ] ചിലപ്പോൾ മാറ്റം വന്നിട്ടുണ്ടാകില്ല torbutton.circuit_display.learn_more = കൂടുതൽ അറിയാൻ -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.content_sizer.margin_tooltip = ടോർ ബ്രൌസർ ഈ മാർജിൻ കൂട്ടിച്ചേർത്തു നിങ്ങളുടെ ബ്രൗസെറിന്റെ ഉയരവും വീതിയും വ്യത്യസ്തമായ ഒരു രൂപം തോന്നാതെ സൂക്ഷിക്കുന്നു , അത് മറ്റുള്ള ആളുകൾ നിങ്ങളെ ഓൺലൈനിൽ പിന്തുടരുന്നത് ഒഴിവാക്കുന്നു torbutton.panel.tooltip.disabled = Click to enable Tor torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.external.title = Download an external file type? +torbutton.popup.external.title = പുറമെ നിന്നുള്ള ഒരു ഫയൽ ടൈപ്പ് ഡൌൺലോഡ് ചെയ്യുക torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n

1 0

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 16 Sep '19

16 Sep '19

commit 8e4b61406d80500a12aabb3e1bbcea3989f9ced6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 16 14:45:05 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- ja/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ja/aboutTor.dtd b/ja/aboutTor.dtd index 9ed3c9913..f4bc37731 100644 --- a/ja/aboutTor.dtd +++ b/ja/aboutTor.dtd @@ -26,7 +26,7 @@ <!ENTITY aboutTor.getInvolved.label "参加しよう »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Torからの最新ニュースを受信トレイに。"> -<!ENTITY aboutTor.newsletter.link_text "Torニュースに申し込む。"> +<!ENTITY aboutTor.newsletter.tagline "Tor からの最新ニュースを受信トレイに。"> +<!ENTITY aboutTor.newsletter.link_text "Tor ニュースに申し込む。"> <!ENTITY aboutTor.donationBanner.line2e "Tor を強く保つ。"> <!ENTITY aboutTor.donationBanner.buttonA "今すぐ寄付">

1 0

[metrics-web/master] Update to latest metrics-lib.
by karsten＠torproject.org 16 Sep '19

16 Sep '19

commit 37190035e688cc0a313bb06e10324c8fc609a0b6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Sep 16 16:39:37 2019 +0200 Update to latest metrics-lib. --- src/submods/metrics-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/submods/metrics-lib b/src/submods/metrics-lib index 53b16d1..7e396f0 160000 --- a/src/submods/metrics-lib +++ b/src/submods/metrics-lib @@ -1 +1 @@ -Subproject commit 53b16d192da4a7fa5c1987a89a60257061602882 +Subproject commit 7e396f01ef6de4cb3cd7e2b7fc977b4af7b97e7f

1 0

[metrics-web/master] Fix two issues found using metrics-test.
by karsten＠torproject.org 16 Sep '19

16 Sep '19

commit 5d98d4806e01169f226bace3fc095298844d4427 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Sep 16 16:29:10 2019 +0200 Fix two issues found using metrics-test. - Make unit test locale-independent, similar to Onionoo's 860228c. - Replace deprecated method Class.newInstance(). --- .../java/org/torproject/metrics/stats/hidserv/Aggregator.java | 5 +++-- .../metrics/stats/hidserv/ComputedNetworkFractions.java | 5 +++-- .../org/torproject/metrics/stats/hidserv/DocumentStore.java | 6 ++++-- .../metrics/stats/hidserv/ExtrapolatedHidServStats.java | 10 ++++++---- .../java/org/torproject/metrics/stats/hidserv/Simulate.java | 9 +++++---- 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java b/src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java index 36e7967..12a89a3 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java @@ -13,6 +13,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Comparator; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.SortedMap; @@ -176,8 +177,8 @@ public class Aggregator { /* Put together all aggregated values in a single line. */ String date = e.getKey(); int numStats = weightedValues.size(); - sb.append(String.format("%s,%s,%.0f,%.0f,%.0f,%.8f,%d%n", date, - type, weightedMean, weightedMedian, weightedInterquartileMean, + sb.append(String.format(Locale.US, "%s,%s,%.0f,%.0f,%.0f,%.8f,%d%n", + date, type, weightedMean, weightedMedian, weightedInterquartileMean, sumFraction, numStats)); } } diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/ComputedNetworkFractions.java b/src/main/java/org/torproject/metrics/stats/hidserv/ComputedNetworkFractions.java index d5fd279..835ac6f 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/ComputedNetworkFractions.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/ComputedNetworkFractions.java @@ -8,6 +8,7 @@ import org.slf4j.LoggerFactory; import java.util.Collections; import java.util.HashMap; +import java.util.Locale; import java.util.Map; /** Computed fraction of hidden-service activity that a single relay is @@ -116,9 +117,9 @@ public class ComputedNetworkFractions implements Document { validAfterDate); String second = validAfterHour + (this.fractionRendRelayedCells == 0.0 ? "," - : String.format(",%f", this.fractionRendRelayedCells)) + : String.format(Locale.US, ",%f", this.fractionRendRelayedCells)) + (this.fractionDirOnionsSeen == 0.0 ? "," - : String.format(",%f", this.fractionDirOnionsSeen)); + : String.format(Locale.US, ",%f", this.fractionDirOnionsSeen)); return new String[] { first, second }; } diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java b/src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java index f3163e1..9061aa3 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java @@ -13,6 +13,7 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.LineNumberReader; +import java.lang.reflect.InvocationTargetException; import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -136,7 +137,7 @@ public class DocumentStore<T extends Document> { && !formattedString0.startsWith(prefix)) { /* Skip line not starting with prefix. */ } else { - T document = this.clazz.newInstance(); + T document = this.clazz.getDeclaredConstructor().newInstance(); if (!document.parse(new String[] { formattedString0, line.substring(1) })) { log.warn("Unable to read line {} from {}. Not retrieving any " @@ -151,7 +152,8 @@ public class DocumentStore<T extends Document> { log.warn("Unable to read {}. Not retrieving any previously stored " + "documents.", documentFile.getAbsolutePath(), e); return null; - } catch (InstantiationException | IllegalAccessException e) { + } catch (InstantiationException | IllegalAccessException + | NoSuchMethodException | InvocationTargetException e) { log.warn("Unable to read {}. Cannot instantiate document object.", documentFile.getAbsolutePath(), e); return null; diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/ExtrapolatedHidServStats.java b/src/main/java/org/torproject/metrics/stats/hidserv/ExtrapolatedHidServStats.java index ec09630..eb66c7a 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/ExtrapolatedHidServStats.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/ExtrapolatedHidServStats.java @@ -6,6 +6,8 @@ package org.torproject.metrics.stats.hidserv; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Locale; + /** Extrapolated network totals of hidden-service statistics reported by a * single relay. Extrapolated values are based on reported statistics and * computed network fractions in the statistics interval. */ @@ -116,11 +118,11 @@ public class ExtrapolatedHidServStats implements Document { DateTimeHelper.ISO_DATE_FORMAT); String second = this.fingerprint + (this.fractionRendRelayedCells == 0.0 ? ",," - : String.format(",%.0f,%f", this.extrapolatedRendRelayedCells, - this.fractionRendRelayedCells)) + : String.format(Locale.US, ",%.0f,%f", + this.extrapolatedRendRelayedCells, this.fractionRendRelayedCells)) + (this.fractionDirOnionsSeen == 0.0 ? ",," - : String.format(",%.0f,%f", this.extrapolatedDirOnionsSeen, - this.fractionDirOnionsSeen)); + : String.format(Locale.US, ",%.0f,%f", + this.extrapolatedDirOnionsSeen, this.fractionDirOnionsSeen)); return new String[] { first, second }; } diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/Simulate.java b/src/main/java/org/torproject/metrics/stats/hidserv/Simulate.java index ac8a82e..445d931 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/Simulate.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/Simulate.java @@ -13,6 +13,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Random; import java.util.SortedMap; @@ -196,8 +197,8 @@ public class Simulate { totalInterquartileProbability += extrapolation[2]; } } - sb.append(String.format("%d,%.2f,%.0f,%.0f,%.0f%n", run, fraction, - totalValues / totalProbability, weightedMedian, + sb.append(String.format(Locale.US, "%d,%.2f,%.0f,%.0f,%.0f%n", run, + fraction, totalValues / totalProbability, weightedMedian, totalInterquartileValues / totalInterquartileProbability)); } return sb.toString(); @@ -351,8 +352,8 @@ public class Simulate { totalInterquartileProbability += extrapolation[2]; } } - sb.append(String.format("%d,%.2f,%.0f,%.0f,%.0f%n", run, fraction, - totalValues / totalProbability, weightedMedian, + sb.append(String.format(Locale.US, "%d,%.2f,%.0f,%.0f,%.0f%n", run, + fraction, totalValues / totalProbability, weightedMedian, totalInterquartileValues / totalInterquartileProbability)); } return sb.toString();

1 0

[tor/master] Fix various grammar/style/type issues in 0.4.2.1-alpha changelog
by nickm＠torproject.org 16 Sep '19

16 Sep '19

commit f6ea890241fe517369e3760447276dc1695ca4e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 16 10:25:21 2019 -0400 Fix various grammar/style/type issues in 0.4.2.1-alpha changelog Fixes by seborn. --- ChangeLog | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f8b5344d..01d6c26e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,14 +32,14 @@ Changes in version 0.4.2.1-alpha - 2019-09-?? o Minor features (best practices tracker): - Our best-practices tracker now integrates with our include-checker - tool to keep track of how many layering violations that we have - not yet fixed. We hope to reduce this number over time to improve - Tor's modularity. Closes ticket 31176. + tool to keep track of how many layering violations we have not yet + fixed. We hope to reduce this number over time to improve Tor's + modularity. Closes ticket 31176. - Add a TOR_PRACTRACKER_OPTIONS variable for passing arguments to practracker from the environment. We may want this for continuous integration. Closes ticket 31309. - Give a warning rather than an error when a practracker exception - is violated by a small amount; add a --list-overbroad option to + is violated by a small amount, add a --list-overbroad option to practracker that lists exceptions that are stricter than they need to be, and provide an environment variable for disabling practracker. Closes ticket 30752. @@ -112,13 +112,13 @@ Changes in version 0.4.2.1-alpha - 2019-09-?? routerinfos, routerstatuses, and nodes. Closes ticket 21003. o Minor features (onion service v3): - - Do not allow single hop client to fetch or post an HS descriptor + - Do not allow single hop clients to fetch or post an HS descriptor from an HSDir. Closes ticket 24964. o Minor features (onion service): - Disallow single-hop clients at the introduction point. We've removed Tor2web support a while back and single-hop rendezvous - ttempts are blocked at the relays. This change should remove load + attempts are blocked at the relays. This change should remove load off the network from spammy clients. Close ticket 24963. o Minor features (stem tests): @@ -227,7 +227,7 @@ Changes in version 0.4.2.1-alpha - 2019-09-?? 31657; bugfix on 0.3.3.1-alpha. o Minor bugfixes (ipv6): - - We check for private IPv6 address alongside their IPv4 equivalents + - Check for private IPv6 addresses alongside their IPv4 equivalents when authorities check descriptors. Previously, we only checked for private IPv4 addresses. Fixes bug 31088; bugfix on 0.2.3.21-rc. Patch by Neel Chauhan. @@ -266,8 +266,8 @@ Changes in version 0.4.2.1-alpha - 2019-09-?? o Minor bugfixes (onion service v3): - When purging the client descriptor cache, close any introduction point circuits associated with purged cache entries. This avoids - picking those circuits later when connecting to them later. Fixes - bug 30921; bugfix on 0.3.2.1-alpha. + picking those circuits later when connecting to the same + introduction points. Fixes bug 30921; bugfix on 0.3.2.1-alpha. o Minor bugfixes (onion services): - In the hs_ident_circuit_t data structure, remove the unused field @@ -361,7 +361,7 @@ Changes in version 0.4.2.1-alpha - 2019-09-?? more general tool. Now typed structure members are accessible via an abstract type. Implements ticket 30914. - Move our backend logic for working with configuration and state - files into a lower-level library, since in no longer depends on + files into a lower-level library, since it no longer depends on any tor-specific functionality. Closes ticket 31626. - Numerous simplifications in configuration-handling logic: remove duplicated macro definitions, replace magical names with flags,

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 16 Sep '19

16 Sep '19

commit 63c954f1c72e699896f7a7c512391698d17b80e0 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 16 14:22:42 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- ml/network-settings.dtd | 54 ++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/ml/network-settings.dtd b/ml/network-settings.dtd index 2e291c3be..7c700be7f 100644 --- a/ml/network-settings.dtd +++ b/ml/network-settings.dtd @@ -9,49 +9,49 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.connectPrompt "ടോറുമായി ബന്ധിപ്പിക്കാൻ കണക്ടിൽ ക്ലിക്ക് ചെയുക "> +<!ENTITY torSettings.configurePrompt "ടോർ സെൻസർ ചെയ്തിട്ടുള്ള രാജ്യങ്ങളിൽപെട്ട (അതായത് ഈജിപ്ത് , ചൈന , തുർക്കി )ആളാണ് നിങ്ങളെങ്കിൽ അല്ലെങ്കിൽ നിങ്ങൾ ബന്ധപ്പെടുന്നത് പ്റോക്സി ആവശ്യമുള്ള രു സ്വകാര്യ നെറ്വർകിൽ നിന്നും ആണെങ്കിൽ നെറ്റ്‌വർക്ക് സെറ്റിംഗ്സിൽ മാറ്റം വരുത്താൻ കോൺഫിഗെർ ബട്ടണിൽ ക്ലിക്ക് ചെയുക "> <!ENTITY torSettings.configure "ക്രമപ്പെടുത്തു "> <!ENTITY torSettings.connect "ബന്ധിപ്പിക്കുക ">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> +<!ENTITY torsettings.startingTor "ടോർ തുടങ്ങാൻ കാത്തിരിക്കുന്നു "> <!ENTITY torsettings.restartTor "ടോർ ഒന്നുകൂടെ തുടങ്ങുക "> <!ENTITY torsettings.reconfigTor "പുനഃർക്രമീകരിക്കുക "> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "നിങ്ങൾ ടോർ ബ്രിഡ്ജസ് രൂപപ്പെടുത്തിയിരിക്കുന്നു അല്ലെങ്കിൽ ഒരു സാധാരണ പ്രോക്സി സെറ്റിംഗ്സ് എന്റർ ചെയ്തിരിക്കുന്നു &#160 ടോറുമായി ഒരു നേർ ബന്ധം സ്ഥാപിക്കാൻ ഈ സെറ്റിംഗ്സ് തീർച്ചയായും നീക്കം ചെയ്യേണ്ടതാണ് "> +<!ENTITY torsettings.discardSettings.proceed "സെറ്റിംഗ്സ് നീക്കം ചെയ്തു ബന്ധം സ്ഥാപിക്കുക "> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "നിര്ബന്ധമില്ലാത്തത് "> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> +<!ENTITY torsettings.useProxy.checkbox "ഞാൻ ഇന്റർനൈറ്റിലെക് ബന്ധപ്പെടാൻ ഒരു പ്രോക്സി ഉപയോഗിക്കുന്നു "> +<!ENTITY torsettings.useProxy.type "പ്രോക്സി ഇനം :"> +<!ENTITY torsettings.useProxy.type.placeholder "ഒരു പ്രോക്സി ഇനം തിരഞ്ഞെടുക്കുക :"> +<!ENTITY torsettings.useProxy.address "മേൽവിലാസം :"> +<!ENTITY torsettings.useProxy.address.placeholder "ഐ പി മേൽവിലാസം അല്ലെങ്കിൽ ഹോസ്റ്റ് നെയിം "> <!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.username "യൂസർ നെയിം :"> +<!ENTITY torsettings.useProxy.password "പാസ്സ്‌വേർഡ്‌ "> <!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 "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> +<!ENTITY torsettings.useProxy.type.http "എച് ടി ടി പി /എച് ടി ടി പി എസ് "> +<!ENTITY torsettings.firewall.checkbox "ഈ കംപ്യൂട്ടർ ചില പ്രത്യേക പോർട്ടുകളിലൂടെ മാത്രം ബന്ധം അനുവദിക്കുന്ന ഫയർവാൾ വഴിയാണ് പോകുന്നത്"> +<!ENTITY torsettings.firewall.allowedPorts "അനുവദിച്ചിട്ടുള്ള പോർട്ടുകൾ "> +<!ENTITY torsettings.useBridges.checkbox "എന്റെ രാജ്യത്തു ടോർ സെൻസർ ചെയ്തിട്ടുള്ളതാണ് "> +<!ENTITY torsettings.useBridges.default "ഇതിനകത്തു തന്നെയുള്ള ഒരു ബ്രിഡ്ജ് തിരഞ്ഞെടുക്കുക "> +<!ENTITY torsettings.useBridges.default.placeholder "ഒരു ബ്രിഡ്ജ് തിരഞ്ഞെടുക്കുക "> +<!ENTITY torsettings.useBridges.bridgeDB "torproject.org നിന്നും ഒരു ബ്രിഡ്ജ് ചോദിക്കുക "> +<!ENTITY torsettings.useBridges.captchaSolution.placeholder " കാണുന്ന ചിത്രത്തിൽ നിന്നും അക്ഷരങ്ങൾ ചേർക്കുക "> +<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "ഒരു പുതിയ ആഹ്വാനം ചെയ്യുക "> <!ENTITY torsettings.useBridges.captchaSubmit "സമർപ്പിക്കുക "> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> +<!ENTITY torsettings.useBridges.custom "എനിക്ക് അറിയാവുന്ന ഒരു ബ്രിഡ്ജിനെ തരിക "> +<!ENTITY torsettings.useBridges.label "വിശ്വസിക്കാവുന്ന ശ്രിതസ്സിൽ നിന്നും കിട്ടിയ ബ്രിഡ്ജിന്റെ വിവരങ്ങൾ ചേർക്കുക "> +<!ENTITY torsettings.useBridges.placeholder "അഡ്രസ് : പോർട്ട് (ഒരു വരിയിൽ ഒരെണ്ണം എന്ന രീതിയികൾ ചേർക്കുക )"> -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> +<!ENTITY torsettings.copyLog "ടോർ വിവരപ്പട്ടിക ക്ളിപ് ബോർഡിലേക്ക് ചേർക്കുക "> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!ENTITY torsettings.proxyHelpTitle "പ്രോക്സി സഹായം "> <!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">

1 0

[translation/tor-launcher-properties] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties
by translation＠torproject.org 16 Sep '19

16 Sep '19

commit 9d7e82b414141daea9bb7d801a712fa920480699 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 16 14:22:32 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-proper… --- ml/torlauncher.properties | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ml/torlauncher.properties b/ml/torlauncher.properties index 3fec5e3ca..31467cefa 100644 --- a/ml/torlauncher.properties +++ b/ml/torlauncher.properties @@ -76,19 +76,19 @@ torlauncher.bootstrapStatus.ap_conn=സർക്യൂട്ട് നിർമ torlauncher.bootstrapStatus.ap_conn_done=സർക്യൂട്ട് നിർമിക്കുന്നു : ടോർ റേലയുമായി ബന്ധപ്പെട്ടിരിക്കുന്നു torlauncher.bootstrapStatus.ap_handshake=സർക്യൂട്ട് നിർമിക്കുന്നു : ടോർ റേലയുമായി ചർച്ച ചെയ്യുന്നു torlauncher.bootstrapStatus.ap_handshake_done=സർക്യൂട്ട് നിർമിക്കുന്നു ടോർ റേലയുമായി ചർച്ച ചെയ്യുന്നത് പൂർത്തിയായി -torlauncher.bootstrapStatus.circuit_create=Building circuits: Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! +torlauncher.bootstrapStatus.circuit_create=സർക്യൂട്ട് നിർമിക്കുന്നു: ടോർ സർക്യൂട്ട് സ്ഥാപിക്കുന്നു +torlauncher.bootstrapStatus.done=ടോർ നെറ്റ്‌വർക്കഇൽ ചേർക്കപ്പെട്ടു -torlauncher.bootstrapWarning.done=done -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.done=കഴിഞ്ഞു +torlauncher.bootstrapWarning.connectrefused=കണക്ഷൻ നിരസിച്ചു +torlauncher.bootstrapWarning.misc=ഇടകലർന്ന +torlauncher.bootstrapWarning.resourcelimit=കുറഞ്ഞ ഉപാധികൾ +torlauncher.bootstrapWarning.identity=വ്യക്തിത്വം പൊരുത്തപ്പെടുന്നില്ല +torlauncher.bootstrapWarning.timeout=കണക്ഷൻ സമയം കഴിഞ്ഞു +torlauncher.bootstrapWarning.noroute=ഹോസ്റ്റ് ചെയ്യാൻ ഒരു റൂട്ടും ഇല്ല +torlauncher.bootstrapWarning.ioerror=റീഡ് വറൈറ്റ് തെറ്റ് +torlauncher.bootstrapWarning.pt_missing=പ്ലേഗ്‌ഗബിൽ ട്രാൻസ്‌പോർട് കാണാനില്ല -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=സർവരും ആയിട്ടുള്ള ബന്ധം നഷ്ടപ്പെട്ട് +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=സർവറുമായി ബന്ധപ്പെടാൻ കഴിയുന്നില്ല +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=പ്രോക്സിയിലേക്കു ബന്ധപ്പെടുത്താൻ കഴിഞ്ഞില്ല

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 24653: merge securityLevel.properties into torbutton.dtd
by gk＠torproject.org 16 Sep '19

16 Sep '19

commit 7baed647f56e5d3e7c92eaffadb1c18c07aabe7f Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 16 13:01:32 2019 +0200 fixup! Bug 24653: merge securityLevel.properties into torbutton.dtd --- browser/components/securitylevel/content/securityLevel.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/browser/components/securitylevel/content/securityLevel.js b/browser/components/securitylevel/content/securityLevel.js index 9dc23d97855d..9965046a7d15 100644 --- a/browser/components/securitylevel/content/securityLevel.js +++ b/browser/components/securitylevel/content/securityLevel.js @@ -9,7 +9,11 @@ XPCOMUtils.defineLazyModuleGetters(this, { }); XPCOMUtils.defineLazyGlobalGetters(this, ["DOMParser"]); -XPCOMUtils.defineLazyGetter(this, "domParser", () => new DOMParser()); +XPCOMUtils.defineLazyGetter(this, "domParser", () => { + const parser = new DOMParser(); + parser.forceEnableDTD(); + return parser; +}); /* Security Level Strings

1 0