date:20180827

[tor-commits] [translation/support-portal] Update translations for support-portal

2018-08-27 Thread translation

commit 74e6ba6eaa39c304d8227f3d5f379d6738db7f27
Author: Translation commit bot 
Date:   Tue Aug 28 05:18:59 2018 +

Update translations for support-portal
---
 contents+pt_BR.po | 19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/contents+pt_BR.po b/contents+pt_BR.po
index fd643cf99..8460c1487 100644
--- a/contents+pt_BR.po
+++ b/contents+pt_BR.po
@@ -3665,6 +3665,8 @@ msgid ""
 "To get links for downloading Tor Browser, send a message to "
 "get...@torproject.org with one of the following codes in it:"
 msgstr ""
+"Para receber os links para baixar o Navegador Tor, envie uma mensagem para "
+"get...@torproject.org com um dos seguintes cÃ³digos:"
 
 #: http//localhost/tbb/tbb-7/
 #: (content/tbb/tbb-7/contents+en.lrquestion.description)
@@ -3684,6 +3686,9 @@ msgid ""
 "href=\"https://twitter.com/get_tor\;>@get_tor with one of the "
 "following codes in it (you don't need to follow the account):"
 msgstr ""
+"Para receber os links para baixar o Navegador Tor, envie uma mensagem direta"
+" para https://twitter.com/get_tor\;>@get_tor com "
+"um dos seguintes cÃ³digos (vocÃª nÃ£o precisa seguir a conta):"
 
 #: http//localhost/tbb/tbb-32/
 #: (content/tbb/tbb-32/contents+en.lrquestion.description)
@@ -3749,6 +3754,8 @@ msgid ""
 "## The IP address or hostname for incoming connections (leave commented and "
 "Tor will guess)"
 msgstr ""
+"##O endereÃ§o IP ou hostname para conexÃµes de entrada (deixe comentado e o "
+"Tor irÃ¡ saber)"
 
 #: http//localhost/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)
@@ -3766,6 +3773,10 @@ msgid ""
 "href=\"https://duckduckgo.com/privacy\;>DuckDuckGo privacy "
 "policy."
 msgstr ""
+"DuckDuckGo nÃ£o rastreia seus usuÃ¡rio nem armazena dados sobre pesquisas "
+"feitas por eles. Veja mais sobre https://duckduckgo.com/privacy\;>a polÃtica de privacidade "
+"DuckDuckGo."
 
 #: http//localhost/tbb/tbb-21/
 #: (content/tbb/tbb-21/contents+en.lrquestion.seo_slug)
@@ -3825,6 +3836,8 @@ msgid ""
 "11/1/2017 21:11:44 PM.300 [WARN] Failed to find node for hop 0 of our path. "
 "Discarding this circuit."
 msgstr ""
+"11/1/2017 21:11:44 PM.300 [WARN]Falha para encontrar um nÃ³ para o hop 0 do "
+"nosso caminho. Descartando esse circuito."
 
 #: http//localhost/tbb/tbb-16/
 #: (content/tbb/tbb-16/contents+en.lrquestion.description)
@@ -4079,7 +4092,7 @@ msgstr "Navegador Tor"
 #: http//localhost/censorship/censorship-5/
 #: (content/censorship/censorship-5/contents+en.lrquestion.description)
 msgid "# Common log error #3: Failed to complete TLS handshake"
-msgstr ""
+msgstr "# Erro de log comum #3: Falha ao concluir TLS handshake"
 
 #: http//localhost/tbb/tbb-7/
 #: (content/tbb/tbb-7/contents+en.lrquestion.description)
@@ -4133,6 +4146,8 @@ msgid ""
 "Unfortunately, some websites deliver CAPTCHAs to Tor users, and we are not "
 "able to remove CAPTCHAs from websites."
 msgstr ""
+"Infelizmente, alguns sites entregam CAPTCHAs para usuÃ¡rios Tor, e nÃ³s nÃ£o "
+"somos capazes de remover CAPTCHAs dos websites."
 
 #: http//localhost/operators/operators-4/
 #: (content/operators/operators-4/contents+en.lrquestion.description)
@@ -4405,6 +4420,8 @@ msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
 "found in our "
 msgstr ""
+"Trademark, avisos de direitos autorais, e regras de uso para terceiros podem"
+" ser encontradas em nosso"
 
 #: templates/layout.html:7
 msgid "Tor Project | Support"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/support-portal] Update translations for support-portal

2018-08-27 Thread translation

commit 2da12504367530bda13409290f49628928b86f7a
Author: Translation commit bot 
Date:   Tue Aug 28 04:48:57 2018 +

Update translations for support-portal
---
 contents+pt_BR.po | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/contents+pt_BR.po b/contents+pt_BR.po
index 7305390e4..fd643cf99 100644
--- a/contents+pt_BR.po
+++ b/contents+pt_BR.po
@@ -2367,6 +2367,9 @@ msgid ""
 " routing, and is developed by someone who works closely with the Tor "
 "Project."
 msgstr ""
+"NÃ³s recomendamos para iOS o aplicativo Onion Browser, que Ã© open source, 
usa"
+" roteamento Tor, e Ã© desenvolvido por alguÃ©m que participa de perto com o "
+"Tor Project"
 
 #: http//localhost/tbb/tbb-15/
 #: (content/tbb/tbb-15/contents+en.lrquestion.title)
@@ -2989,6 +2992,8 @@ msgid ""
 "* Add the gpg key used to sign the packages by running the following "
 "commands:"
 msgstr ""
+"* Adicione a chave gpd usada para assinar os pacotes executando os seguintes"
+" comandos"
 
 #: http//localhost/gettor/gettor-3/
 #: (content/gettor/gettor-3/contents+en.lrquestion.description)
@@ -3090,6 +3095,9 @@ msgid ""
 "href=\"https://guardianproject.info/\;>Guardian Project's "
 "website."
 msgstr ""
+"O Guardian Project mantÃ©m o Tor (e outras aplicaÃ§Ãµes de privacidade) no "
+"Android. Mais informaÃ§Ãµes podem ser encontradas no site do https://guardianproject.info/\;>Guardian Project's"
 
 #: http//localhost/tbb/tbb-29/
 #: (content/tbb/tbb-29/contents+en.lrquestion.description)
@@ -3391,6 +3399,10 @@ msgid ""
 "protection is blocking me from accessing Tor Browser, it is "
 "common for anti-virus / anti-malware software to cause this type of issue."
 msgstr ""
+"Se vocÃª estiver executando um anti-virus, por favor veja http://support.torproject.org/#tbb-10\;>Minha proteÃ§Ã£o "
+"antivirus/malware estÃ¡ me impedindo de acessar o Tor Browser, Ã© "
+"comum que softwares anti-virus / anti-malware causem esse tipo de problema."
 
 #: http//localhost/tbb/tbb-26/
 #: (content/tbb/tbb-26/contents+en.lrquestion.seo_slug)
@@ -3407,6 +3419,8 @@ msgid ""
 "Please take a strong stance in favor of digital privacy and internet "
 "freedom, and allow Tor users access to xyz.com."
 msgstr ""
+"Por favor tenha uma posiÃ§Ã£o forte em favor da privacidade digital e "
+"liberdade na internet, e permita aos usuÃ¡rios do Tor acessarem xyz.com."
 
 #: http//localhost/tbb/tbb-20/
 #: (content/tbb/tbb-20/contents+en.lrquestion.title)
@@ -3643,6 +3657,7 @@ msgstr ""
 #: (content/operators/operators-6/contents+en.lrquestion.description)
 msgid "## Set your bandwidth rate (leave commented and Tor will run without"
 msgstr ""
+"##Defina sua taxa de largura de banda (deixe comentado e o Tor irÃ¡ rodar sem"
 
 #: http//localhost/gettor/gettor-4/
 #: (content/gettor/gettor-4/contents+en.lrquestion.description)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/support-portal] Update translations for support-portal

2018-08-27 Thread translation

commit 8ac35e0795bb4d954eb55bc665ca0f17840a249f
Author: Translation commit bot 
Date:   Tue Aug 28 03:49:05 2018 +

Update translations for support-portal
---
 contents+bn_BD.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/contents+bn_BD.po b/contents+bn_BD.po
index 31c7fc4b7..7c9fa2012 100644
--- a/contents+bn_BD.po
+++ b/contents+bn_BD.po
@@ -221,7 +221,7 @@ msgstr "à¦à¦°à§à¦¸à§à¦ à¦à¦¿ à¦²à¦ à¦°à¦¾à¦à§?"
 #: http//localhost/censorship/censorship-7/
 #: (content/censorship/censorship-7/contents+en.lrquestion.seo_slug)
 msgid "what-is-a-bridge"
-msgstr "what-is-a-bridge"
+msgstr "à¦¬à§à¦°à¦¿à¦-à¦à¦¿"
 
 #: http//localhost/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
@@ -265,7 +265,7 @@ msgstr "à¦¨à¦¾à¥¤"
 #: http//localhost/tbb/tbb-25/
 #: (content/tbb/tbb-25/contents+en.lrquestion.seo_slug)
 msgid "problem-noscript"
-msgstr "problem-noscript"
+msgstr "noscript-à¦¸à¦®à¦¸à§à¦¯à¦¾"
 
 #: http//localhost/operators/operators-4/
 #: (content/operators/operators-4/contents+en.lrquestion.description)
@@ -279,7 +279,7 @@ msgstr ""
 #: http//localhost/tbb/tbb-32/
 #: (content/tbb/tbb-32/contents+en.lrquestion.seo_slug)
 msgid "setting-tor-browser-as-default"
-msgstr "setting-tor-browser-as-default"
+msgstr 
"à¦à¦°-à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦°-à¦¡à¦¿à¦«à¦²à§à¦-à¦¹à¦¿à¦¸à¦¾à¦¬à§-à¦¸à§à¦-à¦à¦°à§à¦¨"
 
 #: http//localhost/tbb/tbb-37/
 #: (content/tbb/tbb-37/contents+en.lrquestion.description)
@@ -327,7 +327,7 @@ msgstr ""
 #: http//localhost/censorship/censorship-4/
 #: (content/censorship/censorship-4/contents+en.lrquestion.seo_slug)
 msgid "cant-connect-to-tor-browser"
-msgstr "cant-connect-to-tor-browser"
+msgstr 
"à¦à¦°-à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦°à§à¦°-à¦¸à¦¾à¦¥à§-à¦¸à¦à¦¯à§à¦-à¦à¦°à¦¾-à¦¯à¦¾à¦à§à¦à§-à¦¨à¦¾"
 
 #: http//localhost/https/https-1/
 #: (content/https/https-1/contents+en.lrquestion.description)
@@ -337,7 +337,7 @@ msgstr ""
 #: http//localhost/onionservices/onionservices-1/
 #: (content/onionservices/onionservices-1/contents+en.lrquestion.seo_slug)
 msgid "accessing-websites-that-are-only-accessible-over-tor"
-msgstr "accessing-websites-that-are-only-accessible-over-tor"
+msgstr 
"à¦¯à§-à¦à¦¯à¦¼à§à¦¬à¦¸à¦¾à¦à¦à¦à§à¦²à¦¿-à¦¶à§à¦§à§à¦®à¦¾à¦¤à§à¦°-à¦à¦°-à¦-à¦ªà§à¦°à¦¬à§à¦¶à¦¯à§à¦à§à¦¯-à¦¨à¦¯à¦¼
 "
 
 #: http//localhost/censorship/censorship-5/
 #: (content/censorship/censorship-5/contents+en.lrquestion.description)
@@ -362,7 +362,7 @@ msgstr ""
 #: http//localhost/tbb/tbb-8/
 #: (content/tbb/tbb-8/contents+en.lrquestion.seo_slug)
 msgid "website-blocked-by-censor-can-tor-browser-help"
-msgstr "website-blocked-by-censor-can-tor-browser-help"
+msgstr 
"à¦¸à§à¦¨à§à¦¸à¦°-à¦¦à§à¦¬à¦¾à¦°à¦¾-à¦à¦¬à¦¦à§à¦§-à¦à¦¯à¦¼à§à¦¬à¦¸à¦¾à¦à¦-à¦à¦°-à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦°-à¦¸à¦¹à¦¾à¦¯à¦¼à¦¤à¦¾-à¦¦à¦¿à¦¤à§-à¦ªà¦¾à¦°à§"
 
 #: http//localhost/misc/misc-3/
 #: (content/misc/misc-3/contents+en.lrquestion.description)
@@ -2056,7 +2056,7 @@ msgid ""
 "Right now the path length is hard-coded at 3 plus the number of nodes in "
 "your path that are sensitive."
 msgstr ""
-"à¦à¦ à¦®à§à¦¹à§à¦°à§à¦¤à§ à¦ªà¦¥à¦à¦¿à¦° à¦¦à§à¦°à§à¦à§à¦¯ 
à¦¹à¦¾à¦°à§à¦¡-à¦à§à¦¡ à§© à¦ªà§à¦²à¦¾à¦¸-à¦ à¦à¦ªà¦¨à¦¾à¦° à¦ªà¦¥à§ 
à¦¨à§à¦¡ à¦¸à¦à¦à§à¦¯à¦¾ "
+"à¦à¦ à¦®à§à¦¹à§à¦°à§à¦¤à§ à¦ªà¦¥à¦à¦¿à¦° à¦¦à§à¦°à§à¦à§à¦¯ 
à¦¹à¦¾à¦°à§à¦¡-à¦à§à¦¡ 3 à¦ªà§à¦²à¦¾à¦¸-à¦ à¦à¦ªà¦¨à¦¾à¦° à¦ªà¦¥à§ 
à¦¨à§à¦¡ à¦¸à¦à¦à§à¦¯à¦¾ "
 "à¦¸à¦à¦¬à§à¦¦à¦¨à¦¶à§à¦²."
 
 #: http//localhost/tbb/tbb-37/

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttbupdatedtd_completed] Update translations for torbutton-abouttbupdatedtd_completed

2018-08-27 Thread translation

commit 0777cb8be5290dab79160c1de4513a728fd87762
Author: Translation commit bot 
Date:   Tue Aug 28 03:48:21 2018 +

Update translations for torbutton-abouttbupdatedtd_completed
---
 bn_BD/abouttbupdate.dtd | 4 
 1 file changed, 4 insertions(+)

diff --git a/bn_BD/abouttbupdate.dtd b/bn_BD/abouttbupdate.dtd
index 90abe5dda..93845c577 100644
--- a/bn_BD/abouttbupdate.dtd
+++ b/bn_BD/abouttbupdate.dtd
@@ -4,3 +4,7 @@
 
 
 
+
+
+
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd

2018-08-27 Thread translation

commit 516e5cee25c25509ae4f1b2be8fb733b0ea3de92
Author: Translation commit bot 
Date:   Tue Aug 28 03:48:16 2018 +

Update translations for torbutton-abouttbupdatedtd
---
 bn_BD/abouttbupdate.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bn_BD/abouttbupdate.dtd b/bn_BD/abouttbupdate.dtd
index 32c0f4c35..93845c577 100644
--- a/bn_BD/abouttbupdate.dtd
+++ b/bn_BD/abouttbupdate.dtd
@@ -5,6 +5,6 @@
 
 
 
-
-
-
+
+
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tba-android_stringsdtd] Update translations for tba-android_stringsdtd

2018-08-27 Thread translation

commit bd65e40c76b303c752bdc88cfb2dc9c4bd8248e4
Author: Translation commit bot 
Date:   Tue Aug 28 03:46:49 2018 +

Update translations for tba-android_stringsdtd
---
 bn_BD/android_strings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bn_BD/android_strings.dtd b/bn_BD/android_strings.dtd
index 94b98edae..806ce5e31 100644
--- a/bn_BD/android_strings.dtd
+++ b/bn_BD/android_strings.dtd
@@ -667,7 +667,7 @@ just addresses the organization to follow, e.g. "This site 
is run by " -->
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2018-08-27 Thread translation

commit f5ce4917c8a9fcd1d1d5a548171407b69e32b7f1
Author: Translation commit bot 
Date:   Tue Aug 28 02:16:11 2018 +

Update translations for abouttor-homepage
---
 ach/aboutTor.dtd | 3 +++
 af/aboutTor.dtd  | 3 +++
 ak/aboutTor.dtd  | 3 +++
 am/aboutTor.dtd  | 3 +++
 ar/aboutTor.dtd  | 3 +++
 arn/aboutTor.dtd | 3 +++
 ast/aboutTor.dtd | 3 +++
 az/aboutTor.dtd  | 3 +++
 be/aboutTor.dtd  | 3 +++
 bg/aboutTor.dtd  | 3 +++
 bn_BD/aboutTor.dtd   | 3 +++
 bo/aboutTor.dtd  | 3 +++
 br/aboutTor.dtd  | 3 +++
 brx/aboutTor.dtd | 3 +++
 bs/aboutTor.dtd  | 3 +++
 ca/aboutTor.dtd  | 3 +++
 cs/aboutTor.dtd  | 3 +++
 csb/aboutTor.dtd | 3 +++
 cv/aboutTor.dtd  | 3 +++
 cy/aboutTor.dtd  | 3 +++
 da/aboutTor.dtd  | 3 +++
 de/aboutTor.dtd  | 3 +++
 dz/aboutTor.dtd  | 3 +++
 el/aboutTor.dtd  | 3 +++
 en/aboutTor.dtd  | 3 +++
 en_GB/aboutTor.dtd   | 3 +++
 eo/aboutTor.dtd  | 3 +++
 es/aboutTor.dtd  | 3 +++
 es_AR/aboutTor.dtd   | 3 +++
 es_CL/aboutTor.dtd   | 3 +++
 es_CO/aboutTor.dtd   | 3 +++
 es_MX/aboutTor.dtd   | 3 +++
 et/aboutTor.dtd  | 3 +++
 eu/aboutTor.dtd  | 3 +++
 fa/aboutTor.dtd  | 3 +++
 fi/aboutTor.dtd  | 3 +++
 fil/aboutTor.dtd | 3 +++
 fo/aboutTor.dtd  | 3 +++
 fr/aboutTor.dtd  | 3 +++
 fur/aboutTor.dtd | 3 +++
 fy/aboutTor.dtd  | 3 +++
 ga/aboutTor.dtd  | 3 +++
 gd/aboutTor.dtd  | 3 +++
 gl/aboutTor.dtd  | 3 +++
 gu/aboutTor.dtd  | 3 +++
 gu_IN/aboutTor.dtd   | 3 +++
 gun/aboutTor.dtd | 3 +++
 ha/aboutTor.dtd  | 3 +++
 he/aboutTor.dtd  | 3 +++
 hi/aboutTor.dtd  | 3 +++
 hr/aboutTor.dtd  | 3 +++
 hr_HR/aboutTor.dtd   | 3 +++
 ht/aboutTor.dtd  | 3 +++
 hu/aboutTor.dtd  | 3 +++
 hy/aboutTor.dtd  | 3 +++
 ia/aboutTor.dtd  | 3 +++
 id/aboutTor.dtd  | 3 +++
 is/aboutTor.dtd  | 3 +++
 it/aboutTor.dtd  | 3 +++
 ja/aboutTor.dtd  | 3 +++
 jv/aboutTor.dtd  | 3 +++
 ka/aboutTor.dtd  | 3 +++
 kk/aboutTor.dtd  | 3 +++
 km/aboutTor.dtd  | 3 +++
 kn/aboutTor.dtd  | 3 +++
 ko/aboutTor.dtd  | 3 +++
 ko_KR/aboutTor.dtd   | 3 +++
 ku/aboutTor.dtd  | 3 +++
 ku_IQ/aboutTor.dtd   | 3 +++
 kw/aboutTor.dtd  | 3 +++
 ky/aboutTor.dtd  | 3 +++
 la/aboutTor.dtd  | 3 +++
 lb/aboutTor.dtd  | 3 +++
 lg/aboutTor.dtd  | 3 +++
 ln/aboutTor.dtd  | 3 +++
 lo/aboutTor.dtd  | 3 +++
 lt/aboutTor.dtd  | 3 +++
 lv/aboutTor.dtd  | 3 +++
 mg/aboutTor.dtd  | 3 +++
 mi/aboutTor.dtd  | 3 +++
 mk/aboutTor.dtd  | 3 +++
 ml/aboutTor.dtd  | 3 +++
 mn/aboutTor.dtd  | 3 +++
 mr/aboutTor.dtd  | 3 +++
 ms_MY/aboutTor.dtd   | 3 +++
 mt/aboutTor.dtd  | 3 +++
 my/aboutTor.dtd  | 3 +++
 nah/aboutTor.dtd | 3 +++
 nap/aboutTor.dtd | 3 +++
 nb/aboutTor.dtd  | 3 +++
 ne/aboutTor.dtd  | 3 +++
 nl/aboutTor.dtd  | 3 +++
 nl_BE/aboutTor.dtd   | 3 +++
 nn/aboutTor.dtd  | 3 +++
 nso/aboutTor.dtd | 3 +++
 oc/aboutTor.dtd  | 3 +++
 om/aboutTor.dtd  | 3 +++
 or/aboutTor.dtd  | 3 +++
 pa/aboutTor.dtd  | 3 +++
 pap/aboutTor.dtd | 3 +++
 pl/aboutTor.dtd  | 3 +++
 pms/aboutTor.dtd | 3 +++
 ps/aboutTor.dtd  | 3 +++
 pt/aboutTor.dtd  | 3 +++
 pt_BR/aboutTor.dtd   | 3 +++
 pt_PT/aboutTor.dtd   | 3 +++
 ro/aboutTor.dtd  | 3 +++
 ru/aboutTor.dtd  | 3 +++
 ru@petr1708/aboutTor.dtd | 3 +++
 sco/aboutTor.dtd | 3 +++
 si_LK/aboutTor.dtd   | 3 +++
 sk/aboutTor.dtd  | 3 +++
 sk_SK/aboutTor.dtd   | 3 +++
 sl/aboutTor.dtd  | 3 +++
 sl_SI/aboutTor.dtd   | 3 +++
 sn/aboutTor.dtd  | 3 +++
 so/aboutTor.dtd  | 3 +++
 son/aboutTor.dtd | 3 +++
 sq/aboutTor.dtd  | 3 +++
 sr/aboutTor.dtd  | 3 +++
 sr@latin/aboutTor.dtd| 3 +++
 st/aboutTor.dtd  | 3 +++
 su/aboutTor.dtd  | 3 +++
 sv/aboutTor.dtd  | 3 +++
 sw/aboutTor.dtd  | 3 +++
 ta/aboutTor.dtd  | 3 +++
 te/aboutTor.dtd  | 3 +++
 tg/aboutTor.dtd  | 3 +++
 th/aboutTor.dtd  | 3 +++
 ti/aboutTor.dtd  | 3 +++
 tk/aboutTor.dtd  | 3 +++
 tr/aboutTor.dtd  | 3 +++
 ug@Arab/aboutTor.dtd | 3 +++
 uk/aboutTor.dtd  | 3 +++
 ur/aboutTor.dtd  | 3 +++
 ur_PK/aboutTor.dtd   | 3 +++
 uz/aboutTor.dtd  | 3 +++
 ve/aboutTor.dtd  | 3 +++
 vi/aboutTor.dtd  | 3 +++
 wa/aboutTor.dtd  | 3 +++
 wo/aboutTor.dtd  | 3 +++
 zh_CN/aboutTor.dtd   | 3 +++

[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

2018-08-27 Thread translation

commit 74ab4c63598a0e935e331d211ea723c6ea1621bc
Author: Translation commit bot 
Date:   Tue Aug 28 02:16:23 2018 +

Update translations for abouttor-homepage_completed
---
 bn_BD/aboutTor.dtd | 3 +++
 ca/aboutTor.dtd| 3 +++
 en/aboutTor.dtd| 3 +++
 es/aboutTor.dtd| 3 +++
 es_AR/aboutTor.dtd | 3 +++
 ga/aboutTor.dtd| 3 +++
 he/aboutTor.dtd| 3 +++
 it/aboutTor.dtd| 3 +++
 ru/aboutTor.dtd| 3 +++
 tr/aboutTor.dtd| 3 +++
 10 files changed, 30 insertions(+)

diff --git a/bn_BD/aboutTor.dtd b/bn_BD/aboutTor.dtd
index dffca8a84..0896f0750 100644
--- a/bn_BD/aboutTor.dtd
+++ b/bn_BD/aboutTor.dtd
@@ -23,3 +23,6 @@
 
 
 https://www.torproject.org/getinvolved/volunteer.html.en;>
+
+
+
diff --git a/ca/aboutTor.dtd b/ca/aboutTor.dtd
index 2c15b2b40..ca8aee1c1 100644
--- a/ca/aboutTor.dtd
+++ b/ca/aboutTor.dtd
@@ -23,3 +23,6 @@
 
 
 https://www.torproject.org/getinvolved/volunteer.html.en;>
+
+
+
diff --git a/en/aboutTor.dtd b/en/aboutTor.dtd
index 3eecc0bcd..1400d7b52 100644
--- a/en/aboutTor.dtd
+++ b/en/aboutTor.dtd
@@ -23,3 +23,6 @@
 
 
 https://www.torproject.org/getinvolved/volunteer.html.en;>
+
+
+
diff --git a/es/aboutTor.dtd b/es/aboutTor.dtd
index 152e75906..c0934bde2 100644
--- a/es/aboutTor.dtd
+++ b/es/aboutTor.dtd
@@ -23,3 +23,6 @@
 
 
 https://www.torproject.org/getinvolved/volunteer.html.en;>
+
+
+
diff --git a/es_AR/aboutTor.dtd b/es_AR/aboutTor.dtd
index 245eb39ce..edec3f8d5 100644
--- a/es_AR/aboutTor.dtd
+++ b/es_AR/aboutTor.dtd
@@ -23,3 +23,6 @@
 
 
 https://www.torproject.org/getinvolved/volunteer.html.en;>
+
+
+
diff --git a/ga/aboutTor.dtd b/ga/aboutTor.dtd
index 62fbbf6cf..ce6fe3f59 100644
--- a/ga/aboutTor.dtd
+++ b/ga/aboutTor.dtd
@@ -23,3 +23,6 @@
 
 
 https://www.torproject.org/getinvolved/volunteer.html.en;>
+
+
+
diff --git a/he/aboutTor.dtd b/he/aboutTor.dtd
index 629b196ec..2413d064a 100644
--- a/he/aboutTor.dtd
+++ b/he/aboutTor.dtd
@@ -23,3 +23,6 @@
 
 
 https://www.torproject.org/getinvolved/volunteer.html.en;>
+
+
+
diff --git a/it/aboutTor.dtd b/it/aboutTor.dtd
index bef8049ab..b9687c453 100644
--- a/it/aboutTor.dtd
+++ b/it/aboutTor.dtd
@@ -23,3 +23,6 @@
 
 
 https://www.torproject.org/getinvolved/volunteer.html.en;>
+
+
+
diff --git a/ru/aboutTor.dtd b/ru/aboutTor.dtd
index 68a0272b2..71c4920cd 100644
--- a/ru/aboutTor.dtd
+++ b/ru/aboutTor.dtd
@@ -23,3 +23,6 @@
 
 
 https://www.torproject.org/getinvolved/volunteer.html#ru;>
+
+
+
diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd
index f0f68b494..ce8761f23 100644
--- a/tr/aboutTor.dtd
+++ b/tr/aboutTor.dtd
@@ -23,3 +23,6 @@
 
 
 https://www.torproject.org/getinvolved/volunteer.html.en;>
+
+
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/support-portal] Update translations for support-portal

2018-08-27 Thread translation

commit dadcdfab180c1ccdaa9187bdfc8be30679a47780
Author: Translation commit bot 
Date:   Tue Aug 28 00:48:56 2018 +

Update translations for support-portal
---
 contents+ca.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/contents+ca.po b/contents+ca.po
index 1a57253ee..fa5f78899 100644
--- a/contents+ca.po
+++ b/contents+ca.po
@@ -9,13 +9,14 @@
 # Bartges90, 2018
 # Aleix Vidal i Gaya , 2018
 # Emma Peel, 2018
+# Humbert , 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-27 12:12+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Emma Peel, 2018\n"
+"Last-Translator: Humbert , 2018\n"
 "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,8 +29,8 @@ msgstr ""
 msgid ""
 "Modifying the way that Tor creates its circuits is strongly discouraged."
 msgstr ""
-"Modificar la manera en quÃ¨ Tor crea els seus circuits Ã©s molt "
-"desincentivador"
+"Modificar la manera en quÃ¨ Tor crea els seus circuits Ã©s molt poc "
+"recomanable"
 
 #: http//localhost/tbb/tbb-17/
 #: (content/tbb/tbb-17/contents+en.lrquestion.description)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/support-portal] Update translations for support-portal

2018-08-27 Thread translation

commit 0f325be4c65a2d5fbcf19465e81a033f18293bd5
Author: Translation commit bot 
Date:   Mon Aug 27 23:18:57 2018 +

Update translations for support-portal
---
 contents+he.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+he.po b/contents+he.po
index efbb936e2..479b56317 100644
--- a/contents+he.po
+++ b/contents+he.po
@@ -3870,7 +3870,7 @@ msgstr "×××¤××©"
 
 #: templates/sidenav.html:4 templates/sidenav.html:29
 msgid "Topics"
-msgstr ""
+msgstr "× ××©×××"
 
 #: templates/macros/question.html:11
 msgid "Permalink"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttbupdatedtd_completed] Update translations for torbutton-abouttbupdatedtd_completed

2018-08-27 Thread translation

commit d7413d5491508adf20eef431b7c76c8858de9401
Author: Translation commit bot 
Date:   Mon Aug 27 23:18:13 2018 +

Update translations for torbutton-abouttbupdatedtd_completed
---
 he/abouttbupdate.dtd | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/he/abouttbupdate.dtd b/he/abouttbupdate.dtd
index 2f93038d4..a9989bb1b 100644
--- a/he/abouttbupdate.dtd
+++ b/he/abouttbupdate.dtd
@@ -1,6 +1,10 @@
-
+
 
-
+
 
 
 
+
+
+
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd

2018-08-27 Thread translation

commit 77a1cb94f97b2fbe7379a38c1dc0eacd567b89e3
Author: Translation commit bot 
Date:   Mon Aug 27 23:18:08 2018 +

Update translations for torbutton-abouttbupdatedtd
---
 he/abouttbupdate.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/he/abouttbupdate.dtd b/he/abouttbupdate.dtd
index 5ab4b5e76..a9989bb1b 100644
--- a/he/abouttbupdate.dtd
+++ b/he/abouttbupdate.dtd
@@ -1,10 +1,10 @@
-
+
 
 
 
 
 
 
-
-
+
+
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 21787: Spoof en-US for date picker

2018-08-27 Thread gk

commit 7150252e7a0213aeddfe3c0aed294aae4cfcb3b8
Author: Arthur Edelstein 
Date:   Mon Aug 20 15:42:08 2018 -0700

Bug 21787: Spoof en-US for date picker

When privacy.spoof_english === 2, then en-US spoofing is enabled.
In that case, make sure the date picker does not leak the locale.
---
 dom/base/IntlUtils.cpp|  5 
 dom/base/IntlUtils.h  |  2 ++
 dom/webidl/IntlUtils.webidl   |  6 +
 toolkit/content/widgets/datetimebox.xml   | 43 +--
 toolkit/content/widgets/datetimepopup.xml |  3 ++-
 5 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/dom/base/IntlUtils.cpp b/dom/base/IntlUtils.cpp
index 9fc21414fd58..89f2ebbdc026 100644
--- a/dom/base/IntlUtils.cpp
+++ b/dom/base/IntlUtils.cpp
@@ -141,5 +141,10 @@ IntlUtils::GetLocaleInfo(const Sequence& 
aLocales,
   }
 }
 
+bool
+IntlUtils::SpoofEnglish() const {
+  return Preferences::GetInt("privacy.spoof_english", 0) == 2;
+}
+
 } // dom namespace
 } // mozilla namespace
diff --git a/dom/base/IntlUtils.h b/dom/base/IntlUtils.h
index 76875497f293..55d8e823abfd 100644
--- a/dom/base/IntlUtils.h
+++ b/dom/base/IntlUtils.h
@@ -47,6 +47,8 @@ public:
 mozilla::dom::LocaleInfo& aResult,
 mozilla::ErrorResult& aError);
 
+  bool SpoofEnglish() const;
+
 private:
   ~IntlUtils();
 
diff --git a/dom/webidl/IntlUtils.webidl b/dom/webidl/IntlUtils.webidl
index c70e0f955c82..1fea1735997c 100644
--- a/dom/webidl/IntlUtils.webidl
+++ b/dom/webidl/IntlUtils.webidl
@@ -70,4 +70,10 @@ interface IntlUtils {
*/
   [Throws]
   LocaleInfo getLocaleInfo(sequence locales);
+
+  /**
+   * Attribute that indicates whether the user has chosen
+   * to spoof the locale as en-US in content.
+   */
+  readonly attribute boolean spoofEnglish;
 };
diff --git a/toolkit/content/widgets/datetimebox.xml 
b/toolkit/content/widgets/datetimebox.xml
index 2a7cdd50f64d..f4bb32ca35e7 100644
--- a/toolkit/content/widgets/datetimebox.xml
+++ b/toolkit/content/widgets/datetimebox.xml
@@ -27,13 +27,13 @@

[tor-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] fixup! Bug 26961: New user onboarding.

2018-08-27 Thread gk

commit 27553c4c6684f10ede89eb39be07f09cea5bcc75
Author: Kathy Brade 
Date:   Mon Aug 27 16:57:42 2018 -0400

fixup! Bug 26961: New user onboarding.
---
 .../onboarding/content/img/icons_tour-complete.png | Bin 1221 -> 694 bytes
 .../onboarding/content/img/icons_tour-complete.svg |   4 ++--
 browser/extensions/onboarding/content/onboarding.css   |   8 
 browser/extensions/onboarding/content/onboarding.js|   2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/browser/extensions/onboarding/content/img/icons_tour-complete.png 
b/browser/extensions/onboarding/content/img/icons_tour-complete.png
index 80b76a9bc682..8802bf083ed3 100644
Binary files 
a/browser/extensions/onboarding/content/img/icons_tour-complete.png and 
b/browser/extensions/onboarding/content/img/icons_tour-complete.png differ
diff --git a/browser/extensions/onboarding/content/img/icons_tour-complete.svg 
b/browser/extensions/onboarding/content/img/icons_tour-complete.svg
index 173e72c332df..761c31cbf9d0 100644
--- a/browser/extensions/onboarding/content/img/icons_tour-complete.svg
+++ b/browser/extensions/onboarding/content/img/icons_tour-complete.svg
@@ -8,10 +8,10 @@
 
 
 
-
+
 
 
 
 
 
-
\ No newline at end of file
+
diff --git a/browser/extensions/onboarding/content/onboarding.css 
b/browser/extensions/onboarding/content/onboarding.css
index a7fb2b405b55..fa5f58975c3a 100644
--- a/browser/extensions/onboarding/content/onboarding.css
+++ b/browser/extensions/onboarding/content/onboarding.css
@@ -315,15 +315,15 @@
   line-height: 22px;
   padding-inline-start: 40px;
   padding-inline-end: 28px;
-  max-height: 360px;
+  max-height: 370px;
   overflow: auto;
 }
 
 .onboarding-tour-description > h1 {
-  font-size: 36px;
-  margin-top: 16px;
+  font-size: 30px;
+  margin: 16px 0px 10px 0px;
   font-weight: 300;
-  line-height: 44px;
+  line-height: 36px;
   color: #420c5d;
 }
 
diff --git a/browser/extensions/onboarding/content/onboarding.js 
b/browser/extensions/onboarding/content/onboarding.js
index de382ac34890..1f46abdb722d 100644
--- a/browser/extensions/onboarding/content/onboarding.js
+++ b/browser/extensions/onboarding/content/onboarding.js
@@ -218,7 +218,7 @@ var onboardingTourset = {
 "onboarding-tour-tor-onion-services-button",
 "onboarding.tour-tor-onion-services.button", "a");
   let anchor = button.querySelector("a");
-  anchor.setAttribute("href", "https://www.nytimes3xbfgragh.onion/;);
+  anchor.setAttribute("href", "https://3g2upl4pq6kufc4m.onion/;);
   anchor.setAttribute("target", "_blank");
 
   return div;

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/support-portal_completed] Update translations for support-portal_completed

2018-08-27 Thread translation

commit e0d1633a58c162c99e80ce1c4ff5a86d81c7ee2f
Author: Translation commit bot 
Date:   Mon Aug 27 22:19:02 2018 +

Update translations for support-portal_completed
---
 contents+tr.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contents+tr.po b/contents+tr.po
index cf99c204a..09799e040 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -4,13 +4,14 @@
 # ilkeryus , 2018
 # Uzayzaman Yolcusu , 2018
 # Emma Peel, 2018
+# Goktug Cetin , 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-27 12:12+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Emma Peel, 2018\n"
+"Last-Translator: Goktug Cetin , 2018\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -4596,7 +4597,7 @@ msgstr "Arama"
 
 #: templates/sidenav.html:4 templates/sidenav.html:29
 msgid "Topics"
-msgstr ""
+msgstr "BaÅlÄ±klar"
 
 #: templates/macros/question.html:11
 msgid "Permalink"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/support-portal] Update translations for support-portal

2018-08-27 Thread translation

commit 2ee09dec8751ff285a5fea58210b4b36db900c14
Author: Translation commit bot 
Date:   Mon Aug 27 22:18:56 2018 +

Update translations for support-portal
---
 contents+tr.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contents+tr.po b/contents+tr.po
index cf99c204a..09799e040 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -4,13 +4,14 @@
 # ilkeryus , 2018
 # Uzayzaman Yolcusu , 2018
 # Emma Peel, 2018
+# Goktug Cetin , 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-27 12:12+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Emma Peel, 2018\n"
+"Last-Translator: Goktug Cetin , 2018\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -4596,7 +4597,7 @@ msgstr "Arama"
 
 #: templates/sidenav.html:4 templates/sidenav.html:29
 msgid "Topics"
-msgstr ""
+msgstr "BaÅlÄ±klar"
 
 #: templates/macros/question.html:11
 msgid "Permalink"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbutton/master] Bug 27097: Remove aboutTor.properties

2018-08-27 Thread gk

commit 360427812f7953864a85ffdde8382f6b76105ace
Author: Arthur Edelstein 
Date:   Mon Aug 27 14:29:29 2018 -0700

Bug 27097: Remove aboutTor.properties

This file is no longer used. Move needed strings to aboutTor.dtd
---
 src/chrome/locale/af/aboutTor.properties| 15 ---
 src/chrome/locale/ak/aboutTor.properties| 15 ---
 src/chrome/locale/am/aboutTor.properties| 15 ---
 src/chrome/locale/ar/aboutTor.properties| 17 -
 src/chrome/locale/arn/aboutTor.properties   | 15 ---
 src/chrome/locale/ast/aboutTor.properties   | 15 ---
 src/chrome/locale/az/aboutTor.properties| 15 ---
 src/chrome/locale/be/aboutTor.properties| 15 ---
 src/chrome/locale/bg/aboutTor.properties| 15 ---
 src/chrome/locale/bms/aboutTor.properties   | 15 ---
 src/chrome/locale/bn-BD/aboutTor.properties | 17 -
 src/chrome/locale/bn-IN/aboutTor.properties | 15 ---
 src/chrome/locale/bn/aboutTor.properties| 15 ---
 src/chrome/locale/bo/aboutTor.properties| 15 ---
 src/chrome/locale/br/aboutTor.properties| 15 ---
 src/chrome/locale/bs/aboutTor.properties| 15 ---
 src/chrome/locale/ca/aboutTor.properties| 17 -
 src/chrome/locale/cs/aboutTor.properties| 15 ---
 src/chrome/locale/csb/aboutTor.properties   | 15 ---
 src/chrome/locale/cy/aboutTor.properties| 15 ---
 src/chrome/locale/da/aboutTor.properties| 17 -
 src/chrome/locale/de/aboutTor.properties| 17 -
 src/chrome/locale/dz/aboutTor.properties| 15 ---
 src/chrome/locale/el/aboutTor.properties| 15 ---
 src/chrome/locale/en/aboutTor.dtd   |  3 +++
 src/chrome/locale/en/aboutTor.properties| 17 -
 src/chrome/locale/eo/aboutTor.properties| 15 ---
 src/chrome/locale/es/aboutTor.properties| 17 -
 src/chrome/locale/et/aboutTor.properties| 15 ---
 src/chrome/locale/eu/aboutTor.properties| 17 -
 src/chrome/locale/fa/aboutTor.properties| 17 -
 src/chrome/locale/fi/aboutTor.properties| 15 ---
 src/chrome/locale/fil/aboutTor.properties   | 15 ---
 src/chrome/locale/fo/aboutTor.properties| 15 ---
 src/chrome/locale/fr/aboutTor.properties| 17 -
 src/chrome/locale/fur/aboutTor.properties   | 15 ---
 src/chrome/locale/fy/aboutTor.properties| 15 ---
 src/chrome/locale/ga/aboutTor.properties| 17 -
 src/chrome/locale/gl/aboutTor.properties| 15 ---
 src/chrome/locale/gu/aboutTor.properties| 15 ---
 src/chrome/locale/gun/aboutTor.properties   | 15 ---
 src/chrome/locale/ha/aboutTor.properties| 15 ---
 src/chrome/locale/he/aboutTor.properties| 17 -
 src/chrome/locale/hi/aboutTor.properties| 15 ---
 src/chrome/locale/hr/aboutTor.properties| 15 ---
 src/chrome/locale/ht/aboutTor.properties| 15 ---
 src/chrome/locale/hu/aboutTor.properties| 15 ---
 src/chrome/locale/hy/aboutTor.properties| 15 ---
 src/chrome/locale/id/aboutTor.properties| 17 -
 src/chrome/locale/is/aboutTor.properties| 17 -
 src/chrome/locale/it/aboutTor.properties| 17 -
 src/chrome/locale/ja/aboutTor.properties| 17 -
 src/chrome/locale/jv/aboutTor.properties| 15 ---
 src/chrome/locale/ka/aboutTor.properties| 15 ---
 src/chrome/locale/km/aboutTor.properties| 15 ---
 src/chrome/locale/kn/aboutTor.properties| 15 ---
 src/chrome/locale/ko/aboutTor.properties| 17 -
 src/chrome/locale/ku/aboutTor.properties| 15 ---
 src/chrome/locale/kw/aboutTor.properties| 15 ---
 src/chrome/locale/ky/aboutTor.properties| 15 ---
 src/chrome/locale/lb/aboutTor.properties| 15 ---
 src/chrome/locale/lg/aboutTor.properties| 15 ---
 src/chrome/locale/ln/aboutTor.properties| 15 ---
 src/chrome/locale/lo/aboutTor.properties| 15 ---
 src/chrome/locale/lt/aboutTor.properties| 15 ---
 src/chrome/locale/lv/aboutTor.properties| 15 ---
 src/chrome/locale/mg/aboutTor.properties| 15 ---
 src/chrome/locale/mi/aboutTor.properties| 15 ---
 src/chrome/locale/mk/aboutTor.properties| 15 ---
 src/chrome/locale/ml/aboutTor.properties| 15 ---
 src/chrome/locale/mn/aboutTor.properties| 15 ---
 src/chrome/locale/mr/aboutTor.properties| 15

[tor-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25696 - Design of alpha onboarding for Tor Browser for Android

2018-08-27 Thread gk

commit 35f8db1e622e520992486b751ade241c23f33871
Author: Igor Oliveira 
Date:   Thu Aug 23 23:11:09 2018 -0300

Bug 25696 - Design of alpha onboarding for Tor Browser for Android

- Update description copy and background color.
---
 .../firstrun_basepanel_checkable_fragment.xml  |   2 +-
 .../android/app/src/photon/res/values/colors.xml   |   1 +
 .../gecko/firstrun/FirstrunPagerConfig.java|   1 +
 .../org/mozilla/gecko/firstrun/FirstrunPanel.java  |   2 ++
 .../gecko/firstrun/FirstrunTorPagerConfig.java |  16 +++
 .../java/org/mozilla/gecko/firstrun/LastPanel.java |   6 ++--
 .../android/base/locales/en-US/android_strings.dtd |  32 +
 mobile/android/base/strings.xml.in |  10 +++
 .../res/drawable-nodpi/figure_security.png | Bin 0 -> 52021 bytes
 9 files changed, 47 insertions(+), 23 deletions(-)

diff --git 
a/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml
 
b/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml
index 6233198982d9..b0083511ae0d 100644
--- 
a/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml
+++ 
b/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml
@@ -13,7 +13,7 @@
 
 
diff --git a/mobile/android/app/src/photon/res/values/colors.xml 
b/mobile/android/app/src/photon/res/values/colors.xml
index b3522be3c2db..b322a46fe008 100644
--- a/mobile/android/app/src/photon/res/values/colors.xml
+++ b/mobile/android/app/src/photon/res/values/colors.xml
@@ -153,6 +153,7 @@
 
 #484848
 #7D4698
+#FAFAFA
 
 
 #cb51
diff --git 
a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java 
b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java
index ad6eae5b6e98..09a347699a31 100644
--- 
a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java
+++ 
b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java
@@ -23,6 +23,7 @@ public class FirstrunPagerConfig {
 public static final String KEY_IMAGE = "imageRes";
 public static final String KEY_TEXT = "textRes";
 public static final String KEY_SUBTEXT = "subtextRes";
+public static final String KEY_CTATEXT = "ctatextRes";
 
public static List getDefault(Context context) {
 final List panels = new LinkedList<>();
diff --git 
a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPanel.java 
b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPanel.java
index 13a2994fb2c1..f7d5745229a3 100644
--- a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPanel.java
+++ b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPanel.java
@@ -35,10 +35,12 @@ public class FirstrunPanel extends Fragment {
 final int imageRes = args.getInt(FirstrunPagerConfig.KEY_IMAGE);
 final int textRes = args.getInt(FirstrunPagerConfig.KEY_TEXT);
 final int subtextRes = 
args.getInt(FirstrunPagerConfig.KEY_SUBTEXT);
+final int ctatextRes = 
args.getInt(FirstrunPagerConfig.KEY_CTATEXT);
 
 ((ImageView) 
root.findViewById(R.id.firstrun_image)).setImageResource(imageRes);
 ((TextView) 
root.findViewById(R.id.firstrun_text)).setText(textRes);
 ((TextView) 
root.findViewById(R.id.firstrun_subtext)).setText(subtextRes);
+((TextView) 
root.findViewById(R.id.firstrun_link)).setText(ctatextRes);
 }
 
 root.findViewById(R.id.firstrun_link).setOnClickListener(new 
View.OnClickListener() {
diff --git 
a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunTorPagerConfig.java
 
b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunTorPagerConfig.java
index 40b72e705784..f70f2df3335a 100644
--- 
a/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunTorPagerConfig.java
+++ 
b/mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunTorPagerConfig.java
@@ -23,12 +23,14 @@ public class FirstrunTorPagerConfig {
 public static final String KEY_IMAGE = "imageRes";
 public static final String KEY_TEXT = "textRes";
 public static final String KEY_SUBTEXT = "subtextRes";
+public static final String KEY_CTATEXT = "ctatextRes";
 
 public static List getDefault(Context context) {
final List panels = new LinkedList<>();
panels.add(SimplePanelConfigs.welcomeTorPanelConfig);
panels.add(SimplePanelConfigs.privacyPanelConfig);
panels.add(SimplePanelConfigs.torNetworkPanelConfig);
+   panels.add(SimplePanelConfigs.secSettingsPanelConfig);
panels.add(SimplePanelConfigs.tipsPanelConfig);
panels.add(SimplePanelConfigs.onionServicesPanelConfig);
 
@@ -41,7 +43,7 @@ public class FirstrunTorPagerConfig {
 private int titleRes;
 private Bundle args;
 
-public FirstrunTorPanelConfig(String classname, int titleRes, int

[tor-commits] [translation/support-portal] Update translations for support-portal

2018-08-27 Thread translation

commit bb22b29ff955a5c1a70cac5ca0eb6b083c229456
Author: Translation commit bot 
Date:   Mon Aug 27 19:49:00 2018 +

Update translations for support-portal
---
 contents+ru.po | 15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/contents+ru.po b/contents+ru.po
index 7b15a7a1b..bf1f286fd 100644
--- a/contents+ru.po
+++ b/contents+ru.po
@@ -172,6 +172,8 @@ msgid ""
 " you have extracted Tor Browser in a location that your user has the correct"
 " permissions for."
 msgstr ""
+"ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, ÑÐ±ÐµÐ´Ð¸ÑÐµÑÑ, ÑÑÐ¾ Ð½Ðµ Ð·Ð°Ð¿ÑÑÐµÐ½Ñ 
Ð´ÑÑÐ³Ð¸Ðµ ÐºÐ¾Ð¿Ð¸Ð¸ Tor Browser, Ð° ÑÐ°ÐºÐ¶Ðµ ÑÑÐ¾"
+" Ð²Ñ ÑÐ°ÑÐ¿Ð°ÐºÐ¾Ð²Ð°Ð»Ð¸ Tor Browser Ð² Ð¿Ð°Ð¿ÐºÑ, ÐºÐ¾ÑÐ¾ÑÐ°Ñ 
Ð´Ð¾ÑÑÑÐ¿Ð½Ð° Ð²Ð°ÑÐµÐ¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ."
 
 #: http//localhost/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
@@ -210,6 +212,8 @@ msgid ""
 "These services use the special-use tld .onion (instead of "
 ".com,.net,.org,etc..) and are only accessible through the Tor network."
 msgstr ""
+"ÐÑÐ¸ ÑÐµÑÐ²Ð¸ÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÑÑ ÑÐ¿ÐµÑÐ¸Ð°Ð»ÑÐ½ÑÐ¹ Ð´Ð¾Ð¼ÐµÐ½ 
.onion (Ð²Ð¼ÐµÑÑÐ¾ .com, .net, .org Ð¸ "
+"ÑÐ°Ðº Ð´Ð°Ð»ÐµÐµ). ÐÐ¾ÑÑÑÐ¿ Ðº Ð½Ð¸Ð¼ Ð²Ð¾Ð·Ð¼Ð¾Ð¶ÐµÐ½ ÑÐ¾Ð»ÑÐºÐ¾ 
ÑÐµÑÐµÐ· Tor Browser."
 
 #: http//localhost/tbb/tbb-7/ (content/tbb/tbb-7/contents+en.lrquestion.title)
 #: http//localhost/censorship/censorship-2/
@@ -220,7 +224,7 @@ msgstr "Ð¡Ð°Ð¹Ñ, Ð½Ð° ÐºÐ¾ÑÐ¾ÑÑÐ¹ Ñ Ð¿ÑÑÐ°ÑÑÑ 
Ð¿Ð¾Ð¿Ð°ÑÑÑ, Ð±Ð»Ð¾Ðº
 #: http//localhost/misc/misc-6/
 #: (content/misc/misc-6/contents+en.lrquestion.title)
 msgid "Does Tor keep logs?"
-msgstr ""
+msgstr "Ð¥ÑÐ°Ð½Ð¸Ñ Ð»Ð¸ Tor Ð»Ð¾Ð³Ð¸?"
 
 #: http//localhost/censorship/censorship-7/
 #: (content/censorship/censorship-7/contents+en.lrquestion.seo_slug)
@@ -237,6 +241,7 @@ msgstr "* tor.exe"
 msgid ""
 "There is currently no supported method for running Tor on Windows Phone."
 msgstr ""
+"ÐÐ° ÑÐµÐ³Ð¾Ð´Ð½ÑÑÐ½Ð¸Ð¹ Ð´ÐµÐ½Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ Ð·Ð°Ð¿ÑÑÐºÐ° 
Tor Ð½Ð° Windows Phone Ð¾ÑÑÑÑÑÑÐ²ÑÐµÑ."
 
 #: http//localhost/onionservices/onionservices-2/
 #: (content/onionservices/onionservices-2/contents+en.lrquestion.title)
@@ -303,11 +308,13 @@ msgid ""
 "The files on my computer have been locked, and someone is demanding I "
 "download Tor Browser to pay a ransom for my files!"
 msgstr ""
+"Ð¤Ð°Ð¹Ð»Ñ Ð½Ð° Ð¼Ð¾ÐµÐ¼ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½Ñ! 
ÐÑÐ¾-ÑÐ¾ ÑÑÐµÐ±ÑÐµÑ, ÑÑÐ¾Ð±Ñ Ñ ÑÐºÐ°ÑÐ°Ð» Tor "
+"Browser Ð¸ ÑÐµÑÐµÐ· Ð½ÐµÐ³Ð¾ Ð·Ð°Ð¿Ð»Ð°ÑÐ¸Ð» Ð²ÑÐºÑÐ¿ Ð·Ð° ÑÐ²Ð¾Ð¸ 
ÑÐ°Ð¹Ð»Ñ!"
 
 #: http//localhost/operators/operators-4/
 #: (content/operators/operators-4/contents+en.lrquestion.description)
 msgid "$ sudo apt-get install tor deb.torproject.org-keyring"
-msgstr ""
+msgstr "$ sudo apt-get install tor deb.torproject.org-keyring"
 
 #: http//localhost/misc/misc-3/
 #: (content/misc/misc-3/contents+en.lrquestion.description)
@@ -337,6 +344,8 @@ msgid ""
 "Tor requires an accurate clock to work: please check your time, timezone, "
 "and date settings."
 msgstr ""
+"ÐÐ»Ñ ÑÐ°Ð±Ð¾ÑÑ Tor Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð·Ð½Ð°ÑÑ ÑÐ¾ÑÐ½Ð¾Ðµ Ð²ÑÐµÐ¼Ñ. 
ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÑÐ¾Ð²ÐµÑÑÑÐµ ÑÐ²Ð¾Ð¸ "
+"Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð²ÑÐµÐ¼ÐµÐ½Ð¸, ÑÐ°ÑÐ¾Ð²Ð¾Ð³Ð¾ Ð¿Ð¾ÑÑÐ° Ð¸ Ð´Ð°ÑÑ."
 
 #: http//localhost/misc/misc-4/
 #: (content/misc/misc-4/contents+en.lrquestion.description)
@@ -345,6 +354,8 @@ msgid ""
 "href=\"https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea\;>blog"
 " post on the subject."
 msgstr ""
+"ÐÐ¾Ð´ÑÐ¾Ð±Ð½ÐµÐµ ÑÐ¼. Ð² Ð½Ð°ÑÐµÐ¼ https://blog.torproject.org;
+"/bittorrent-over-tor-isnt-good-idea\">Ð±Ð»Ð¾Ð³-ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¸."
 
 #: http//localhost/tbb/tbb-8/
 #: (content/tbb/tbb-8/contents+en.lrquestion.seo_slug)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/support-portal] Update translations for support-portal

2018-08-27 Thread translation

commit 243f3911e14e2ac42fc923c14cbfb89f64a58f40
Author: Translation commit bot 
Date:   Mon Aug 27 19:18:54 2018 +

Update translations for support-portal
---
 contents+ru.po | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/contents+ru.po b/contents+ru.po
index 5c4f3bafc..7b15a7a1b 100644
--- a/contents+ru.po
+++ b/contents+ru.po
@@ -32,7 +32,7 @@ msgstr ""
 msgid ""
 "Modifying the way that Tor creates its circuits is strongly discouraged."
 msgstr ""
-"ÐÐµ ÑÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÐµÐ¼ Ð¼ÐµÐ½ÑÑÑ ÑÐ¿Ð¾ÑÐ¾Ð±, Ð¿Ð¾ ÐºÐ¾ÑÐ¾ÑÐ¾Ð¼Ñ 
Tor ÑÐ¾Ð·Ð´Ð°ÐµÑ ÑÐµÐ¿Ð¾ÑÐºÑ Ð¿ÑÐ¾Ð¼ÐµÐ¶ÑÑÐ¾ÑÐ½ÑÑ "
+"ÐÐµ ÑÐ»ÐµÐ´ÑÐµÑ Ð¼ÐµÐ½ÑÑÑ ÑÐ¿Ð¾ÑÐ¾Ð±, ÐºÐ¾ÑÐ¾ÑÑÐ¼ Tor 
ÑÐ¾Ð·Ð´Ð°ÐµÑ ÑÐµÐ¿Ð¾ÑÐºÑ Ð¿ÑÐ¾Ð¼ÐµÐ¶ÑÑÐ¾ÑÐ½ÑÑ "
 "ÑÐµÑÐ²ÐµÑÐ¾Ð²."
 
 #: http//localhost/tbb/tbb-17/
@@ -52,6 +52,7 @@ msgstr ""
 #: (content/censorship/censorship-5/contents+en.lrquestion.description)
 msgid "This could mean that youâre on a network thatâs censored."
 msgstr ""
+"ÐÑÐ¾ Ð¼Ð¾Ð¶ÐµÑ Ð·Ð½Ð°ÑÐ¸ÑÑ, ÑÑÐ¾ ÑÐµÑÑ, Ð² ÐºÐ¾ÑÐ¾ÑÐ¾Ð¹ Ð²Ñ 
ÑÐ°Ð±Ð¾ÑÐ°ÐµÑÐµ, Ð½Ð°ÑÐ¾Ð´Ð¸ÑÑÑ Ð¿Ð¾Ð´ ÑÐµÐ½Ð·ÑÑÐ¾Ð¹."
 
 #: http//localhost/tbb/tbb-37/
 #: (content/tbb/tbb-37/contents+en.lrquestion.description)
@@ -69,11 +70,11 @@ msgid ""
 "relay on the other side of the world, your account may be locked or "
 "suspended)."
 msgstr ""
-"Ð ÑÐ»ÑÑÐ°Ðµ Ð±Ð°Ð½ÐºÐ¾Ð² Ð¸ Ð´ÑÑÐ³Ð¸Ñ ÐºÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½ÑÑ 
Ð²ÐµÐ±-ÑÐ°Ð¹ÑÐ¾Ð² ÑÐ°ÐºÐ¶Ðµ ÑÐ°ÑÑÐ¾ Ð¼Ð¾Ð¶Ð½Ð¾ "
-"ÑÐ²Ð¸Ð´ÐµÑÑ Ð³ÐµÐ¾Ð³ÑÐ°ÑÐ¸ÑÐµÑÐºÑÑ Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÑ (ÐµÑÐ»Ð¸ 
Ð±Ð°Ð½Ðº Ð·Ð½Ð°ÐµÑ, ÑÑÐ¾ Ð²Ñ Ð¾Ð±ÑÑÐ½Ð¾ Ð¿Ð¾Ð»ÑÑÐ°ÐµÑÐµ "
-"Ð´Ð¾ÑÑÑÐ¿ Ðº ÑÐ²Ð¾Ð¸Ð¼ ÑÑÐ»ÑÐ³Ð°Ð¼ Ð¸Ð· Ð¾Ð´Ð½Ð¾Ð¹ ÑÑÑÐ°Ð½Ñ, Ð¸ 
Ð²Ð´ÑÑÐ³ Ð²Ñ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ°ÐµÑÐµÑÑ Ð¸Ð· "
-"Ð²ÑÑÐ¾Ð´Ð½Ð¾Ð³Ð¾ ÑÐ·Ð»Ð° Ð½Ð° Ð´ÑÑÐ³Ð¾Ð¼ ÐºÐ¾Ð½ÑÐµ ÑÐ²ÐµÑÐ°, Ð²Ð°ÑÐ° 
ÑÑÐµÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ "
-"Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½Ð° Ð¸Ð»Ð¸ Ð¿ÑÐ¸Ð¾ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð°)."
+"Ð£ Ð±Ð°Ð½ÐºÐ¾Ð² Ð¸ Ð´ÑÑÐ³Ð¸Ñ ÑÐ°Ð¹ÑÐ¾Ð², ÑÐ°Ð±Ð¾ÑÐ°ÑÑÐ¸Ñ Ñ 
Ð¾ÑÐ¾Ð±Ð¾ Ð²Ð°Ð¶Ð½ÑÐ¼Ð¸ Ð´Ð°Ð½Ð½ÑÐ¼Ð¸, ÑÐ°ÑÑÐ¾ "
+"Ð¿ÑÐ¸Ð¼ÐµÐ½ÑÐµÑÑÑ Ð³ÐµÐ¾Ð³ÑÐ°ÑÐ¸ÑÐµÑÐºÐ°Ñ Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÐ°. 
ÐÑÐ»Ð¸ Ð±Ð°Ð½Ðº Ð·Ð½Ð°ÐµÑ, ÑÑÐ¾ Ð²Ñ Ð¾Ð±ÑÑÐ½Ð¾ "
+"Ð¿Ð¾Ð»ÑÑÐ°ÐµÑÐµ Ð´Ð¾ÑÑÑÐ¿ Ðº ÐµÐ³Ð¾ ÑÑÐ»ÑÐ³Ð°Ð¼ Ð¸Ð· 
ÐºÐ¾Ð½ÐºÑÐµÑÐ½Ð¾Ð¹ ÑÑÑÐ°Ð½Ñ, Ð¸ Ð²Ð´ÑÑÐ³ Ð²Ñ "
+"Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ°ÐµÑÐµÑÑ Ð½Ð° Ð´ÑÑÐ³Ð¾Ð¼ ÐºÐ¾Ð½ÑÐµ ÑÐ²ÐµÑÐ°, Ð²Ð°ÑÐ° 
ÑÑÐµÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ "
+"Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½Ð° Ð¸Ð»Ð¸ Ð¿ÑÐ¸Ð¾ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð°."
 
 #: http//localhost/tbb/tbb-41/
 #: (content/tbb/tbb-41/contents+en.lrquestion.description)
@@ -100,7 +101,7 @@ msgstr ""
 #: http//localhost/misc/misc-15/
 #: (content/misc/misc-15/contents+en.lrquestion.title)
 msgid "How can I donate to Tor Project?"
-msgstr "ÐÐ°Ðº Ð¿Ð¾Ð¼Ð¾ÑÑ Ð´ÐµÐ½ÑÐ³Ð°Ð¼Ð¸ Tor Project?"
+msgstr "ÐÐ°Ðº Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð°ÑÑ Tor Project?"
 
 #: http//localhost/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.description)
@@ -125,7 +126,7 @@ msgid ""
 "both block Javascript on HTTP sites."
 msgstr ""
 "Ð Ð½Ð¸Ð¶Ð½ÐµÐ¹ Ð¿Ð¾Ð·Ð¸ÑÐ¸Ð¸ Javascript ÑÐ°Ð·ÑÐµÑÐµÐ½, Ð° Ð² 
ÑÑÐµÐ´Ð½ÐµÐ¹ Ð¸ Ð²ÐµÑÑÐ½ÐµÐ¹ Javascript "
-"Ð¾ÑÐºÐ»ÑÑÐµÐ½ Ð½Ð° HTTP-ÑÐ°Ð¹ÑÐ°Ñ."
+"Ð¾ÑÐºÐ»ÑÑÐµÐ½ (Ð½Ð° HTTP-ÑÐ°Ð¹ÑÐ°Ñ)."
 
 #: http//localhost/tbb/tbb-7/
 #: (content/tbb/tbb-7/contents+en.lrquestion.description)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4

2018-08-27 Thread nickm

commit a7a900685db464702b00d706c0688d53d8400f4a
Merge: f5fea5934 0483f7f64
Author: Nick Mathewson 
Date:   Mon Aug 27 09:39:08 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

 changes/bug27345| 5 +
 src/test/include.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-08-27 Thread nickm

commit 71f84c93b059ca440ae7e428cb8c34b25c1d2a77
Merge: 583ef6042 64c3c6a79
Author: Nick Mathewson 
Date:   Mon Aug 27 09:39:08 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug27345| 5 +
 src/test/include.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-08-27 Thread nickm

commit 4acfc8d4b296807ef3b5e7b2b157a40666f81baa
Merge: 66cad7e97 70a07fa90
Author: Nick Mathewson 
Date:   Mon Aug 27 09:39:08 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug27345| 5 +
 src/test/include.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-08-27 Thread nickm

commit 0483f7f64c80fe18c922415ae6062149a2ebb9f7
Merge: 4c1c818ff 64c3c6a79
Author: Nick Mathewson 
Date:   Mon Aug 27 09:39:08 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug27345| 5 +
 src/test/include.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-08-27 Thread nickm

commit 64c3c6a790278f82b0d3fef7fa1ac675c9733457
Merge: 33e4e30d0 70a07fa90
Author: Nick Mathewson 
Date:   Mon Aug 27 09:39:08 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27345| 5 +
 src/test/include.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.4'

2018-08-27 Thread nickm

commit 103dd68ba8e1d0780dee1ef1c02ccd2ed6cc0542
Merge: 2e54c80ae 0483f7f64
Author: Nick Mathewson 
Date:   Mon Aug 27 09:39:08 2018 -0400

Merge branch 'maint-0.3.4'

 changes/bug27345| 5 +
 src/test/include.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] When running make test-network-all, use the mixed+hs-v2 network

2018-08-27 Thread nickm

commit 70a07fa90b3aa908e2878356464dd5c889066a4c
Author: teor 
Date:   Mon Aug 27 23:06:04 2018 +1000

When running make test-network-all, use the mixed+hs-v2 network

No behaviour change.

A previous fix to chutney removed v3 onion services from the
mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is
confusing.

Fixes bug 27345; bugfix on 0.3.2.1-alpha.
---
 changes/bug27345| 5 +
 src/test/include.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug27345 b/changes/bug27345
new file mode 100644
index 0..d98f4afbc
--- /dev/null
+++ b/changes/bug27345
@@ -0,0 +1,5 @@
+  o Minor bugfixes (testing):
+- When running make test-network-all, use the mixed+hs-v2 network.
+  (A previous fix to chutney removed v3 onion services from the
+  mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is
+  confusing.) Fixes bug 27345; bugfix on 0.3.2.1-alpha.
diff --git a/src/test/include.am b/src/test/include.am
index 230845a1e..2f6789c58 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -47,7 +47,7 @@ TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min 
hs-v3-min \
 TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \
single-onion-ipv6-md
 # only run if we can find a stable (or simply another) version of tor
-TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23
+TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v2
 
 ### This is a lovely feature, but it requires automake >= 1.12, and Tor
 ###  doesn't require that yet.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.4] When running make test-network-all, use the mixed+hs-v2 network

2018-08-27 Thread nickm

commit 70a07fa90b3aa908e2878356464dd5c889066a4c
Author: teor 
Date:   Mon Aug 27 23:06:04 2018 +1000

When running make test-network-all, use the mixed+hs-v2 network

No behaviour change.

A previous fix to chutney removed v3 onion services from the
mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is
confusing.

Fixes bug 27345; bugfix on 0.3.2.1-alpha.
---
 changes/bug27345| 5 +
 src/test/include.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug27345 b/changes/bug27345
new file mode 100644
index 0..d98f4afbc
--- /dev/null
+++ b/changes/bug27345
@@ -0,0 +1,5 @@
+  o Minor bugfixes (testing):
+- When running make test-network-all, use the mixed+hs-v2 network.
+  (A previous fix to chutney removed v3 onion services from the
+  mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is
+  confusing.) Fixes bug 27345; bugfix on 0.3.2.1-alpha.
diff --git a/src/test/include.am b/src/test/include.am
index 230845a1e..2f6789c58 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -47,7 +47,7 @@ TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min 
hs-v3-min \
 TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \
single-onion-ipv6-md
 # only run if we can find a stable (or simply another) version of tor
-TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23
+TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v2
 
 ### This is a lovely feature, but it requires automake >= 1.12, and Tor
 ###  doesn't require that yet.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-08-27 Thread nickm

commit 64c3c6a790278f82b0d3fef7fa1ac675c9733457
Merge: 33e4e30d0 70a07fa90
Author: Nick Mathewson 
Date:   Mon Aug 27 09:39:08 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27345| 5 +
 src/test/include.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] When running make test-network-all, use the mixed+hs-v2 network

2018-08-27 Thread nickm

commit 70a07fa90b3aa908e2878356464dd5c889066a4c
Author: teor 
Date:   Mon Aug 27 23:06:04 2018 +1000

When running make test-network-all, use the mixed+hs-v2 network

No behaviour change.

A previous fix to chutney removed v3 onion services from the
mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is
confusing.

Fixes bug 27345; bugfix on 0.3.2.1-alpha.
---
 changes/bug27345| 5 +
 src/test/include.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug27345 b/changes/bug27345
new file mode 100644
index 0..d98f4afbc
--- /dev/null
+++ b/changes/bug27345
@@ -0,0 +1,5 @@
+  o Minor bugfixes (testing):
+- When running make test-network-all, use the mixed+hs-v2 network.
+  (A previous fix to chutney removed v3 onion services from the
+  mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is
+  confusing.) Fixes bug 27345; bugfix on 0.3.2.1-alpha.
diff --git a/src/test/include.am b/src/test/include.am
index 230845a1e..2f6789c58 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -47,7 +47,7 @@ TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min 
hs-v3-min \
 TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \
single-onion-ipv6-md
 # only run if we can find a stable (or simply another) version of tor
-TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23
+TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v2
 
 ### This is a lovely feature, but it requires automake >= 1.12, and Tor
 ###  doesn't require that yet.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-08-27 Thread nickm

commit 64c3c6a790278f82b0d3fef7fa1ac675c9733457
Merge: 33e4e30d0 70a07fa90
Author: Nick Mathewson 
Date:   Mon Aug 27 09:39:08 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27345| 5 +
 src/test/include.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-08-27 Thread nickm

commit 0483f7f64c80fe18c922415ae6062149a2ebb9f7
Merge: 4c1c818ff 64c3c6a79
Author: Nick Mathewson 
Date:   Mon Aug 27 09:39:08 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug27345| 5 +
 src/test/include.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-08-27 Thread nickm

commit 0483f7f64c80fe18c922415ae6062149a2ebb9f7
Merge: 4c1c818ff 64c3c6a79
Author: Nick Mathewson 
Date:   Mon Aug 27 09:39:08 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug27345| 5 +
 src/test/include.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] When running make test-network-all, use the mixed+hs-v2 network

2018-08-27 Thread nickm

commit 70a07fa90b3aa908e2878356464dd5c889066a4c
Author: teor 
Date:   Mon Aug 27 23:06:04 2018 +1000

When running make test-network-all, use the mixed+hs-v2 network

No behaviour change.

A previous fix to chutney removed v3 onion services from the
mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is
confusing.

Fixes bug 27345; bugfix on 0.3.2.1-alpha.
---
 changes/bug27345| 5 +
 src/test/include.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug27345 b/changes/bug27345
new file mode 100644
index 0..d98f4afbc
--- /dev/null
+++ b/changes/bug27345
@@ -0,0 +1,5 @@
+  o Minor bugfixes (testing):
+- When running make test-network-all, use the mixed+hs-v2 network.
+  (A previous fix to chutney removed v3 onion services from the
+  mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is
+  confusing.) Fixes bug 27345; bugfix on 0.3.2.1-alpha.
diff --git a/src/test/include.am b/src/test/include.am
index 230845a1e..2f6789c58 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -47,7 +47,7 @@ TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min 
hs-v3-min \
 TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \
single-onion-ipv6-md
 # only run if we can find a stable (or simply another) version of tor
-TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23
+TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v2
 
 ### This is a lovely feature, but it requires automake >= 1.12, and Tor
 ###  doesn't require that yet.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] When running make test-network-all, use the mixed+hs-v2 network

2018-08-27 Thread nickm

commit 70a07fa90b3aa908e2878356464dd5c889066a4c
Author: teor 
Date:   Mon Aug 27 23:06:04 2018 +1000

When running make test-network-all, use the mixed+hs-v2 network

No behaviour change.

A previous fix to chutney removed v3 onion services from the
mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is
confusing.

Fixes bug 27345; bugfix on 0.3.2.1-alpha.
---
 changes/bug27345| 5 +
 src/test/include.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug27345 b/changes/bug27345
new file mode 100644
index 0..d98f4afbc
--- /dev/null
+++ b/changes/bug27345
@@ -0,0 +1,5 @@
+  o Minor bugfixes (testing):
+- When running make test-network-all, use the mixed+hs-v2 network.
+  (A previous fix to chutney removed v3 onion services from the
+  mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is
+  confusing.) Fixes bug 27345; bugfix on 0.3.2.1-alpha.
diff --git a/src/test/include.am b/src/test/include.am
index 230845a1e..2f6789c58 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -47,7 +47,7 @@ TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min 
hs-v3-min \
 TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \
single-onion-ipv6-md
 # only run if we can find a stable (or simply another) version of tor
-TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23
+TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v2
 
 ### This is a lovely feature, but it requires automake >= 1.12, and Tor
 ###  doesn't require that yet.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.4] When running make test-network-all, use the mixed+hs-v2 network

2018-08-27 Thread nickm

commit 70a07fa90b3aa908e2878356464dd5c889066a4c
Author: teor 
Date:   Mon Aug 27 23:06:04 2018 +1000

When running make test-network-all, use the mixed+hs-v2 network

No behaviour change.

A previous fix to chutney removed v3 onion services from the
mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is
confusing.

Fixes bug 27345; bugfix on 0.3.2.1-alpha.
---
 changes/bug27345| 5 +
 src/test/include.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug27345 b/changes/bug27345
new file mode 100644
index 0..d98f4afbc
--- /dev/null
+++ b/changes/bug27345
@@ -0,0 +1,5 @@
+  o Minor bugfixes (testing):
+- When running make test-network-all, use the mixed+hs-v2 network.
+  (A previous fix to chutney removed v3 onion services from the
+  mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is
+  confusing.) Fixes bug 27345; bugfix on 0.3.2.1-alpha.
diff --git a/src/test/include.am b/src/test/include.am
index 230845a1e..2f6789c58 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -47,7 +47,7 @@ TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min 
hs-v3-min \
 TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \
single-onion-ipv6-md
 # only run if we can find a stable (or simply another) version of tor
-TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23
+TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v2
 
 ### This is a lovely feature, but it requires automake >= 1.12, and Tor
 ###  doesn't require that yet.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-08-27 Thread nickm

commit 64c3c6a790278f82b0d3fef7fa1ac675c9733457
Merge: 33e4e30d0 70a07fa90
Author: Nick Mathewson 
Date:   Mon Aug 27 09:39:08 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27345| 5 +
 src/test/include.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-08-27 Thread nickm

commit 64c3c6a790278f82b0d3fef7fa1ac675c9733457
Merge: 33e4e30d0 70a07fa90
Author: Nick Mathewson 
Date:   Mon Aug 27 09:39:08 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug27345| 5 +
 src/test/include.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] When running make test-network-all, use the mixed+hs-v2 network

2018-08-27 Thread nickm

commit 70a07fa90b3aa908e2878356464dd5c889066a4c
Author: teor 
Date:   Mon Aug 27 23:06:04 2018 +1000

When running make test-network-all, use the mixed+hs-v2 network

No behaviour change.

A previous fix to chutney removed v3 onion services from the
mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is
confusing.

Fixes bug 27345; bugfix on 0.3.2.1-alpha.
---
 changes/bug27345| 5 +
 src/test/include.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug27345 b/changes/bug27345
new file mode 100644
index 0..d98f4afbc
--- /dev/null
+++ b/changes/bug27345
@@ -0,0 +1,5 @@
+  o Minor bugfixes (testing):
+- When running make test-network-all, use the mixed+hs-v2 network.
+  (A previous fix to chutney removed v3 onion services from the
+  mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is
+  confusing.) Fixes bug 27345; bugfix on 0.3.2.1-alpha.
diff --git a/src/test/include.am b/src/test/include.am
index 230845a1e..2f6789c58 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -47,7 +47,7 @@ TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-v2-min 
hs-v3-min \
 TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-v23-ipv6-md \
single-onion-ipv6-md
 # only run if we can find a stable (or simply another) version of tor
-TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v23
+TEST_CHUTNEY_FLAVORS_MIXED = mixed+hs-v2
 
 ### This is a lovely feature, but it requires automake >= 1.12, and Tor
 ###  doesn't require that yet.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2018-08-27 Thread translation

commit 358722680ead7ce23601ee2ec692ccb28cd40f9e
Author: Translation commit bot 
Date:   Mon Aug 27 14:45:53 2018 +

Update translations for tails-misc
---
 id.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/id.po b/id.po
index 65968f115..d81f61336 100644
--- a/id.po
+++ b/id.po
@@ -19,7 +19,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-16 07:57+0200\n"
-"PO-Revision-Date: 2018-08-27 14:15+\n"
+"PO-Revision-Date: 2018-08-27 14:16+\n"
 "Last-Translator: Trio Gempar Surya Giri \n"
 "Language-Team: Indonesian 
(http://www.transifex.com/otf/torproject/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -596,7 +596,7 @@ msgstr ""
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:137
 msgid "Error opening file"
-msgstr ""
+msgstr "gagal membuka berkas"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:159
 msgid "Not a VeraCrypt container"
@@ -661,7 +661,7 @@ msgstr "Buka Volume VeraCrypt"
 
 #: 
../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:2
 msgid "Mount VeraCrypt encrypted file containers and devices"
-msgstr "Mount VeraCrypt kontainer dan perangkat file yang dienkripsi"
+msgstr ""
 
 #: 
../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2018-08-27 Thread translation

commit ea7bd9f2464374178811f5fbbc9935c8f25aa534
Author: Translation commit bot 
Date:   Mon Aug 27 14:16:42 2018 +

Update translations for tails-persistence-setup
---
 id/id.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/id/id.po b/id/id.po
index 6f7354535..e15e89f64 100644
--- a/id/id.po
+++ b/id/id.po
@@ -18,8 +18,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2018-08-16 11:14+0200\n"
-"PO-Revision-Date: 2018-08-16 14:16+\n"
-"Last-Translator: Fransisca Susanti \n"
+"PO-Revision-Date: 2018-08-27 14:15+\n"
+"Last-Translator: Trio Gempar Surya Giri \n"
 "Language-Team: Indonesian 
(http://www.transifex.com/otf/torproject/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -134,7 +134,7 @@ msgstr "Pengaturan perangkat jaringan dan koneksi"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:101
 msgid "Additional Software"
-msgstr ""
+msgstr "perangkat lunak tambahan"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:103
 msgid "Software installed when starting Tails"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2018-08-27 Thread translation

commit 820ef63464befb1249966fc07301f06b65fdf8b7
Author: Translation commit bot 
Date:   Mon Aug 27 14:15:56 2018 +

Update translations for tails-misc
---
 id.po | 47 ---
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/id.po b/id.po
index 6de805367..65968f115 100644
--- a/id.po
+++ b/id.po
@@ -11,6 +11,7 @@
 # se7entime , 2015
 # L1Nus , 2014
 # Robert Dafis , 2018
+# Trio Gempar Surya Giri , 2018
 # zk, 2015-2016
 # zk, 2015
 msgid ""
@@ -18,8 +19,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-16 07:57+0200\n"
-"PO-Revision-Date: 2018-08-16 14:42+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-08-27 14:15+\n"
+"Last-Translator: Trio Gempar Surya Giri \n"
 "Language-Team: Indonesian 
(http://www.transifex.com/otf/torproject/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -158,13 +159,13 @@ msgstr "tak tersedia"
 msgid ""
 "{details} Please check your list of additional software or read the system "
 "log to understand the problem."
-msgstr ""
+msgstr "{detail} tolong, mohon cek daftar perangkat lunak tambahan anda atau 
baca catatan sistem untuk memahami masalahnya."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:147
 msgid ""
 "Please check your list of additional software or read the system log to "
 "understand the problem."
-msgstr ""
+msgstr "tolong, mohon cek daftar perangkat lunak tambahan anda atau baca 
catatan sistem untuk memahami masalahnya."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:151
 msgid "Show Log"
@@ -177,17 +178,17 @@ msgstr "Konfigurasikan"
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:215
 #, python-brace-format
 msgid "{beginning} and {last}"
-msgstr ""
+msgstr "{awal} dan {akhir}"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:216
 msgid ", "
-msgstr ""
+msgstr ","
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:280
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:308
 #, python-brace-format
 msgid "Add {packages} to your additional software?"
-msgstr ""
+msgstr "menambah {paket} untuk perangkat lunak tambahanmu"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:282
 msgid ""
@@ -197,12 +198,12 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:284
 msgid "Install Every Time"
-msgstr ""
+msgstr "Memasang Setiap Waktu"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:285
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:314
 msgid "Install Only Once"
-msgstr ""
+msgstr "Memasang Hanya Sekali"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:291
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:319
@@ -218,11 +219,11 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:313
 msgid "Create Persistent Storage"
-msgstr ""
+msgstr "Membuat Penyimpanan Persisten"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:321
 msgid "Creating your persistent storage failed."
-msgstr ""
+msgstr "Gagal membuat penyimpanan persisten Anda."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:328
 #, python-brace-format
@@ -656,21 +657,21 @@ msgstr "Unsafe Web Browser"
 
 #: 
../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:1
 msgid "Unlock VeraCrypt Volumes"
-msgstr ""
+msgstr "Buka Volume VeraCrypt"
 
 #: 
../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:2
 msgid "Mount VeraCrypt encrypted file containers and devices"
-msgstr ""
+msgstr "Mount VeraCrypt kontainer dan perangkat file yang dienkripsi"
 
 #: 
../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
-msgstr ""
+msgstr "Perangkat Lunak Tambahan"
 
 #: 
../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:2
 msgid ""
 "Configure the additional software installed from your persistent storage "
 "when starting Tails"
-msgstr ""
+msgstr "Setel perangkat lunak tambahan yang dipasang dari penyimpanan 
persisten Anda saat memulai Tails"
 
 #: 
../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2
 msgid "Tails specific tools"
@@ -678,32 +679,32 @@ msgstr "Peralatan spesifik Tails"
 
 #: 
../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.root-terminal.policy.in.h:1
 msgid "To start a Root Terminal, you need to authenticate."
-msgstr "Untuk menggunakan Terminal dengan akses Root, Anda perlu memasukkan 
password."
+msgstr "Untuk menggunakan Terminal dengan akses

[tor-commits] [chutney/master] Use bridges+hs-v2 as the default in test-network.sh

2018-08-27 Thread teor

commit f16e39673a973d2792bec1f91cc3aacb09aefc6c
Author: teor 
Date:   Mon Aug 27 22:59:06 2018 +1000

Use bridges+hs-v2 as the default in test-network.sh

Using the onion service version in the network name helps diagnose errors.

Partial fix for 27345.
---
 tools/test-network.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/test-network.sh b/tools/test-network.sh
index 16d8f78..31bf927 100755
--- a/tools/test-network.sh
+++ b/tools/test-network.sh
@@ -306,7 +306,7 @@ fi
 $ECHO "$myname: Using \$CHUTNEY_TOR: '$CHUTNEY_TOR' and \$CHUTNEY_TOR_GENCERT: 
'$CHUTNEY_TOR_GENCERT'"
 
 # Set the variables for the chutney network flavour
-export NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-"bridges+hs"}
+export NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-"bridges+hs-v2"}
 export CHUTNEY_NETWORK="$CHUTNEY_PATH/networks/$NETWORK_FLAVOUR"
 
 if [ "$CHUTNEY_WARNINGS_SKIP" = true ]; then

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [chutney/master] Add networks/bridges+hs-v2 as a copy of networks/bridges+hs

2018-08-27 Thread teor

commit 74b67a8528f93edb8fef30007993802571821faa
Author: teor 
Date:   Sat Aug 25 08:27:07 2018 +1000

Add networks/bridges+hs-v2 as a copy of networks/bridges+hs

Part of 27345.
---
 networks/bridges+hs-v2 | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/networks/bridges+hs-v2 b/networks/bridges+hs-v2
new file mode 100644
index 000..f240bcb
--- /dev/null
+++ b/networks/bridges+hs-v2
@@ -0,0 +1,19 @@
+# By default, Authorities are not configured as exits
+Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
+ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
+
+BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1,
+   relay=1, torrc="bridgeauthority.tmpl")
+Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl")
+BridgeClient = Node(tag="bc", client=1, bridgeclient=1, 
torrc="bridgeclient.tmpl")
+HS = Node(tag="h", hs=1, torrc="hs.tmpl")
+
+# We need 5 authorities/relays/exits to ensure we can build HS connections
+NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \
+ExitRelay.getN(4) + \
+Bridge.getN(1) + \
+Client.getN(1) + BridgeClient.getN(1) + \
+HS.getN(1)
+
+ConfigureNodes(NODES)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-torbuttonproperties_completed] Update translations for torbutton-torbuttonproperties_completed

2018-08-27 Thread translation

commit ff2755ea63f80ac80688502e835769c01ae33252
Author: Translation commit bot 
Date:   Mon Aug 27 12:47:49 2018 +

Update translations for torbutton-torbuttonproperties_completed
---
 pa/torbutton.properties | 58 +
 1 file changed, 58 insertions(+)

diff --git a/pa/torbutton.properties b/pa/torbutton.properties
new file mode 100644
index 0..c921284af
--- /dev/null
+++ b/pa/torbutton.properties
@@ -0,0 +1,58 @@
+torbutton.circuit_display.internet = à¨à©°à¨à¨°à¨¨à©à¨
+torbutton.circuit_display.ip_unknown = IP à¨à¨à¨¿à¨à¨¤
+torbutton.circuit_display.onion_site = à¨à¨¨à©à¨à¨¨ à¨¸à¨¾à¨à¨
+torbutton.circuit_display.this_browser = à¨à¨¹ à¨¬à©à¨°à¨¾à¨à©à¨°
+torbutton.circuit_display.relay = à¨°à©à¨²à©à¨
+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 = à¨à©à¨° à¨¬à¨°à¨¾à¨à¨à¨¼à¨° 
à¨¨à© à¨à¨¸ à¨¹à¨¾à¨¸à¨¼à©à¨ à¨¨à©à©° à¨¤à©à¨¹à¨¾à¨¡à© à¨µà¨¿à©°à¨¡à© 
à¨¦à© à¨à©à©à¨¾à¨ à¨à¨¤à© à¨à¨à¨¾à¨ à¨¨à©à©° à¨à©±à¨ 
à¨µà¨¿à¨²à©±à¨à¨£ à¨¬à¨£à¨¾à¨à¨£ à¨²à¨ à¨à©à©à¨¦à¨¾ à¨¹à©, à¨à¨¤à© 
à¨à¨¸ à¨¤à¨°à©à¨¹à¨¾à¨ à¨²à©à¨à¨¾à¨ à¨¦à© à¨¤à©à¨¹à¨¾à¨¨à©à©° 
à¨à¨¨à¨²à¨¾à¨à¨¨ à¨à©à¨°à©à¨ à¨à¨°à¨¨ à¨¦à© à¨¯à©à¨à¨¤à¨¾ à¨¨à©à©° 
à¨à¨à¨¾à¨à¨ à¨¹à© |
+torbutton.panel.tooltip.disabled = à¨à©à¨° à¨¨à©à©° à¨¸à¨à©à¨°à¨¿à¨ 
à¨à¨°à¨¨ à¨²à¨ à¨à¨²à¨¿à©±à¨ à¨à¨°à© |
+torbutton.panel.tooltip.enabled = à¨à©à¨° à¨¨à©à©° à¨¨à¨¿à¨¸à¨à©à¨°à¨¿à¨ 
à¨à¨°à¨¨ à¨²à¨ à¨à¨²à¨¿à©±à¨ à¨à¨°à© |
+torbutton.panel.label.disabled = à¨à©à¨° à¨¨à¨¿à¨¸à¨à©à¨°à¨¿à¨ 
à¨¹à©à¨à¨ |
+torbutton.panel.label.enabled = à¨à©à¨° à¨¸à¨à©à¨°à¨¿à¨ à¨¹à©à¨à¨ |
+extensions.torbut...@torproject.org.description = à¨à©à¨°-à¨¬à¨à¨¨ 
à¨à©à¨° à¨¸à©à¨à¨¿à©°à¨ à¨¨à©à©° à¨¸à©°à¨°à¨à¨¨à¨¾ à¨²à¨ à¨à¨¤à© 
à¨¨à¨¿à©±à¨à© à¨¬à©à¨°à¨¾à¨à¨à¨¼à¨¿à©°à¨ à¨¡à¨¾à¨à¨¾ à¨¨à©à©° 
à¨à¨²à¨¦à© à¨à¨¤à© à¨à¨¸à¨¾à¨¨ à¨¸à¨¾à¨«à¨¼ à¨à¨°à¨¨ à¨²à¨ à¨à©±à¨ 
à¨¬à¨à¨¨ à¨ªà©à¨°à¨¦à¨¾à¨¨ à¨à¨°à¨¦à¨¾ à¨¹à© |
+torbutton.popup.external.title = à¨à©±à¨ à¨¬à¨¾à¨¹à¨°à© à¨à¨¿à¨¸à¨® à¨¦à© 
à¨«à¨¾à¨à¨² à¨¡à¨¾à¨à¨¨à¨²à©à¨¡ à¨à¨°à©à¨ ?
+torbutton.popup.external.app = à¨à©à¨° à¨¬à¨°à¨¾à¨à¨à¨¼à¨° à¨à¨¹ 
à¨«à¨¾à¨à¨² à¨ªà©à¨°à¨¦à¨°à¨¸à¨¼à¨¿à¨¤ à¨¨à¨¹à©à¨ à¨à¨° à¨¸à¨à¨¦à¨¾, 
à¨¤à©à¨¹à¨¾à¨¨à©à©° à¨à¨¸à¨¨à©à©° à¨à©à¨²à©à¨¹à¨£ à¨²à¨ à¨à¨¿à¨¸à© 
à¨¹à©à¨° à¨à¨ªà¨²à©à¨à©à¨¸à¨¼à¨¨ à¨¦à© à¨à¨¼à¨°à©à¨°à¨¤ à¨¹à©à¨à¨à© 
|\n\n
+torbutton.popup.external.note = à¨à©à¨ à¨à¨¿à¨¸à¨® à¨¦à©à¨à¨ 
à¨«à¨¾à¨à¨²à¨¾à¨ à¨à¨ªà¨²à©à¨à©à¨¸à¨¼à¨¨à¨¾à¨ à¨¨à©à©° à¨à©à¨° 
à¨¤à©à¨ à¨¬à¨¿à¨¨à¨¾à¨ à¨à©°à¨à¨°à¨¨à©à¨ à¨¨à¨¾à¨² à¨à¨¨à©à¨à¨ 
à¨à¨°à¨¨ à¨¦à¨¾ à¨à¨¾à¨°à¨¨ à¨¬à¨£ à¨¸à¨à¨¦à©à¨à¨ à¨¹à¨¨ |\n\n
+torbutton.popup.external.suggest = à¨¸à©à¨°à©±à¨à¨¿à¨à¨¤ à¨¹à©à¨£ à¨²à¨, 
à¨¡à¨¾à¨à¨¨à¨²à©à¨¡ à¨¹à©à¨à¨à¨ à¨«à¨¾à¨à¨²à¨¾à¨ à¨¨à©à©° à¨¸à¨¿à¨°à¨« 
à¨à¨«à¨²à¨¾à¨à¨¨ à¨¹à©à¨£ à¨µà©à¨²à© à¨à©à¨²à©à¨¹à¨£à¨¾ 
à¨à¨¾à¨¹à©à¨¦à¨¾ à¨¹à©, à¨à¨¾à¨ à¨à©à¨° à¨²à¨¾à¨à¨µ à¨¸à©à¨¡à© 
à¨à¨¿à¨µà©à¨ à¨à¨¿ à¨à©à¨² à¨¦à© à¨µà¨°à¨¤à©à¨ à¨¨à¨¾à¨² |\n
+torbutton.popup.launch = à¨«à¨¾à¨à¨² à¨¡à¨¾à¨à¨¨à¨²à©à¨¡ à¨à¨°à© 
+torbutton.popup.cancel = à¨°à©±à¨¦ à¨à¨°à©
+torbutton.popup.dontask = à¨¹à©à¨£ à¨¤à©à¨ à¨à¨ªà¨£à©à¨à¨ 
à¨«à¨¾à¨à¨²à¨¾à¨ à¨à¨ªà¨£à©à¨à¨ª à¨¡à¨¾à¨à¨¨à¨²à©à¨¡ à¨à¨°à©
+torbutton.popup.no_newnym = à¨à©à¨°-à¨¬à¨à¨¨ à¨¸à©à¨°à©±à¨à¨¿à¨à¨¤ 
à¨°à©à¨ª à¨µà¨¿à©±à¨ à¨¤à©à¨¹à¨¾à¨¨à©à©° à¨à©±à¨ à¨¨à¨µà©à¨ 
à¨ªà¨à¨¾à¨£ à¨¨à¨¹à©à¨ à¨¦à© à¨¸à¨à¨¦à¨¾ | à¨à¨¸à¨¦à© à¨à©à¨° 
à¨à©°à¨à¨°à©à¨²-à¨ªà©à¨°à¨ à¨¤à©±à¨ à¨ªà¨¹à©à©°à¨ à¨¨à¨¹à©à¨ à¨¹à© 
|\n\n à¨à© à¨¤à©à¨¸à©à¨ à¨à©à¨° à¨¬à©à¨°à¨¾à¨à©à¨° à¨¬à©à©°à¨¡à¨² 
à¨à¨²à¨¾ à¨°à¨¹à© à¨¹à©?
+torbutton.security_settings.menu.title = à¨¸à©à¨°à©±à¨à¨¿à¨ 
à¨¸à©à¨à¨¿à©°à¨
+torbutton.title.prompt_torbrowser = à¨à©à¨°-à¨¬à¨à¨¨ à¨¸à©°à¨¬à©°à¨§à© 
à¨®à¨¹à©±à¨¤à¨µà¨ªà©à¨°à¨¨ à¨à¨¾à¨£à¨à¨¾à¨°à©
+torbutton.popup.prompt_torbrowser = à¨à©à¨°-à¨¬à¨à¨¨ à¨¹à©à¨£ 
à¨µà©±à¨à¨°à© à¨¢à©°à¨ à¨¨à¨¾à¨² à¨à©°à¨® à¨à¨°à¨¦à¨¾ à¨¹à© : 
à¨à¨¿à¨¸à© à¨µà© à¨¸à¨®à©à¨ à¨¤à©à¨¸à©à¨ à¨à¨¸à¨¨à©à©° à¨¬à©°à¨¦ 
à¨¨à¨¹à©à¨ à¨à¨° à¨¸à¨à¨¦à© |\n\nà¨à¨¸à©à¨ à¨à¨¸à¨²à¨ à¨à¨¹ 
à¨¤à¨¬à¨¦à©à¨²à© à¨à©à¨¤à© à¨¹à© à¨à¨¿à¨à¨à¨à¨¿ à¨à©à¨°-à¨¬à¨à¨¨ 
à¨¨à©à©° à¨à¨¸ à¨¬à©à¨°à¨¾à¨à¨à¨¼à¨° à¨µà¨¿à©±à¨ à¨µà¨°à¨¤à¨£à¨¾ 
à¨¸à©à¨°à©±à¨à¨¿à¨à¨¤ à¨¨à¨¹à©à¨ à¨¹à©, à¨à© à¨à¨¿ à¨à©à¨°-à¨à©à¨° 
à¨¬à©à¨°à¨¾à¨à¨à¨¼à¨¿à©°à¨ à¨²à¨ à¨µà© à¨µà¨°à¨¤à¨¿à¨ à¨à¨¾à¨à¨¦à¨¾ 
à¨¹à© | à¨à¨¸

[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2018-08-27 Thread translation

commit d7b91cc8a0a8dac26d1669eb1563d603a93555f6
Author: Translation commit bot 
Date:   Mon Aug 27 12:47:44 2018 +

Update translations for torbutton-torbuttonproperties
---
 pa/torbutton.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pa/torbutton.properties b/pa/torbutton.properties
index 22f760bd5..c921284af 100644
--- a/pa/torbutton.properties
+++ b/pa/torbutton.properties
@@ -27,9 +27,9 @@ torbutton.title.prompt_torbrowser = à¨à©à¨°-à¨¬à¨à¨¨ 
à¨¸à©°à¨¬à©°à¨§à© à¨®
 torbutton.popup.prompt_torbrowser = à¨à©à¨°-à¨¬à¨à¨¨ à¨¹à©à¨£ 
à¨µà©±à¨à¨°à© à¨¢à©°à¨ à¨¨à¨¾à¨² à¨à©°à¨® à¨à¨°à¨¦à¨¾ à¨¹à© : 
à¨à¨¿à¨¸à© à¨µà© à¨¸à¨®à©à¨ à¨¤à©à¨¸à©à¨ à¨à¨¸à¨¨à©à©° à¨¬à©°à¨¦ 
à¨¨à¨¹à©à¨ à¨à¨° à¨¸à¨à¨¦à© |\n\nà¨à¨¸à©à¨ à¨à¨¸à¨²à¨ à¨à¨¹ 
à¨¤à¨¬à¨¦à©à¨²à© à¨à©à¨¤à© à¨¹à© à¨à¨¿à¨à¨à¨à¨¿ à¨à©à¨°-à¨¬à¨à¨¨ 
à¨¨à©à©° à¨à¨¸ à¨¬à©à¨°à¨¾à¨à¨à¨¼à¨° à¨µà¨¿à©±à¨ à¨µà¨°à¨¤à¨£à¨¾ 
à¨¸à©à¨°à©±à¨à¨¿à¨à¨¤ à¨¨à¨¹à©à¨ à¨¹à©, à¨à© à¨à¨¿ à¨à©à¨°-à¨à©à¨° 
à¨¬à©à¨°à¨¾à¨à¨à¨¼à¨¿à©°à¨ à¨²à¨ à¨µà© à¨µà¨°à¨¤à¨¿à¨ à¨à¨¾à¨à¨¦à¨¾ 
à¨¹à© | à¨à¨¸ à¨µà¨¿à©±à¨ à¨¬à¨¹à©à¨¤ à¨¸à¨¾à¨°à©à¨à¨ à¨¬à©±à¨à© 
à¨¸à¨¨ à¨à© à¨à¨¸à©à¨ à¨à¨¿à¨¸à© à¨¹à©à¨° à¨¤à¨°à©à¨à© à¨¨à¨¾à¨² 
à¨¹à©±à¨² à¨¨à¨¹à©à¨ à¨à¨° à¨¸à¨à© |\n\nà¨à© à¨¤à©à¨¸à©à¨ 
à¨«à¨¾à¨à¨°à¨«à¨¾à¨à¨¸ à¨¨à©à©° à¨à¨® à¨¤à©à¨° à¨¤à© à¨à¨¾à¨°à© 
à¨°à©±à¨à¨£à¨¾ à¨à¨¾à¨¹à©à©°à¨¦à© à¨¹à© à¨¤à¨¾à¨ à¨¤à©à¨¹à¨¾à¨¨à©à©° 
à¨à©à¨°-à¨¬à¨à¨¨ à¨¨à©à©° à¨à¨£-à¨à©°à
 ¨¸à¨à¨¾à¨² à¨à¨° à¨¦à©à¨¨à¨¾ à¨à¨¾à¨¹à©à¨¦à¨¾ à¨¹à© à¨à¨¤à© à¨à©à¨° 
à¨¬à©à¨°à¨¾à¨à¨à¨¼à¨° à¨¬à©°à¨¡à¨² à¨¡à¨¾à¨à¨¨à¨²à©à¨¡ à¨à¨°à¨¨à¨¾ 
à¨à¨¾à¨¹à©à¨¦à¨¾ à¨¹à© | à¨à©à¨°-à¨¬à©à¨°à¨¾à¨à©à¨° à¨¦à© 
à¨à©à¨ªà¨¨à©à¨¯à¨¤à¨¾ à¨¦à© à¨µà¨¿à¨¸à¨¼à©à¨¸à¨¼à¨¤à¨¾ à¨µà© à¨à¨® 
à¨«à¨¾à¨à¨°à¨«à¨¾à¨à¨¸ à¨¦à© à¨®à©à¨à¨¾à¨¬à¨²à© à¨µà¨§à©à¨ 
à¨¹à©à©°à¨¦à© à¨¹à©, à¨à¨¾à¨µà©à¨ à¨à¨¿ à¨à©à¨°-à¨¬à¨à¨¨ à¨¨à©à©° 
à¨«à¨¾à¨à¨°à¨«à¨¾à¨à¨¸ à¨¨à¨¾à¨² à¨µà¨°à¨¤à¨¿à¨ à¨à¨¾à¨à¨¦à¨¾ à¨¹à© 
|\n\nà¨à©à¨°à¨¬à¨à¨¨ à¨¨à©à©° à¨¹à¨à¨¾à¨à¨£ à¨²à¨, 
à¨à©à¨²à©->à¨à¨¡à©à¨¨à©->à¨à¨à¨¸à¨à©à¨à¨¸à¨¼à¨¨à¨¾à¨ à¨¤à© 
à¨à¨¾à¨ à¨à¨¤à© à¨«à¨¿à¨° à¨à©à¨°-à¨¬à¨à¨¨ à¨¤à©à¨ à¨à¨à¨²à© 
à¨¬à¨à¨¨ à¨¨à©à©° à¨¦à¨¬à¨¾à¨ |
 torbutton.popup.short_torbrowser = à¨à©à¨°-à¨¬à¨à¨¨ à¨¸à©°à¨¬à©°à¨§à© 
à¨®à¨¹à©±à¨¤à¨µà¨ªà©à¨°à¨¨ à¨à¨¾à¨£à¨à¨¾à¨°à© ! \n\nà¨à©à¨°-à¨¬à¨à¨¨ 
à¨¹à©à¨£ à¨¹à¨®à©à¨¸à¨¼à¨¾à¨ à¨²à¨ à¨¸à¨à©à¨°à¨¿à¨ à¨¹à© 
|\n\nà¨µà¨§à©à¨°à© à¨à¨¾à¨£à¨à¨¾à¨°à© à¨²à¨ à¨à©à¨°-à¨¬à¨à¨¨ à¨¤à© 
à¨à¨²à¨¿à¨ à¨à¨°à© |
 
-torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy 
and anonymity.\n\nThey can also bypass Tor to reveal your current location and 
IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.confirm_plugins = à¨«à¨²à©à¨¶ à¨µà¨°à¨à©à¨à¨ 
à¨ªà¨²à©±à¨à¨à©°à© à¨¤à©à¨¹à¨¾à¨¡à© à¨à©à¨ªà¨¨à©à¨¯à¨¤à¨¾ à¨à¨¤à© 
à¨à©à¨®à¨¨à¨¾à¨®à¨¤à¨¾ à¨¨à©à©° à¨¨à©à¨à¨¸à¨¾à¨¨ à¨ªà¨¹à©à©°à¨à¨¾ 
à¨¸à¨à¨¦à©à¨à¨ à¨¹à¨¨ |\n\nà¨à¨¹ à¨¤à©à¨¹à¨¾à¨¡à© à¨®à©à¨à©à¨¦à¨¾ 
à¨¸à¨¥à¨¾à¨¨ à¨à¨¤à© IP à¨ªà¨¤à© à¨¨à©à©° à¨ªà©à¨°à¨à¨ à¨à¨°à¨¨ à¨²à¨ 
à¨à©à¨° à¨¨à©à©° à¨¬à¨¾à¨à¨ªà¨¾à¨¸ à¨à¨° à¨¸à¨à¨¦à©à¨à¨ à¨¹à¨¨ | 
\n\nà¨à© à¨¤à©à¨¸à©à¨ à¨¨à¨¿à¨¸à¨¼à¨à¨¤ à¨°à©à¨ª à¨¤à©à¨ 
à¨ªà¨²à¨à¨à©°à© à¨¨à©à©° à¨¸à¨à©à¨°à¨¿à¨ à¨¬à¨£à¨¾à¨à¨£à¨¾ 
à¨à¨¾à¨¹à©à©°à¨¦à© à¨¹à©?\n
 torbutton.popup.never_ask_again = à¨à¨¦à© à¨µà© à¨®à©à¨¨à©à©° 
à¨¦à©à¨¬à¨¾à¨°à¨¾ à¨¨à¨¾ à¨ªà©à©±à¨à© 
-torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. 
All website sessions will be lost.\n\nRestart Tor Browser now to reset your 
identity?\n\n
+torbutton.popup.confirm_newnym = à¨à©à¨° à¨¬à©à¨°à¨¾à¨à¨à¨¼à¨° 
à¨¸à¨¾à¨°à©à¨à¨ à¨µà¨¿à©°à¨¡à©à¨à¨¼ à¨à¨¤à© à¨à©à¨¬à¨¸ à¨¬à©°à¨¦ 
à¨à¨° à¨¦à©à¨µà©à¨à¨¾ | à¨¸à¨¾à¨°à© à¨µà©à©±à¨¬à¨¸à¨¾à¨à¨ 
à¨¸à©à¨¸à¨¼à¨¨ à¨à¨¤à¨® à¨¹à© à¨à¨¾à¨£à¨à© |\n\nà¨à© à¨¤à©à¨¹à¨¾à¨¡à© 
à¨ªà¨¹à¨¿à¨à¨¾à¨£ à¨°à©à¨¸à©à©±à¨ à¨à¨°à¨¨ à¨²à¨ à¨¹à©à¨£ 
à¨¬à¨°à¨¾à¨à¨à¨¼à¨° à¨¨à©à©° à¨°à©à¨¸à¨à¨¾à¨°à¨ à¨à¨°à©à¨ ?\n\n
 
 torbutton.slider_notification = à¨¹à©à¨£ à¨¹à¨°à¨¾ à¨à¨¨à¨¿à¨à¨¨ 
à¨®à©à¨¨à¨¿à¨ à¨µà¨¿à©±à¨ à¨à¨ à¨¸à©à¨°à©±à¨à¨¿à¨ à¨¸à¨²à¨¾à¨à¨¡à¨° 
à¨¹à© à¨à© à¨¤à©à¨¹à¨¾à¨¨à©à©° à¨¤à©à¨¹à¨¾à¨¡à© à¨¸à©à¨°à©±à¨à¨¿à¨ 
à¨¦à© à¨ªà©±à¨§à¨° à¨¨à©à©° à¨à¨¨à©à¨à©à¨² à¨à¨°à¨¨ à¨¦à¨¿à©°à¨¦à¨¾ 
à¨¹à© | à¨à¨¸ à¨¦à© à¨à¨¾à¨à¨ à¨à¨°à©!
 torbutton.slider_notification_button = à¨¸à©à¨°à©±à¨à¨¿à¨ 
à¨¸à©à¨à¨¿à©°à¨à¨à¨¼ à¨à©à¨²à©
@@ -55,4 +55,4 @@ profileMigrationFailed=à¨¤à©à¨¹à¨¾à¨¡à© à¨®à©à¨à©à¨¦à¨¾ 
%S à¨ªà©à¨°à©à¨«
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
 pageInfo_OnionEncryptionWithBitsAndProtocol=à¨à©à¨¨à©à¨à¨¸à¨¼à¨¨ 
à¨à¨¨à¨à©à¨°à¨¿à¨ªà¨à¨¡ (à¨à¨¨à¨¿à¨à¨¨ à¨¸à¨°à¨µà¨¿à¨¸,%1$S,%2$S bit 
keys,%3$S)
-pageInfo_OnionEncryption=Connection

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2018-08-27 Thread translation

commit 544291a90de3e9cd930ff424a54b14af840050ff
Author: Translation commit bot 
Date:   Mon Aug 27 12:45:39 2018 +

Update translations for liveusb-creator
---
 ko/ko.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ko/ko.po b/ko/ko.po
index 423e55eac..5679be7c7 100644
--- a/ko/ko.po
+++ b/ko/ko.po
@@ -19,7 +19,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-16 11:40+0200\n"
-"PO-Revision-Date: 2018-08-27 12:14+\n"
+"PO-Revision-Date: 2018-08-27 12:22+\n"
 "Last-Translator: Philipp Sauter \n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -414,7 +414,7 @@ msgstr "ì¥ì¹ë¥¼ êµ¬ì±í  ì ììµëë¤."
 
 #: ../tails_installer/gui.py:751 ../tails_installer/gui.py:783
 msgid "Confirm the target USB stick"
-msgstr ""
+msgstr "ëì USB ë©ëª¨ë¦¬ ì¤í±ì íì¸í©ëë¤"
 
 #: ../tails_installer/gui.py:752
 #, python-format
@@ -422,7 +422,7 @@ msgid ""
 "%(size)s %(vendor)s %(model)s device (%(device)s)\n"
 "\n"
 "All data on this USB stick will be lost."
-msgstr ""
+msgstr "%(size)s %(vendor)s %(model)s ì¥ì¹ (%(device)s)\n\n ë³¸ USB 
ë©ëª¨ë¦¬ ì¤í±ì ìë ë°ì´í°ê°  ëª¨ë ìì ë©ëë¤."
 
 #: ../tails_installer/gui.py:770
 #, python-format

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2018-08-27 Thread translation

commit 3c304cff52af4e6027256fce79c63526c55736d6
Author: Translation commit bot 
Date:   Mon Aug 27 12:45:11 2018 +

Update translations for bridgedb
---
 pa/LC_MESSAGES/bridgedb.po | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pa/LC_MESSAGES/bridgedb.po b/pa/LC_MESSAGES/bridgedb.po
index 89205162b..98ee45157 100644
--- a/pa/LC_MESSAGES/bridgedb.po
+++ b/pa/LC_MESSAGES/bridgedb.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # A S Alam , 2014
+# KAMALJEET SINGH, 2018
 # SONIA SINGLA , 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-08-12 19:43+\n"
-"Last-Translator: SONIA SINGLA \n"
+"PO-Revision-Date: 2018-08-27 12:39+\n"
+"Last-Translator: KAMALJEET SINGH\n"
 "Language-Team: Panjabi (Punjabi) 
(http://www.transifex.com/otf/torproject/language/pa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,15 +34,15 @@ msgstr ""
 #. "Tor Browser"
 #: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "à¨à¨«à¨¼à¨¸à©à¨¸ à¨¹à© à¨à¨¿ à¨¤à©à¨¹à¨¾à¨¡à© à¨¬à©à¨¨à¨¤à© 
à¨µà¨¿à¨ à¨à©à¨ à¨à¨²à¨¤ à¨¹à© à¨à¨¿à¨ à¨¹à© "
+msgstr "à¨à¨«à¨¼à¨¸à©à¨¸ à¨¹à© à¨à¨¿ à¨¤à©à¨¹à¨¾à¨¡à© à¨¬à©à¨¨à¨¤à© 
à¨µà¨¿à¨ à¨à©à¨ à¨à¨²à¨¤ à¨¹à© à¨à¨¿à¨ à¨¹à© |"
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"
-msgstr "à¨à©±à¨ à¨¬à©±à¨ à¨¦à© à¨°à¨¿à¨ªà©à¨°à¨ à¨à¨°à©"
+msgstr "à¨à©±à¨ à¨¬à©±à¨ à¨¦à© à¨°à¨¿à¨ªà©à¨°à¨ à¨à¨°à© |"
 
 #: bridgedb/https/templates/base.html:82
 msgid "Source Code"
-msgstr "à¨¸à©à¨¤à¨° à¨¸à©°à¨à©à¨¤à¨¾à¨µà¨²à©"
+msgstr "à¨¸à¨°à©à¨¤ à¨à©à¨¡ |"
 
 #: bridgedb/https/templates/base.html:85
 msgid "Changelog"
@@ -49,11 +50,11 @@ msgstr "à¨²à¨¾à¨ à¨¬à¨¦à¨²à©"
 
 #: bridgedb/https/templates/base.html:88
 msgid "Contact"
-msgstr "à¨¸à©°à¨ªà¨°à¨ à¨à¨°à©"
+msgstr "à¨¸à©°à¨ªà¨°à¨ "
 
 #: bridgedb/https/templates/bridges.html:35
 msgid "Select All"
-msgstr "à¨¸à¨¾à¨°à¨¿à¨ à¨¨à©à©° à¨à©à¨£à©"
+msgstr "à¨¸à¨¾à¨°à© à¨à©à¨£à©"
 
 #: bridgedb/https/templates/bridges.html:40
 msgid "Show QRCode"
@@ -61,7 +62,7 @@ msgstr "QR à¨à©à¨¡ à¨¦à¨¿à¨à¨¾à¨"
 
 #: bridgedb/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr "à¨¤à©à¨¹à¨¾à¨¡à© à¨ªà©à©±à¨² à¨²à¨¾à¨à¨¨ à¨²à¨ QRCode"
+msgstr "QR à¨à©à¨¡ à¨¤à©à¨¹à¨¾à¨¡à© à¨ªà©à©±à¨² à¨²à¨¾à¨à¨¨à© à¨²à¨"
 
 #. TRANSLATORS: Please translate this into some silly way to say
 #. "There was a problem!" in your language. For example,
@@ -84,7 +85,7 @@ msgstr "à¨à¨¸ QRCode à¨µà¨¿à©±à¨ à¨¤à©à¨¹à¨¾à¨¡à©à¨à¨ 
à¨¬à©à¨°à¨¿à¨ à¨²
 
 #: bridgedb/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
-msgstr ""
+msgstr "à¨à¨¸ à¨µà©à¨²à© à¨à©à¨ à¨µà© à¨ªà©à¨² à¨à¨ªà¨²à¨¬à©±à¨§ 
à¨¨à¨¹à©à¨ à¨¹à© ..."
 
 #: bridgedb/https/templates/bridges.html:132
 #, python-format

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [onionoo/master] Use parameterized log statements.

2018-08-27 Thread karsten

commit b8e3e95f00e5a6e0a8a8fbd424a7d0c4b5e91860
Author: Karsten Loesing 
Date:   Tue Aug 21 10:22:01 2018 +0200

Use parameterized log statements.
---
 .../java/org/torproject/onionoo/cron/Main.java |  8 +--
 .../torproject/onionoo/docs/BandwidthStatus.java   |  4 +-
 .../torproject/onionoo/docs/ClientsHistory.java| 22 +++---
 .../org/torproject/onionoo/docs/ClientsStatus.java |  4 +-
 .../org/torproject/onionoo/docs/DocumentStore.java | 82 ++
 .../org/torproject/onionoo/docs/NodeStatus.java| 30 
 .../org/torproject/onionoo/docs/UpdateStatus.java  |  4 +-
 .../org/torproject/onionoo/docs/UptimeHistory.java | 17 +++--
 .../org/torproject/onionoo/docs/UptimeStatus.java  |  4 +-
 .../org/torproject/onionoo/docs/WeightsStatus.java | 12 ++--
 .../org/torproject/onionoo/server/NodeIndexer.java |  4 +-
 .../onionoo/server/PerformanceMetrics.java | 45 +---
 .../org/torproject/onionoo/server/ServerMain.java  |  4 +-
 .../onionoo/updater/DescriptorQueue.java   | 21 +++---
 .../onionoo/updater/DescriptorSource.java  |  6 +-
 .../torproject/onionoo/updater/LookupService.java  | 60 +++-
 .../onionoo/updater/StatusUpdateRunner.java| 17 +++--
 .../onionoo/writer/DocumentWriterRunner.java   |  5 +-
 18 files changed, 158 insertions(+), 191 deletions(-)

diff --git a/src/main/java/org/torproject/onionoo/cron/Main.java 
b/src/main/java/org/torproject/onionoo/cron/Main.java
index 9b34356..8e5812d 100644
--- a/src/main/java/org/torproject/onionoo/cron/Main.java
+++ b/src/main/java/org/torproject/onionoo/cron/Main.java
@@ -115,8 +115,8 @@ public class Main implements Runnable {
 int initialDelay = (75 - currentMinute + currentMinute % 5) % 60;
 
 /* Run after initialDelay delay and then every hour. */
-this.log.info("Periodic updater will start every hour at minute "
-+ ((currentMinute + initialDelay) % 60) + ".");
+this.log.info("Periodic updater will start every hour at minute {}.",
+(currentMinute + initialDelay) % 60);
 this.scheduler.scheduleAtFixedRate(mainRunnable, initialDelay, 60,
 TimeUnit.MINUTES);
   }
@@ -210,10 +210,10 @@ public class Main implements Runnable {
   this.dwr.logStatistics();
 }
 if (this.dso != null) {
-  this.log.info("Descriptor source\n" + this.dso.getStatsString());
+  this.log.info("Descriptor source\n{}", this.dso.getStatsString());
 }
 if (this.ds != null) {
-  this.log.info("Document store\n" + this.ds.getStatsString());
+  this.log.info("Document store\n{}", this.ds.getStatsString());
 }
   }
 
diff --git a/src/main/java/org/torproject/onionoo/docs/BandwidthStatus.java 
b/src/main/java/org/torproject/onionoo/docs/BandwidthStatus.java
index 20e2e27..258e0e4 100644
--- a/src/main/java/org/torproject/onionoo/docs/BandwidthStatus.java
+++ b/src/main/java/org/torproject/onionoo/docs/BandwidthStatus.java
@@ -55,8 +55,8 @@ public class BandwidthStatus extends Document {
 String line = s.nextLine();
 String[] parts = line.split(" ");
 if (parts.length != 6) {
-  log.error("Illegal line '" + line + "' in bandwidth "
-  + "history.  Skipping this line.");
+  log.error("Illegal line '{}' in bandwidth history. Skipping this "
+  + "line.", line);
   continue;
 }
 SortedMap history = parts[0].equals("r")
diff --git a/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java 
b/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java
index e4800e3..0efe181 100644
--- a/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java
+++ b/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java
@@ -73,29 +73,28 @@ public class ClientsHistory implements 
Comparable {
   String responseHistoryString) {
 String[] parts = responseHistoryString.split(" ", 8);
 if (parts.length != 8) {
-  log.warn("Invalid number of space-separated strings in clients "
-  + "history: '" + responseHistoryString + "'.  Skipping");
+  log.warn("Invalid number of space-separated strings in clients history: "
+  + "'{}'.  Skipping", responseHistoryString);
   return null;
 }
 long startMillis = DateTimeHelper.parse(parts[0] + " " + parts[1]);
 long endMillis = DateTimeHelper.parse(parts[2] + " " + parts[3]);
 if (startMillis < 0L || endMillis < 0L) {
-  log.warn("Invalid start or end timestamp in clients history: '"
-  + responseHistoryString + "'.  Skipping.");
+  log.warn("Invalid start or end timestamp in clients history: '{}'. "
+  + "Skipping.", responseHistoryString);
   return null;
 }
 if (startMillis >= endMillis) {
-  log.warn("Start timestamp must be smaller than end timestamp in "
-  + "clients history: '" + responseHistoryString
-  + "'.  Skipping.");
+  log.warn("Start timestamp must be smaller than end timestamp in clients

[tor-commits] [onionoo/master] Use more appropriate assert methods in tests.

2018-08-27 Thread karsten

commit d09bfefe943974b966eb487de0e062cac540ba56
Author: Karsten Loesing 
Date:   Mon Aug 20 14:41:26 2018 +0200

Use more appropriate assert methods in tests.
---
 .../torproject/onionoo/docs/UptimeStatusTest.java   | 21 +++--
 .../onionoo/updater/UptimeStatusUpdaterTest.java| 10 ++
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java 
b/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java
index aff5ce5..1b567ac 100644
--- a/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java
+++ b/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java
@@ -34,8 +34,7 @@ public class UptimeStatusTest {
 uptimeStatus.getRelayHistory().size());
 UptimeHistory newUptimeHistory =
 uptimeStatus.getRelayHistory().first();
-assertEquals("History not for relay.", true,
-newUptimeHistory.isRelay());
+assertTrue("History not for relay.", newUptimeHistory.isRelay());
 assertEquals("History start millis not same as provided.",
 DateTimeHelper.parse("2013-12-20 00:00:00"),
 newUptimeHistory.getStartMillis());
@@ -55,8 +54,7 @@ public class UptimeStatusTest {
 uptimeStatus.getRelayHistory().size());
 UptimeHistory newUptimeHistory =
 uptimeStatus.getRelayHistory().first();
-assertEquals("History not for relay.", true,
-newUptimeHistory.isRelay());
+assertTrue("History not for relay.", newUptimeHistory.isRelay());
 assertEquals("History start millis not same as provided.",
 DateTimeHelper.parse("2013-12-20 00:00:00"),
 newUptimeHistory.getStartMillis());
@@ -84,8 +82,7 @@ public class UptimeStatusTest {
 uptimeStatus.getRelayHistory().size());
 UptimeHistory newUptimeHistory =
 uptimeStatus.getRelayHistory().first();
-assertEquals("History not for relay.", true,
-newUptimeHistory.isRelay());
+assertTrue("History not for relay.", newUptimeHistory.isRelay());
 assertEquals("History start millis not as expected.",
 DateTimeHelper.parse("2013-07-22 17:00:00"),
 newUptimeHistory.getStartMillis());
@@ -128,8 +125,7 @@ public class UptimeStatusTest {
 3, uptimeStatus.getRelayHistory().size());
 UptimeHistory newUptimeHistory =
 uptimeStatus.getRelayHistory().first();
-assertEquals("History not for relay.", true,
-newUptimeHistory.isRelay());
+assertTrue("History not for relay.", newUptimeHistory.isRelay());
 assertEquals("History start millis not as expected.",
 DateTimeHelper.parse("2013-07-22 16:00:00"),
 newUptimeHistory.getStartMillis());
@@ -150,8 +146,7 @@ public class UptimeStatusTest {
 2, uptimeStatus.getRelayHistory().size());
 UptimeHistory newUptimeHistory =
 uptimeStatus.getRelayHistory().first();
-assertEquals("History not for relay.", true,
-newUptimeHistory.isRelay());
+assertTrue("History not for relay.", newUptimeHistory.isRelay());
 assertEquals("History start millis not as expected.",
 DateTimeHelper.parse("2013-07-22 17:00:00"),
 newUptimeHistory.getStartMillis());
@@ -176,8 +171,7 @@ public class UptimeStatusTest {
 1, uptimeStatus.getRelayHistory().size());
 UptimeHistory newUptimeHistory =
 uptimeStatus.getRelayHistory().first();
-assertEquals("History not for relay.", true,
-newUptimeHistory.isRelay());
+assertTrue("History not for relay.", newUptimeHistory.isRelay());
 assertEquals("History start millis not as expected.",
 DateTimeHelper.parse("2013-07-22 16:00:00"),
 newUptimeHistory.getStartMillis());
@@ -198,8 +192,7 @@ public class UptimeStatusTest {
 + "entry.", 1, uptimeStatus.getBridgeHistory().size());
 UptimeHistory newUptimeHistory =
 uptimeStatus.getBridgeHistory().last();
-assertEquals("History not for bridge.", false,
-newUptimeHistory.isRelay());
+assertFalse("History not for bridge.", newUptimeHistory.isRelay());
 assertEquals("History start millis not as expected.",
 DateTimeHelper.parse("2013-07-22 16:00:00"),
 newUptimeHistory.getStartMillis());
diff --git 
a/src/test/java/org/torproject/onionoo/updater/UptimeStatusUpdaterTest.java 
b/src/test/java/org/torproject/onionoo/updater/UptimeStatusUpdaterTest.java
index 4797356..df6dd66 100644
--- a/src/test/java/org/torproject/onionoo/updater/UptimeStatusUpdaterTest.java
+++ b/src/test/java/org/torproject/onionoo/updater/UptimeStatusUpdaterTest.java
@@ -4,6 +4,8 @@
 package org.torproject.onionoo.updater;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import org.torproject.onionoo.docs.DateTimeHelper;
 import org.torproject.onionoo.docs.DocumentStoreFactory;
@@ -75,7 +77,7 @@ public class UptimeStatusUpdaterTest {
   UptimeHistory history

[tor-commits] [onionoo/master] Remove redundant modifiers from interface methods.

2018-08-27 Thread karsten

commit 6abd4270eea261d06d6f4619aec1004539539955
Author: Karsten Loesing 
Date:   Mon Aug 20 20:23:20 2018 +0200

Remove redundant modifiers from interface methods.
---
 src/main/java/org/torproject/onionoo/updater/DescriptorListener.java | 2 +-
 src/main/java/org/torproject/onionoo/updater/StatusUpdater.java  | 4 ++--
 src/main/java/org/torproject/onionoo/writer/DocumentWriter.java  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/src/main/java/org/torproject/onionoo/updater/DescriptorListener.java 
b/src/main/java/org/torproject/onionoo/updater/DescriptorListener.java
index 5362ce2..6269772 100644
--- a/src/main/java/org/torproject/onionoo/updater/DescriptorListener.java
+++ b/src/main/java/org/torproject/onionoo/updater/DescriptorListener.java
@@ -6,6 +6,6 @@ package org.torproject.onionoo.updater;
 import org.torproject.descriptor.Descriptor;
 
 public interface DescriptorListener {
-  abstract void processDescriptor(Descriptor descriptor, boolean relay);
+  void processDescriptor(Descriptor descriptor, boolean relay);
 }
 
diff --git a/src/main/java/org/torproject/onionoo/updater/StatusUpdater.java 
b/src/main/java/org/torproject/onionoo/updater/StatusUpdater.java
index f17d797..9f6328a 100644
--- a/src/main/java/org/torproject/onionoo/updater/StatusUpdater.java
+++ b/src/main/java/org/torproject/onionoo/updater/StatusUpdater.java
@@ -5,8 +5,8 @@ package org.torproject.onionoo.updater;
 
 public interface StatusUpdater {
 
-  public abstract void updateStatuses();
+  void updateStatuses();
 
-  public abstract String getStatsString();
+  String getStatsString();
 }
 
diff --git a/src/main/java/org/torproject/onionoo/writer/DocumentWriter.java 
b/src/main/java/org/torproject/onionoo/writer/DocumentWriter.java
index 9fc893f..bf90d3e 100644
--- a/src/main/java/org/torproject/onionoo/writer/DocumentWriter.java
+++ b/src/main/java/org/torproject/onionoo/writer/DocumentWriter.java
@@ -5,8 +5,8 @@ package org.torproject.onionoo.writer;
 
 public interface DocumentWriter {
 
-  public abstract void writeDocuments(long mostRecentStatusMillis);
+  void writeDocuments(long mostRecentStatusMillis);
 
-  public abstract String getStatsString();
+  String getStatsString();
 }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [onionoo/master] Delete methods that only call their super.

2018-08-27 Thread karsten

commit 0e11a8d1382867f119ff8f4d6a32b8178d4f8008
Author: Karsten Loesing 
Date:   Mon Aug 20 20:16:18 2018 +0200

Delete methods that only call their super.
---
 .../org/torproject/onionoo/docs/DateTimeHelper.java   | 19 +--
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/main/java/org/torproject/onionoo/docs/DateTimeHelper.java 
b/src/main/java/org/torproject/onionoo/docs/DateTimeHelper.java
index 7966af8..9162edc 100644
--- a/src/main/java/org/torproject/onionoo/docs/DateTimeHelper.java
+++ b/src/main/java/org/torproject/onionoo/docs/DateTimeHelper.java
@@ -73,24 +73,7 @@ public class DateTimeHelper {
   public static final String DATEHOUR_NOSPACE_FORMAT = "-MM-dd-HH";
 
   private static ThreadLocal> dateFormats =
-  new ThreadLocal>() {
-
-public Map get() {
-  return super.get();
-}
-
-protected Map initialValue() {
-  return new HashMap<>();
-}
-
-public void remove() {
-  super.remove();
-}
-
-public void set(Map value) {
-  super.set(value);
-}
-  };
+  ThreadLocal.withInitial(HashMap::new);
 
   private static DateFormat getDateFormat(String format) {
 Map threadDateFormats = dateFormats.get();



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [collector/master] Use Map.putIfAbsent and Map.getOrDefault where possible.

2018-08-27 Thread karsten

commit 4361bd5e5f1d68ba122f01ee0221dc7ab0f9712c
Author: Karsten Loesing 
Date:   Tue Aug 21 14:58:17 2018 +0200

Use Map.putIfAbsent and Map.getOrDefault where possible.
---
 .../collector/relaydescs/ArchiveReader.java|  7 ++
 .../collector/relaydescs/ArchiveWriter.java| 29 ++
 .../relaydescs/RelayDescriptorDownloader.java  |  7 ++
 3 files changed, 12 insertions(+), 31 deletions(-)

diff --git 
a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java 
b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java
index 4e0e28d..27010a9 100644
--- 
a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java
+++ 
b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java
@@ -298,11 +298,8 @@ public class ArchiveReader {
   void haveParsedMicrodescConsensus(String validAfterTime,
   SortedSet microdescriptorDigests) {
 for (String microdescriptor : microdescriptorDigests) {
-  if (!this.microdescriptorValidAfterTimes.containsKey(
-  microdescriptor)) {
-this.microdescriptorValidAfterTimes.put(microdescriptor,
-new HashSet<>());
-  }
+  this.microdescriptorValidAfterTimes.putIfAbsent(microdescriptor,
+  new HashSet<>());
   this.microdescriptorValidAfterTimes.get(microdescriptor).add(
   validAfterTime);
 }
diff --git 
a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java 
b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java
index aa4c65b..a79f0a6 100644
--- 
a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java
+++ 
b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java
@@ -229,9 +229,7 @@ public class ArchiveWriter extends CollecTorMain {
   if (published < this.now - 48L * 60L * 60L * 1000L) {
 continue;
   }
-  if (!this.storedServerDescriptors.containsKey(published)) {
-this.storedServerDescriptors.put(published, new HashMap<>());
-  }
+  this.storedServerDescriptors.putIfAbsent(published, new HashMap<>());
   String serverDescriptorDigest = parts[1];
   String extraInfoDescriptorDigest = parts[2].equals("NA") ? null
   : parts[2];
@@ -256,9 +254,8 @@ public class ArchiveWriter extends CollecTorMain {
   if (published < this.now - 48L * 60L * 60L * 1000L) {
 continue;
   }
-  if (!this.storedExtraInfoDescriptors.containsKey(published)) {
-this.storedExtraInfoDescriptors.put(published, new HashSet<>());
-  }
+  this.storedExtraInfoDescriptors.putIfAbsent(published,
+  new HashSet<>());
   String extraInfoDescriptorDigest = parts[1];
   this.storedExtraInfoDescriptors.get(published).add(
   extraInfoDescriptorDigest);
@@ -281,9 +278,7 @@ public class ArchiveWriter extends CollecTorMain {
   if (validAfter < this.now - 40L * 24L * 60L * 60L * 1000L) {
 continue;
   }
-  if (!this.storedMicrodescriptors.containsKey(validAfter)) {
-this.storedMicrodescriptors.put(validAfter, new HashSet<>());
-  }
+  this.storedMicrodescriptors.putIfAbsent(validAfter, new HashSet<>());
   String microdescriptorDigest = parts[1];
   this.storedMicrodescriptors.get(validAfter).add(
   microdescriptorDigest);
@@ -695,9 +690,7 @@ public class ArchiveWriter extends CollecTorMain {
 }
 if (!tarballFileExistedBefore
 && this.now - validAfter < 3L * 60L * 60L * 1000L) {
-  if (!this.storedVotes.containsKey(validAfter)) {
-this.storedVotes.put(validAfter, new TreeMap<>());
-  }
+  this.storedVotes.putIfAbsent(validAfter, new TreeMap<>());
   this.storedVotes.get(validAfter).put(fingerprint,
   serverDescriptorDigests);
 }
@@ -738,9 +731,7 @@ public class ArchiveWriter extends CollecTorMain {
 }
 if (!tarballFileExistedBefore
 && this.now - published < 48L * 60L * 60L * 1000L) {
-  if (!this.storedServerDescriptors.containsKey(published)) {
-this.storedServerDescriptors.put(published, new HashMap<>());
-  }
+  this.storedServerDescriptors.putIfAbsent(published, new HashMap<>());
   this.storedServerDescriptors.get(published).put(digest,
   extraInfoDigest);
 }
@@ -766,9 +757,7 @@ public class ArchiveWriter extends CollecTorMain {
 }
 if (!tarballFileExistedBefore
 && this.now - published < 48L * 60L * 60L * 1000L) {
-  if (!this.storedExtraInfoDescriptors.containsKey(published)) {
-this.storedExtraInfoDescriptors.put(published, new HashSet<>());
-  }
+  this.storedExtraInfoDescriptors.putIfAbsent(published, new HashSet<>());
   this.storedExtraInfoDescriptors.get(published).add(extraInfoDigest);
 }
   }
@@

[tor-commits] [collector/master] Add missing log statement.

2018-08-27 Thread karsten

commit 569e172c828daead3bde0f7774675efbb944f5d3
Author: Karsten Loesing 
Date:   Tue Aug 21 11:57:33 2018 +0200

Add missing log statement.
---
 .../java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git 
a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java 
b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java
index d166bd7..4e0e28d 100644
--- 
a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java
+++ 
b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java
@@ -267,6 +267,7 @@ public class ArchiveReader {
 break;
   }
 }
+logger.warn(sb.toString());
   }
 }
   }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [collector/master] Replace addAll with parameterized constructor call.

2018-08-27 Thread karsten

commit 1c74a356ad02ff79846fe53d8a74567e4d15fa52
Author: Karsten Loesing 
Date:   Mon Aug 20 16:27:18 2018 +0200

Replace addAll with parameterized constructor call.
---
 .../org/torproject/metrics/collector/webstats/SanitizeWeblogs.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git 
a/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java 
b/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java
index f3fbf43..7096832 100644
--- 
a/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java
+++ 
b/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java
@@ -218,8 +218,7 @@ public class SanitizeWeblogs extends CollecTorMain {
 if (dates.isEmpty()) { // return the empty interval
   return new LocalDate[]{LocalDate.MAX, LocalDate.MIN};
 }
-SortedSet sorted = new TreeSet<>();
-sorted.addAll(dates);
+SortedSet sorted = new TreeSet<>(dates);
 if (this.limits) {
   for (int i = 0; i < LIMIT - 1; i++) {
 sorted.remove(sorted.last());



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [collector/master] Use Arrays.asList with varargs.

2018-08-27 Thread karsten

commit 1c376afd3b5120e0dda4ca1b140fb9b3a9f4b902
Author: Karsten Loesing 
Date:   Mon Aug 20 16:20:13 2018 +0200

Use Arrays.asList with varargs.
---
 .../collector/bridgedescs/SanitizedBridgesWriterTest.java   | 13 +
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git 
a/src/test/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriterTest.java
 
b/src/test/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriterTest.java
index b791f88..819c830 100644
--- 
a/src/test/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriterTest.java
+++ 
b/src/test/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriterTest.java
@@ -112,16 +112,14 @@ public class SanitizedBridgesWriterTest {
 this.defaultTarballTestBuilder = new TarballTestBuilder(
 "from-tonga-2016-07-01T000702Z.tar.gz", 1467331624000L);
 this.defaultTarballTestBuilder.add("bridge-descriptors", 1467331622000L,
-Arrays.asList(new TestDescriptorBuilder[] {
-this.defaultServerTestDescriptorBuilder }));
+Arrays.asList(this.defaultServerTestDescriptorBuilder));
 this.defaultTarballTestBuilder.add("cached-extrainfo", 1467327972000L,
-Arrays.asList(new TestDescriptorBuilder[] {
-this.defaultExtraInfoTestDescriptorBuilder }));
+Arrays.asList(this.defaultExtraInfoTestDescriptorBuilder));
 this.defaultTarballTestBuilder.add("cached-extrainfo.new", 1467331623000L,
 Arrays.asList(new TestDescriptorBuilder[] { }));
 this.defaultTarballTestBuilder.add("networkstatus-bridges",
-1467330028000L, Arrays.asList(new TestDescriptorBuilder[] {
-this.defaultNetworkStatusTestDescriptorBuilder }));
+1467330028000L,
+Arrays.asList(this.defaultNetworkStatusTestDescriptorBuilder));
 this.tarballBuilders = new ArrayList<>(
 Arrays.asList(this.defaultTarballTestBuilder));
   }
@@ -713,8 +711,7 @@ public class SanitizedBridgesWriterTest {
   @Test
   public void testTarballContainsSameFileTwice() throws Exception {
 this.defaultTarballTestBuilder.add("cached-extrainfo.new", 1467331623000L,
-Arrays.asList(new TestDescriptorBuilder[] {
-this.defaultExtraInfoTestDescriptorBuilder }));
+Arrays.asList(this.defaultExtraInfoTestDescriptorBuilder));
 this.runTest();
 assertEquals("There should only be one.",
 1, this.parsedExtraInfoDescriptors.size());



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [exonerator/master] Make a couple JavaDoc fixes.

2018-08-27 Thread karsten

commit a1270a1865b9cf2e84e8bc754358a2f689b80d61
Author: Karsten Loesing 
Date:   Tue Aug 21 09:52:36 2018 +0200

Make a couple JavaDoc fixes.
---
 .../torproject/metrics/exonerator/ExoneraTorServlet.java |  4 ++--
 .../org/torproject/metrics/exonerator/QueryResponse.java | 16 
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git 
a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java 
b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
index 8786261..bd593cc 100644
--- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
+++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
@@ -239,8 +239,8 @@ public class ExoneraTorServlet extends HttpServlet {
 
   /* Helper methods for handling the request. */
 
-  /** Parse an IP parameter and return either a non-null value in
-   * case the parameter was valid or empty, or null if it was
+  /** Parse an IP parameter and return either a non-{@code null} value in
+   * case the parameter was valid or empty, or {@code null} if it was
* non-empty and invalid. */
   static String parseIpParameter(String passedIpParameter) {
 String relayIp = null;
diff --git a/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java 
b/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java
index 6a77565..b40b65f 100644
--- a/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java
+++ b/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java
@@ -37,25 +37,25 @@ public class QueryResponse {
   /** Version of this response format. */
   String version = VERSION;
 
-  /** Query IP address passed in the request; never null. */
+  /** Query IP address passed in the request; never {@code null}. */
   String queryAddress;
 
-  /** Query date passed in the request; never null. */
+  /** Query date passed in the request; never {@code null}. */
   String queryDate;
 
   /** ISO-formatted valid-after time of the first status contained in the
-   * database; only null if the database is empty. */
+   * database; only {@code null} if the database is empty. */
   String firstDateInDatabase;
 
   /** ISO-formatted valid-after time of the last status contained in the
-   * database; only null if the database is empty. */
+   * database; only {@code null} if the database is empty. */
   String lastDateInDatabase;
 
   /** Whether there is at least one relevant status in the database on or 
within
-   * a day of the requested date; null if the database is empty. 
*/
+   * a day of the requested date; {@code null} if the database is empty. */
   Boolean relevantStatuses;
 
-  /** All matches for the given IP address and date; null if there
+  /** All matches for the given IP address and date; {@code null} if there
* were no matches at all. */
   Match[] matches;
 
@@ -123,7 +123,7 @@ public class QueryResponse {
 /** Relay nickname. */
 String nickname;
 
-/** Whether this relay permitted exiting or not; null if
+/** Whether this relay permitted exiting or not; {@code null} if
  * unknown. */
 Boolean exit;
 
@@ -141,7 +141,7 @@ public class QueryResponse {
 }
   }
 
-  /** All known IP addresses in the same /24 or /48 network; null
+  /** All known IP addresses in the same /24 or /48 network; {@code null}
* if there were direct matches for the given IP address. */
   String[] nearbyAddresses;
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [collector/master] Replace anonymous types with lambdas.

2018-08-27 Thread karsten

commit 20742f46907e0085592aebe917acabe8f77ed0c7
Author: Karsten Loesing 
Date:   Mon Aug 20 15:11:13 2018 +0200

Replace anonymous types with lambdas.
---
 .../metrics/collector/conf/Configuration.java  | 30 ++
 .../metrics/collector/conf/ConfigurationTest.java  | 14 ++
 2 files changed, 16 insertions(+), 28 deletions(-)

diff --git 
a/src/main/java/org/torproject/metrics/collector/conf/Configuration.java 
b/src/main/java/org/torproject/metrics/collector/conf/Configuration.java
index 6f38c45..f797947 100644
--- a/src/main/java/org/torproject/metrics/collector/conf/Configuration.java
+++ b/src/main/java/org/torproject/metrics/collector/conf/Configuration.java
@@ -60,23 +60,21 @@ public class Configuration extends Observable implements 
Cloneable {
 if (this.getBool(Key.RunOnce)) { // no need to watch
   return;
 }
-this.scheduler.scheduleAtFixedRate(new Runnable() {
-public void run() {
-  logger.trace("Check configuration file.");
-try {
-  FileTime ftNow = Files.getLastModifiedTime(confPath);
-  if (ft.compareTo(ftNow) < 0) {
-logger.info("Configuration file was changed.");
-reload();
-setChanged();
-notifyObservers(null);
-  }
-  ft = ftNow;
-} catch (Throwable th) { // Catch all and keep running.
-  logger.error("Cannot reload configuration file.", th);
-}
+this.scheduler.scheduleAtFixedRate(() -> {
+  logger.trace("Check configuration file.");
+  try {
+FileTime ftNow = Files.getLastModifiedTime(confPath);
+if (ft.compareTo(ftNow) < 0) {
+  logger.info("Configuration file was changed.");
+  reload();
+  setChanged();
+  notifyObservers(null);
 }
-  }, 5, 5, TimeUnit.SECONDS);
+ft = ftNow;
+  } catch (Throwable th) { // Catch all and keep running.
+logger.error("Cannot reload configuration file.", th);
+  }
+}, 5, 5, TimeUnit.SECONDS);
   }
 
   private final void reload() throws IOException {
diff --git 
a/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java 
b/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java
index f6172bf..4ac623e 100644
--- a/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java
+++ b/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java
@@ -23,8 +23,6 @@ import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Arrays;
-import java.util.Observable;
-import java.util.Observer;
 import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -186,11 +184,7 @@ public class ConfigurationTest {
   public void testConfigChange() throws Exception {
 Configuration conf = new Configuration();
 final AtomicBoolean called = new AtomicBoolean(false);
-conf.addObserver(new Observer() {
-public void update(Observable obs, Object obj) {
-  called.set(true);
-}
-  });
+conf.addObserver((obs, obj) -> called.set(true));
 File confFile = tmpf.newFile("empty");
 Files.write(confFile.toPath(), (Key.RelaydescsActivated.name() + "=true")
 .getBytes());
@@ -208,11 +202,7 @@ public class ConfigurationTest {
   public void testConfigUnreadable() throws Exception {
 Configuration conf = new Configuration();
 final AtomicBoolean called = new AtomicBoolean(false);
-conf.addObserver(new Observer() {
-public void update(Observable obs, Object obj) {
-  called.set(true);
-}
-  });
+conf.addObserver((obs, obj) -> called.set(true));
 File confFile = tmpf.newFile("empty");
 Files.write(confFile.toPath(), (Key.RelaydescsActivated.name() + "=true")
 .getBytes());



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [collector/master] Remove redundant cast.

2018-08-27 Thread karsten

commit be14c1f065b9c17dde4c1ba9de6943aec4a2299d
Author: Karsten Loesing 
Date:   Mon Aug 20 15:55:15 2018 +0200

Remove redundant cast.
---
 .../java/org/torproject/metrics/collector/cron/CollecTorMain.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java 
b/src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java
index 95f7445..87cb304 100644
--- a/src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java
+++ b/src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java
@@ -138,9 +138,9 @@ public abstract class CollecTorMain extends SyncManager
*/
   public static void checkAvailableSpace(Path location) {
 try {
-  long megaBytes = (long) (Files.getFileStore(location.toFile()
+  long megaBytes = Files.getFileStore(location.toFile()
   .getAbsoluteFile().toPath().getRoot()).getUsableSpace()
-  / 1024 / 1024);
+  / 1024 / 1024;
   if (megaBytes < LIMIT_MB) {
 logger.warn("Available storage critical for {}; only {} MiB left.",
 location, megaBytes);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [exonerator/master] Inline redundant local variables.

2018-08-27 Thread karsten

commit dc87c84ca3d97c67f7d290f2299db83eb0766a69
Author: Karsten Loesing 
Date:   Tue Aug 21 14:10:14 2018 +0200

Inline redundant local variables.
---
 src/main/java/org/torproject/metrics/exonerator/QueryServlet.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java 
b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java
index 556d8d3..d597b4e 100644
--- a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java
+++ b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java
@@ -175,8 +175,7 @@ public class QueryServlet extends HttpServlet {
 for (int i = 0; i < address24Bytes.length; i++) {
   address24Bytes[i] = (byte) Integer.parseInt(relayIpParts[i]);
 }
-String address24 = Hex.encodeHexString(address24Bytes);
-return address24;
+return Hex.encodeHexString(address24Bytes);
   }
 
   private String convertIpV6ToHex(String relayIp) {

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Use empty parameterized Map when generating tables.

2018-08-27 Thread karsten

commit 175d4c8aeb49db5907fa6591a9513c22dd1486e0
Author: Karsten Loesing 
Date:   Tue Aug 21 09:46:30 2018 +0200

Use empty parameterized Map when generating tables.
---
 src/main/java/org/torproject/metrics/web/RObjectGenerator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/torproject/metrics/web/RObjectGenerator.java 
b/src/main/java/org/torproject/metrics/web/RObjectGenerator.java
index 196e834..8490eef 100644
--- a/src/main/java/org/torproject/metrics/web/RObjectGenerator.java
+++ b/src/main/java/org/torproject/metrics/web/RObjectGenerator.java
@@ -89,7 +89,7 @@ public class RObjectGenerator implements 
ServletContextListener {
   }
 }
 for (String tableId : availableTables.keySet()) {
-  generateTable(tableId, new HashMap(), false);
+  generateTable(tableId, new HashMap<>(), false);
 }
 for (String graphId : availableGraphs.keySet()) {
   generateGraph(graphId, "png", new HashMap<>(), false);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Use Map.putIfAbsent and Map.getOrDefault where possible.

2018-08-27 Thread karsten

commit 5e4ef944eccf18b5276647828162fa2bc76a2f8f
Author: Karsten Loesing 
Date:   Tue Aug 21 15:12:01 2018 +0200

Use Map.putIfAbsent and Map.getOrDefault where possible.
---
 src/main/java/org/torproject/metrics/stats/connbidirect/Main.java | 7 ++-
 .../java/org/torproject/metrics/stats/hidserv/Aggregator.java | 8 ++--
 .../java/org/torproject/metrics/stats/hidserv/DocumentStore.java  | 4 +---
 .../java/org/torproject/metrics/stats/hidserv/Extrapolator.java   | 4 +---
 .../metrics/stats/servers/ConsensusStatsFileHandler.java  | 8 ++--
 src/main/java/org/torproject/metrics/web/MetricServlet.java   | 4 +---
 6 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java 
b/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java
index a069d84..b2dc1b6 100644
--- a/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java
+++ b/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java
@@ -447,11 +447,8 @@ public class Main {
 rawStat.fractionWrite, rawStat.fractionBoth };
 for (int i = 0; i < directions.length; i++) {
   String dateAndDirection = date + "," + directions[i];
-  if (!fractionsByDateAndDirection.containsKey(
-  dateAndDirection)) {
-fractionsByDateAndDirection.put(dateAndDirection,
-new ArrayList<>());
-  }
+  fractionsByDateAndDirection.putIfAbsent(dateAndDirection,
+  new ArrayList<>());
   fractionsByDateAndDirection.get(dateAndDirection).add(
   fractions[i]);
 }
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 14fc31f..36e7967 100644
--- a/src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java
+++ b/src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java
@@ -88,17 +88,13 @@ public class Aggregator {
 continue;
   }
   if (extrapolated.getFractionRendRelayedCells() > 0.0) {
-if (!extrapolatedCells.containsKey(date)) {
-  extrapolatedCells.put(date, new ArrayList<>());
-}
+extrapolatedCells.putIfAbsent(date, new ArrayList<>());
 extrapolatedCells.get(date).add(new double[] {
 extrapolated.getExtrapolatedRendRelayedCells(),
 extrapolated.getFractionRendRelayedCells() });
   }
   if (extrapolated.getFractionDirOnionsSeen() > 0.0) {
-if (!extrapolatedOnions.containsKey(date)) {
-  extrapolatedOnions.put(date, new ArrayList<>());
-}
+extrapolatedOnions.putIfAbsent(date, new ArrayList<>());
 extrapolatedOnions.get(date).add(new double[] {
 extrapolated.getExtrapolatedDirOnionsSeen(),
 extrapolated.getFractionDirOnionsSeen() });
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 f73812a..61b9fa8 100644
--- a/src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java
+++ b/src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java
@@ -58,9 +58,7 @@ public class DocumentStore {
 SortedMap> formattedDocuments = new TreeMap<>();
 for (T retrieveDocument : retrievedDocuments) {
   String[] formattedDocument = retrieveDocument.format();
-  if (!formattedDocuments.containsKey(formattedDocument[0])) {
-formattedDocuments.put(formattedDocument[0], new TreeSet<>());
-  }
+  formattedDocuments.putIfAbsent(formattedDocument[0], new TreeSet<>());
   formattedDocuments.get(formattedDocument[0]).add(
   formattedDocument[1]);
 }
diff --git 
a/src/main/java/org/torproject/metrics/stats/hidserv/Extrapolator.java 
b/src/main/java/org/torproject/metrics/stats/hidserv/Extrapolator.java
index 2c4a8f8..0dcc638 100644
--- a/src/main/java/org/torproject/metrics/stats/hidserv/Extrapolator.java
+++ b/src/main/java/org/torproject/metrics/stats/hidserv/Extrapolator.java
@@ -99,9 +99,7 @@ public class Extrapolator {
 new TreeMap<>();
 for (ReportedHidServStats stat : reportedStats) {
   String fingerprint = stat.getFingerprint();
-  if (!parsedStatsByFingerprint.containsKey(fingerprint)) {
-parsedStatsByFingerprint.put(fingerprint, new HashSet<>());
-  }
+  parsedStatsByFingerprint.putIfAbsent(fingerprint, new HashSet<>());
   parsedStatsByFingerprint.get(fingerprint).add(stat);
 }
 
diff --git 
a/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java
 
b/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java
index f4f99cd..491170e 100644
--- 
a/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java
+++ 
b/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java
@@ -257,13

[tor-commits] [exonerator/master] Use chained String.append calls.

2018-08-27 Thread karsten

commit 2cd8b3f32925104c27542bc9e00cee6d95b6804e
Author: Karsten Loesing 
Date:   Mon Aug 20 15:46:31 2018 +0200

Use chained String.append calls.
---
 .../org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java   | 2 +-
 src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java
 
b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java
index 065b986..ab4f094 100644
--- 
a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java
+++ 
b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java
@@ -145,7 +145,7 @@ public class ExoneraTorDatabaseImporter {
   }
   BufferedWriter bw = new BufferedWriter(new FileWriter(
   "exonerator-lock"));
-  bw.append(String.valueOf(System.currentTimeMillis()) + "\n");
+  bw.append(String.valueOf(System.currentTimeMillis())).append("\n");
   bw.close();
 } catch (IOException e) {
   logger.warn("Could not create 'exonerator-lock' file.  Exiting.");
diff --git 
a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java 
b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
index 4a99e19..8786261 100644
--- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
+++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
@@ -110,7 +110,7 @@ public class ExoneraTorServlet extends HttpServlet {
   StringBuilder sb = new StringBuilder();
   int writtenAddresses = 0;
   for (String address : match.addresses) {
-sb.append((writtenAddresses++ > 0 ? ", " : "") + address);
+sb.append(writtenAddresses++ > 0 ? ", " : "").append(address);
   }
   String[] statusEntry = new String[]{match.timestamp,
   sb.toString(), match.fingerprint, match.nickname,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Replace Java logging with slf4j.

2018-08-27 Thread karsten

commit 406d0e93210d1839390d58205b05fb5748531b2a
Author: Karsten Loesing 
Date:   Tue Aug 21 20:47:33 2018 +0200

Replace Java logging with slf4j.

Fixes the last part of #26190.
---
 .../metrics/stats/servers/Configuration.java   | 37 
 .../stats/servers/ConsensusStatsFileHandler.java   | 81 --
 .../torproject/metrics/stats/servers/LockFile.java | 18 ++--
 .../stats/servers/LoggingConfiguration.java| 98 --
 .../org/torproject/metrics/stats/servers/Main.java | 16 ++--
 .../servers/RelayDescriptorDatabaseImporter.java   | 86 ---
 6 files changed, 108 insertions(+), 228 deletions(-)

diff --git 
a/src/main/java/org/torproject/metrics/stats/servers/Configuration.java 
b/src/main/java/org/torproject/metrics/stats/servers/Configuration.java
index 5be8d88..8435b90 100644
--- a/src/main/java/org/torproject/metrics/stats/servers/Configuration.java
+++ b/src/main/java/org/torproject/metrics/stats/servers/Configuration.java
@@ -3,6 +3,9 @@
 
 package org.torproject.metrics.stats.servers;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
@@ -11,8 +14,6 @@ import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * Initialize configuration with hard-coded defaults, overwrite with
@@ -21,6 +22,8 @@ import java.util.logging.Logger;
  */
 public class Configuration {
 
+  private static Logger log = LoggerFactory.getLogger(Configuration.class);
+
   private boolean importDirectoryArchives = false;
 
   private List directoryArchivesDirectories = new ArrayList<>();
@@ -47,21 +50,16 @@ public class Configuration {
   /** Initializes this configuration class. */
   public Configuration() {
 
-/* Initialize logger. */
-Logger logger = Logger.getLogger(Configuration.class.getName());
-
 /* Read config file, if present. */
 File configFile = new File("config");
 if (!configFile.exists()) {
-  logger.warning("Could not find config file.");
+  log.warn("Could not find config file.");
   return;
 }
 String line = null;
 try (BufferedReader br = new BufferedReader(new FileReader(configFile))) {
   while ((line = br.readLine()) != null) {
-if (line.startsWith("#") || line.length() < 1) {
-  continue;
-} else if (line.startsWith("ImportDirectoryArchives")) {
+if (line.startsWith("ImportDirectoryArchives")) {
   this.importDirectoryArchives = Integer.parseInt(
   line.split(" ")[1]) != 0;
 } else if (line.startsWith("DirectoryArchivesDirectory")) {
@@ -90,27 +88,26 @@ public class Configuration {
 } else if (line.startsWith("WriteBridgeStats")) {
   this.writeBridgeStats = Integer.parseInt(
   line.split(" ")[1]) != 0;
-} else {
-  logger.severe("Configuration file contains unrecognized "
-  + "configuration key in line '" + line + "'! Exiting!");
+} else if (!line.startsWith("#") && line.length() > 0) {
+  log.error("Configuration file contains unrecognized "
+  + "configuration key in line '{}'! Exiting!", line);
   System.exit(1);
 }
   }
 } catch (ArrayIndexOutOfBoundsException e) {
-  logger.severe("Configuration file contains configuration key "
-  + "without value in line '" + line + "'. Exiting!");
+  log.warn("Configuration file contains configuration key without value in 
"
+  + "line '{}'. Exiting!", line);
   System.exit(1);
 } catch (MalformedURLException e) {
-  logger.severe("Configuration file contains illegal URL or IP:port "
-  + "pair in line '" + line + "'. Exiting!");
+  log.warn("Configuration file contains illegal URL or IP:port pair in "
+  + "line '{}'. Exiting!", line);
   System.exit(1);
 } catch (NumberFormatException e) {
-  logger.severe("Configuration file contains illegal value in line '"
-  + line + "' with legal values being 0 or 1. Exiting!");
+  log.warn("Configuration file contains illegal value in line '{}' with "
+  + "legal values being 0 or 1. Exiting!", line);
   System.exit(1);
 } catch (IOException e) {
-  logger.log(Level.SEVERE, "Unknown problem while reading config "
-  + "file! Exiting!", e);
+  log.error("Unknown problem while reading config file! Exiting!", e);
   System.exit(1);
 }
   }
diff --git 
a/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java
 
b/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java
index 491170e..960069c 100644
--- 
a/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java
+++

[tor-commits] [metrics-web/master] Make a couple JavaDoc fixes.

2018-08-27 Thread karsten

commit d81c8400af3127841d3c798f73b40ae5d83455d2
Author: Karsten Loesing 
Date:   Tue Aug 21 09:51:56 2018 +0200

Make a couple JavaDoc fixes.
---
 .../stats/servers/ConsensusStatsFileHandler.java | 20 ++--
 .../metrics/stats/servers/LoggingConfiguration.java  |  2 --
 .../servers/RelayDescriptorDatabaseImporter.java |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git 
a/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java
 
b/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java
index ebbce60..f4f99cd 100644
--- 
a/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java
+++ 
b/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java
@@ -33,11 +33,11 @@ import java.util.logging.Logger;
 
 /**
  * Generates statistics on the average number of relays and bridges per
- * day. Accepts parse results from RelayDescriptorParser and
- * BridgeDescriptorParser and stores them in intermediate
- * result files stats/consensus-stats-raw and
- * stats/bridge-consensus-stats-raw. Writes final results to
- * stats/consensus-stats for all days for which at least half
+ * day. Accepts parse results from {@code RelayDescriptorParser} and
+ * {@code BridgeDescriptorParser} and stores them in intermediate
+ * result files {@code stats/consensus-stats-raw} and
+ * {@code stats/bridge-consensus-stats-raw}. Writes final results to
+ * {@code stats/consensus-stats} for all days for which at least half
  * of the expected consensuses or statuses are known.
  */
 public class ConsensusStatsFileHandler {
@@ -52,14 +52,14 @@ public class ConsensusStatsFileHandler {
* Number of running bridges in a given bridge status. Map keys are the 
bridge
* status time formatted as "-MM-dd HH:mm:ss", a comma, and the bridge
* authority nickname, map values are lines as read from
-   * stats/bridge-consensus-stats-raw.
+   * {@code stats/bridge-consensus-stats-raw}.
*/
   private SortedMap bridgesRaw;
 
   /**
* Average number of running bridges per day. Map keys are dates
* formatted as "-MM-dd", map values are the remaining columns as written
-   * to stats/consensus-stats.
+   * to {@code stats/consensus-stats}.
*/
   private SortedMap bridgesPerDay;
 
@@ -83,9 +83,9 @@ public class ConsensusStatsFileHandler {
 
   /**
* Initializes this class, including reading in intermediate results
-   * files stats/consensus-stats-raw and
-   * stats/bridge-consensus-stats-raw and final results file
-   * stats/consensus-stats.
+   * files {@code stats/consensus-stats-raw} and
+   * {@code stats/bridge-consensus-stats-raw} and final results file
+   * {@code stats/consensus-stats}.
*/
   public ConsensusStatsFileHandler(String connectionUrl,
   File bridgesDir, File statsDirectory,
diff --git 
a/src/main/java/org/torproject/metrics/stats/servers/LoggingConfiguration.java 
b/src/main/java/org/torproject/metrics/stats/servers/LoggingConfiguration.java
index f14241b..a11c6c4 100644
--- 
a/src/main/java/org/torproject/metrics/stats/servers/LoggingConfiguration.java
+++ 
b/src/main/java/org/torproject/metrics/stats/servers/LoggingConfiguration.java
@@ -20,7 +20,6 @@ import java.util.logging.Logger;
  *
  * Log levels used by ERNIE:
  *
- * 
  * 
  * SEVERE: An event made it impossible to continue program execution.
  * WARNING: A potential problem occurred that requires the operator to
@@ -34,7 +33,6 @@ import java.util.logging.Logger;
  * using FINER.
  * FINEST: Most detailed debug messages. Not used.
  * 
- * 
  */
 public class LoggingConfiguration {
 
diff --git 
a/src/main/java/org/torproject/metrics/stats/servers/RelayDescriptorDatabaseImporter.java
 
b/src/main/java/org/torproject/metrics/stats/servers/RelayDescriptorDatabaseImporter.java
index 38afeec..750e231 100644
--- 
a/src/main/java/org/torproject/metrics/stats/servers/RelayDescriptorDatabaseImporter.java
+++ 
b/src/main/java/org/torproject/metrics/stats/servers/RelayDescriptorDatabaseImporter.java
@@ -173,7 +173,7 @@ public final class RelayDescriptorDatabaseImporter {
 
   /**
* Set of fingerprints that we imported for the valid-after time in
-   * lastCheckedStatusEntries.
+   * {@code lastCheckedStatusEntries}.
*/
   private Set insertedStatusEntries = new HashSet<>();
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [exonerator/master] Remove redundant initializers.

2018-08-27 Thread karsten

commit 7c318d3400c1e73b92323e42a985f270f3a4bf2f
Author: Karsten Loesing 
Date:   Mon Aug 20 16:29:01 2018 +0200

Remove redundant initializers.
---
 .../org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java
 
b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java
index ab4f094..00a3d89 100644
--- 
a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java
+++ 
b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java
@@ -71,7 +71,7 @@ public class ExoneraTorDatabaseImporter {
   logger.error("Could not find config file.  Exiting.");
   System.exit(1);
 }
-String line = null;
+String line;
 try {
   BufferedReader br = new BufferedReader(new FileReader(configFile));
   while ((line = br.readLine()) != null) {
@@ -177,7 +177,7 @@ public class ExoneraTorDatabaseImporter {
   try {
 BufferedReader br = new BufferedReader(new FileReader(
 parseHistoryFile));
-String line = null;
+String line;
 int lineNumber = 0;
 while ((line = br.readLine()) != null) {
   lineNumber++;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [exonerator/master] Use foreach loop.

2018-08-27 Thread karsten

commit 72acf8249323809040c98798020df54039c9a1c5
Author: Karsten Loesing 
Date:   Mon Aug 20 14:57:03 2018 +0200

Use foreach loop.
---
 .../torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java   | 3 +--
 .../java/org/torproject/metrics/exonerator/ExoneraTorServlet.java   | 3 +--
 src/main/java/org/torproject/metrics/exonerator/QueryServlet.java   | 6 ++
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git 
a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java
 
b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java
index 5e8da87..d27f8d8 100644
--- 
a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java
+++ 
b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java
@@ -282,8 +282,7 @@ public class ExoneraTorDatabaseImporter {
   int end = orAddress.length()
   - (orAddress.endsWith("::]") ? 2 : 1);
   String[] parts = orAddress.substring(start, end).split(":", -1);
-  for (int i = 0; i < parts.length; i++) {
-String part = parts[i];
+  for (String part : parts) {
 if (part.length() == 0) {
   addressHex.append("x");
 } else if (part.length() <= 4) {
diff --git 
a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java 
b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
index 4c85480..4a99e19 100644
--- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
+++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
@@ -269,8 +269,7 @@ public class ExoneraTorServlet extends HttpServlet {
 int end = ipParameter.length()
 - (ipParameter.endsWith("::") ? 1 : 0);
 String[] parts = ipParameter.substring(start, end).split(":", -1);
-for (int i = 0; i < parts.length; i++) {
-  String part = parts[i];
+for (String part : parts) {
   if (part.length() == 0) {
 addressHex.append("x");
   } else if (part.length() <= 4) {
diff --git a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java 
b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java
index ef12f00..77892f0 100644
--- a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java
+++ b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java
@@ -143,8 +143,7 @@ public class QueryServlet extends HttpServlet {
 int end = ipParameter.length()
 - (ipParameter.endsWith("::") ? 1 : 0);
 String[] parts = ipParameter.substring(start, end).split(":", -1);
-for (int i = 0; i < parts.length; i++) {
-  String part = parts[i];
+for (String part : parts) {
   if (part.length() == 0) {
 addressHex.append("x");
   } else if (part.length() <= 4) {
@@ -189,8 +188,7 @@ public class QueryServlet extends HttpServlet {
 int start = relayIp.startsWith("::") ? 1 : 0;
 int end = relayIp.length() - (relayIp.endsWith("::") ? 1 : 0);
 String[] parts = relayIp.substring(start, end).split(":", -1);
-for (int i = 0; i < parts.length; i++) {
-  String part = parts[i];
+for (String part : parts) {
   if (part.length() == 0) {
 addressHex.append("x");
   } else if (part.length() <= 4) {



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [exonerator/master] Replace Collections.sort with List.sort.

2018-08-27 Thread karsten

commit 40cac45b257d368dbdb1cdc9cc792f678357428a
Author: Karsten Loesing 
Date:   Mon Aug 20 15:25:34 2018 +0200

Replace Collections.sort with List.sort.
---
 .../torproject/metrics/exonerator/QueryServlet.java  | 20 +---
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java 
b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java
index 77892f0..556d8d3 100644
--- a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java
+++ b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java
@@ -20,7 +20,6 @@ import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Collections;
 import java.util.List;
 import java.util.SortedSet;
 import java.util.TimeZone;
@@ -356,16 +355,15 @@ public class QueryServlet extends HttpServlet {
 }
   }
   if (!matches.isEmpty()) {
-Collections.sort(matches,
-(m1, m2) -> {
-  if (m1 == m2) {
-return 0;
-  } else if (!m1.timestamp.equals(m2.timestamp)) {
-return m1.timestamp.compareTo(m2.timestamp);
-  } else {
-return m1.fingerprint.compareTo(m2.fingerprint);
-  }
-});
+matches.sort((m1, m2) -> {
+  if (m1 == m2) {
+return 0;
+  } else if (!m1.timestamp.equals(m2.timestamp)) {
+return m1.timestamp.compareTo(m2.timestamp);
+  } else {
+return m1.fingerprint.compareTo(m2.fingerprint);
+  }
+});
 response.matches = matches.toArray(new QueryResponse.Match[0]);
   } else {
 List nearbyAddresses = new ArrayList<>();



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [exonerator/master] Remove unthrown exceptions.

2018-08-27 Thread karsten

commit ad4da7d82f95cd89b43717aacc0b4cffbf8d6aa4
Author: Karsten Loesing 
Date:   Mon Aug 20 14:48:09 2018 +0200

Remove unthrown exceptions.
---
 .../metrics/exonerator/ExoneraTorServlet.java  | 47 +-
 .../metrics/exonerator/QueryServlet.java   |  4 +-
 2 files changed, 20 insertions(+), 31 deletions(-)

diff --git 
a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java 
b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
index 9099025..4c85480 100644
--- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
+++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
@@ -61,8 +61,7 @@ public class ExoneraTorServlet extends HttpServlet {
 
   @Override
   public void doGet(HttpServletRequest request,
-  HttpServletResponse response) throws IOException,
-  ServletException {
+  HttpServletResponse response) throws IOException {
 
 /* Step 1: Parse the request. */
 
@@ -317,14 +316,13 @@ public class ExoneraTorServlet extends HttpServlet {
 
   /* Helper methods for writing the response. */
 
-  private void writeHeader(PrintWriter out, ResourceBundle rb, String langStr)
-  throws IOException {
+  private void writeHeader(PrintWriter out, ResourceBundle rb, String langStr) 
{
 out.printf("\n");
   }
 
   private void writeForm(PrintWriter out, ResourceBundle rb,
   String relayIp, boolean relayIpHasError, String timestampStr,
-  boolean timestampHasError, String langStr) throws IOException {
+  boolean timestampHasError, String langStr) {
 String ipValue = "";
 if (relayIp != null && relayIp.length() > 0) {
   if (relayIp.contains(":")) {
@@ -374,7 +372,7 @@ public class ExoneraTorServlet extends HttpServlet {
   }
 
   private void writeSummaryUnableToConnectToBackend(PrintWriter out,
-  ResourceBundle rb) throws IOException {
+  ResourceBundle rb) {
 String contactLink =
 "https://www.torproject.org/about/contact\;>"
 + rb.getString("summary.serverproblem.dbempty.body.link")
@@ -386,8 +384,7 @@ public class ExoneraTorServlet extends HttpServlet {
 contactLink);
   }
 
-  private void writeSummaryNoData(PrintWriter out, ResourceBundle rb)
-  throws IOException {
+  private void writeSummaryNoData(PrintWriter out, ResourceBundle rb) {
 String contactLink =
 "https://www.torproject.org/about/contact\;>"
 + rb.getString("summary.serverproblem.dbempty.body.link")
@@ -399,16 +396,14 @@ public class ExoneraTorServlet extends HttpServlet {
 contactLink);
   }
 
-  private void writeSummaryNoTimestamp(PrintWriter out, ResourceBundle rb)
-  throws IOException {
+  private void writeSummaryNoTimestamp(PrintWriter out, ResourceBundle rb) {
 this.writeSummary(out, rb.getString("summary.heading"),
 "panel-danger",
 rb.getString("summary.invalidparams.notimestamp.title"), null,
 rb.getString("summary.invalidparams.notimestamp.body"));
   }
 
-  private void writeSummaryNoIp(PrintWriter out, ResourceBundle rb)
-  throws IOException {
+  private void writeSummaryNoIp(PrintWriter out, ResourceBundle rb) {
 this.writeSummary(out, rb.getString("summary.heading"),
 "panel-danger", rb.getString("summary.invalidparams.noip.title"),
 null, rb.getString("summary.invalidparams.noip.body"));
@@ -416,7 +411,7 @@ public class ExoneraTorServlet extends HttpServlet {
 
   private void writeSummaryTimestampOutsideRange(PrintWriter out,
   ResourceBundle rb, String timestampStr, String firstDate,
-  String lastDate) throws IOException {
+  String lastDate) {
 this.writeSummary(out, rb.getString("summary.heading"),
 "panel-danger",
 rb.getString("summary.invalidparams.timestamprange.title"), null,
@@ -425,7 +420,7 @@ public class ExoneraTorServlet extends HttpServlet {
   }
 
   private void writeSummaryInvalidIp(PrintWriter out, ResourceBundle rb,
-  String ipParameter) throws IOException {
+  String ipParameter) {
 String escapedIpParameter = ipParameter.length() > 40
 ? StringEscapeUtils.escapeHtml4(ipParameter.substring(0, 40))
 + "[...]" : StringEscapeUtils.escapeHtml4(ipParameter);
@@ -437,7 +432,7 @@ public class ExoneraTorServlet extends HttpServlet {
   }
 
   private void writeSummaryInvalidTimestamp(PrintWriter out,
-  ResourceBundle rb, String timestampParameter) throws IOException {
+  ResourceBundle rb, String timestampParameter) {
 String escapedTimestampParameter = timestampParameter.length() > 20
 ? StringEscapeUtils.escapeHtml4(timestampParameter
 .substring(0, 20)) + "[...]"
@@ -450,14 +445,14 @@ public class ExoneraTorServlet extends HttpServlet {
   }
 
   private void writeSummaryTimestampTooRecent(PrintWriter out,
-  ResourceBundle rb) throws IOException {
+  ResourceBundle rb) {
 this.writeSummary(out, rb.getString("summary.heading"),

[tor-commits] [exonerator/master] Replace while with for loop.

2018-08-27 Thread karsten

commit f66289e20c7912c8a8f902f6cf98d328ffe46d06
Author: Karsten Loesing 
Date:   Mon Aug 20 15:32:09 2018 +0200

Replace while with for loop.
---
 .../torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java  | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git 
a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java
 
b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java
index d27f8d8..065b986 100644
--- 
a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java
+++ 
b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java
@@ -32,7 +32,6 @@ import java.sql.Types;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 import java.util.SortedMap;
@@ -209,10 +208,8 @@ public class ExoneraTorDatabaseImporter {
 DescriptorSourceFactory.createDescriptorReader();
 descriptorReader.setMaxDescriptorsInQueue(20);
 descriptorReader.setExcludedFiles(lastImportHistory);
-Iterator descriptors = descriptorReader.readDescriptors(
-new File(importDirString)).iterator();
-while (descriptors.hasNext()) {
-  Descriptor descriptor = descriptors.next();
+for (Descriptor descriptor : descriptorReader.readDescriptors(
+new File(importDirString))) {
   if (descriptor instanceof RelayNetworkStatusConsensus) {
 parseConsensus((RelayNetworkStatusConsensus) descriptor);
   } else if (descriptor instanceof ExitList) {



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [exonerator/master] Update translations.

2018-08-27 Thread karsten

commit 3e1aa663e5ff83061dda11715dc180da996d3fb4
Author: Karsten Loesing 
Date:   Mon Aug 20 10:27:58 2018 +0200

Update translations.
---
 src/main/resources/ExoneraTor_de.properties | 18 ++
 src/main/resources/ExoneraTor_fr.properties | 22 --
 src/main/resources/ExoneraTor_ro.properties | 14 --
 src/main/resources/ExoneraTor_sv.properties | 18 ++
 4 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/src/main/resources/ExoneraTor_de.properties 
b/src/main/resources/ExoneraTor_de.properties
index d830e31..fbe8464 100644
--- a/src/main/resources/ExoneraTor_de.properties
+++ b/src/main/resources/ExoneraTor_de.properties
@@ -4,14 +4,14 @@ form.timestamp.label=Datum
 form.search.label=Suchen
 summary.heading=Zusammenfassung
 summary.serverproblem.dbnoconnect.title=Server-Problem
-summary.serverproblem.dbnoconnect.body.text=Es kann keine Verbindung zur 
Datenbank hergestellt werden. Bitte versuchen Sie es sp\u00e4ter noch einmal. 
Sollte dieses Problem weiterhin bestehen %s.
+summary.serverproblem.dbnoconnect.body.text=Es kann keine Verbindung zur 
Datenbank hergestellt werden. Bitte versuchen Sie es sp\u00e4ter noch einmal. 
Sollte dieses Problem weiterhin bestehen %s!
 summary.serverproblem.dbnoconnect.body.link=lassen Sie es uns bitte wissen
 summary.serverproblem.dbempty.title=Server-Problem
-summary.serverproblem.dbempty.body.text=Die Datenbank scheint leer zu sein. 
Bitte versuchen Sie es sp\u00e4ter noch einmal. Sollte dieses Problem weiterhin 
bestehen %s.
+summary.serverproblem.dbempty.body.text=Die Datenbank scheint leer zu sein. 
Bitte versuchen Sie es sp\u00e4ter noch einmal. Sollte dieses Problem weiterhin 
bestehen %s!
 summary.serverproblem.dbempty.body.link=lassen Sie es uns bitte wissen
 summary.invalidparams.notimestamp.title=Kein Datum angegeben
 summary.invalidparams.notimestamp.body=Sie m\u00fcssen ein Datum angeben.
-summary.invalidparams.noip.title=Keine IP-Adresse angegeben.
+summary.invalidparams.noip.title=Keine IP-Adresse angegeben
 summary.invalidparams.noip.body=Sie m\u00fcssen eine IP-Adresse angeben.
 summary.invalidparams.timestamprange.title=Datum au\u00dferhalb des 
zul\u00e4ssigen Bereichs
 summary.invalidparams.timestamprange.body=Die Datenbank enth\u00e4lt keine 
Daten vom %s. Bitte w\u00e4hlen Sie ein Datum zwischen %s und %s aus.
@@ -19,8 +19,10 @@ summary.invalidparams.invalidip.title=Ung\u00fcltige 
IP-Adresse
 summary.invalidparams.invalidip.body=%s ist keine g\u00fcltige IP-Adresse. 
Zul\u00e4ssige IP-Adress-Formate sind %s oder %s.
 summary.invalidparams.invalidtimestamp.title=Ung\u00fcltiges Datum
 summary.invalidparams.invalidtimestamp.body=%s ist kein g\u00fcltiges Datum. 
Das zul\u00e4ssige Datumsformat ist %s.
+summary.invalidparams.timestamptoorecent.title=Datumsparameter zu neu
+summary.invalidparams.timestamptoorecent.body=M\u00f6glicherweise enth\u00e4lt 
die Datenbank noch nicht gen\u00fcgend Daten, um diese Anfrage korrekt zu 
beantworten. Das letzte g\u00fcltige Datum ist vorgestern. Bitte wiederholen 
Sie Ihre Suche an einem anderen Tag.
 summary.serverproblem.nodata.title=Server-Problem
-summary.serverproblem.nodata.body.text=Die Datenbank enth\u00e4lt keine Daten 
f\u00fcr das angegebene Datum. Bitte versuchen Sie es sp\u00e4ter noch einmal. 
Sollte dieses Problem weiterhin bestehen %s.
+summary.serverproblem.nodata.body.text=Die Datenbank enth\u00e4lt keine Daten 
f\u00fcr das angegebene Datum. Bitte versuchen Sie es sp\u00e4ter noch einmal. 
Sollte dieses Problem weiterhin bestehen %s!
 summary.serverproblem.nodata.body.link=lassen Sie es uns bitte wissen
 summary.negativesamenetwork.title=Keine \u00dcbereinstimmungen gefunden
 summary.negativesamenetwork.body=Es wurde kein Tor-Server mit der IP-Adresse 
%s am %s bzw. am Tag vorher oder nachher gefunden. Es wurden jedoch benachbarte 
IP-Adressen im selben /%d-Netzwerk an diesen Tagen gefunden:
@@ -41,12 +43,12 @@ technicaldetails.exit.yes=Ja
 technicaldetails.exit.no=Nein
 permanentlink.heading=Dauerhafter Link
 footer.abouttor.heading=\u00dcber Tor
-footer.abouttor.body.text=Tor ist ein internationales Softwareprojekt, um 
Internetverbindungen zu anonymisieren indem %s. Wenn Sie eine 
Internetverbindung sehen, die von einem Tor-Server kommt, stammt diese in der 
Regel von jemandem, der Tor benutzt, und nicht vom Betreiber des Tor-Servers 
selbst. Weder The Tor Project, Inc. noch die Tor-Server-Betreiber besitzen 
Aufzeichnungen \u00fcber die Internetverbindungen im Tor-Netzwerk und 
k\u00f6nnen daher keine Auskunft \u00fcber den Ursprung der Internetverbindung 
geben. Mehr Informationen \u00fcber Tor erhalten Sie %s. The Tor Project, Inc. 
steht Ihnen jederzeit f\u00fcr %s zur Verf\u00fcgung.
-footer.abouttor.body.link1=Datenpakete verschl\u00fcsselt und \u00fcber eine 
Reihe von Stationen geleitet werden, bevor diese ihr Ziel erreichen
+footer.abouttor.body.text=Tor ist ein internationales Softwareprojekt um

[tor-commits] [metrics-web/master] Remove unnecessary return statements.

2018-08-27 Thread karsten

commit 79994eb3e1a4e89f6904a33a1591b375ab8f104e
Author: Karsten Loesing 
Date:   Tue Aug 21 11:47:07 2018 +0200

Remove unnecessary return statements.
---
 .../java/org/torproject/metrics/stats/hidserv/Parser.java | 15 ---
 .../java/org/torproject/metrics/web/RObjectGenerator.java |  2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java 
b/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java
index 4f7ac6c..5970e32 100644
--- a/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java
+++ b/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java
@@ -199,19 +199,10 @@ public class Parser {
 /* Extract the fingerprint from the parsed descriptor. */
 String fingerprint = extraInfoDescriptor.getFingerprint();
 
-/* If the descriptor did not contain any of the expected hidserv-*
- * lines, don't do anything.  This applies to the majority of
- * descriptors, at least as long as only a minority of relays reports
- * these statistics. */
-if (extraInfoDescriptor.getHidservStatsEndMillis() < 0L
-&& extraInfoDescriptor.getHidservRendRelayedCells() == null
-&& extraInfoDescriptor.getHidservDirOnionsSeen() == null) {
-  return;
-
 /* If the descriptor contained all expected hidserv-* lines, create a
  * new stats object and put it in the local map, so that it will later
  * be written to a document file. */
-} else if (extraInfoDescriptor.getHidservStatsEndMillis() >= 0L
+if (extraInfoDescriptor.getHidservStatsEndMillis() >= 0L
 && extraInfoDescriptor.getHidservStatsIntervalLength() >= 0L
 && extraInfoDescriptor.getHidservRendRelayedCells() != null
 && extraInfoDescriptor.getHidservRendRelayedCellsParameters() != null
@@ -237,7 +228,9 @@ public class Parser {
  * out a warning.  This case does not warrant any further action,
  * because relays can in theory write anything in their extra-info
  * descriptors.  But maybe we'll want to know. */
-} else {
+} else if (extraInfoDescriptor.getHidservStatsEndMillis() >= 0L
+|| extraInfoDescriptor.getHidservRendRelayedCells() != null
+|| extraInfoDescriptor.getHidservDirOnionsSeen() != null) {
   log.warn("Relay {} published incomplete hidserv-stats. Ignoring.",
   fingerprint);
 }
diff --git a/src/main/java/org/torproject/metrics/web/RObjectGenerator.java 
b/src/main/java/org/torproject/metrics/web/RObjectGenerator.java
index 8490eef..a529830 100644
--- a/src/main/java/org/torproject/metrics/web/RObjectGenerator.java
+++ b/src/main/java/org/torproject/metrics/web/RObjectGenerator.java
@@ -345,7 +345,7 @@ public class RObjectGenerator implements 
ServletContextListener {
 this.result = new RObject(baos.toByteArray(), this.fileName,
 lastModified);
   } catch (IOException e) {
-return;
+/* Nothing to do here. */
   }
 }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Use StringBuilder's append rather than string concatenation.

2018-08-27 Thread karsten

commit 21277083a87fe409fb9bcdb4e676984f9856fcd1
Author: Karsten Loesing 
Date:   Tue Aug 21 12:09:45 2018 +0200

Use StringBuilder's append rather than string concatenation.
---
 src/main/java/org/torproject/metrics/stats/connbidirect/Main.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java 
b/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java
index 426a7cf..a069d84 100644
--- a/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java
+++ b/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java
@@ -180,8 +180,8 @@ public class Main {
   DateFormat dateFormat = new SimpleDateFormat("-MM-dd");
   dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
   for (long conflictingDate : conflictingDates) {
-sb.append("\n "
-+ dateFormat.format(conflictingDate * ONE_DAY_IN_MILLIS));
+sb.append("\n ")
+.append(dateFormat.format(conflictingDate * ONE_DAY_IN_MILLIS));
   }
   log.warn(sb.toString());
   return;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Use parameterized log statements.

2018-08-27 Thread karsten

commit 9f0d510a28c376af1533f46cd3afddb691662f97
Author: Karsten Loesing 
Date:   Tue Aug 21 10:03:30 2018 +0200

Use parameterized log statements.
---
 src/main/java/org/torproject/metrics/stats/connbidirect/Main.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java 
b/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java
index c4f1b34..426a7cf 100644
--- a/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java
+++ b/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java
@@ -78,8 +78,8 @@ public class Main {
   return new RawStat(dateDays, fingerprint, fractionRead,
   fractionWrite, fractionBoth);
 } else {
-  log.warn("Could not deserialize raw statistic from string '" + string
-  + "'.");
+  log.warn("Could not deserialize raw statistic from string '{}'.",
+  string);
   return null;
 }
   } catch (NumberFormatException e) {



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Remove unnecessary continue statements.

2018-08-27 Thread karsten

commit 482a8dd7ebd0e7df3a54eb535baa8c079ae412b0
Author: Karsten Loesing 
Date:   Tue Aug 21 15:19:47 2018 +0200

Remove unnecessary continue statements.
---
 src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java | 2 --
 1 file changed, 2 deletions(-)

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 61b9fa8..f3163e1 100644
--- a/src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java
+++ b/src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java
@@ -132,11 +132,9 @@ public class DocumentStore {
 && !(formattedString0 + line.substring(1))
 .startsWith(prefix)) {
   /* Skip combined line not starting with prefix. */
-  continue;
 } else if (prefix.length() > 0
 && !formattedString0.startsWith(prefix)) {
   /* Skip line not starting with prefix. */
-  continue;
 } else {
   T document = this.clazz.newInstance();
   if (!document.parse(new String[] { formattedString0,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Replace Collections.sort with List.sort.

2018-08-27 Thread karsten

commit bbb15696ebf2259ae15fc4d94af372559e1a2b09
Author: Karsten Loesing 
Date:   Mon Aug 20 15:26:34 2018 +0200

Replace Collections.sort with List.sort.
---
 src/main/java/org/torproject/metrics/stats/advbwdist/Main.java | 6 ++
 src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java | 4 +---
 src/main/java/org/torproject/metrics/stats/hidserv/Simulate.java   | 5 ++---
 src/main/java/org/torproject/metrics/web/MetricServlet.java| 4 +---
 src/main/java/org/torproject/metrics/web/NewsServlet.java  | 4 +---
 5 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java 
b/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java
index 6565961..a16e7b0 100644
--- a/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java
+++ b/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java
@@ -95,10 +95,8 @@ public class Main {
   }
 
   /* Write advertised bandwidths of n-th fastest relays/exits. */
-  Collections.sort(advertisedBandwidthsAllRelays,
-  Collections.reverseOrder());
-  Collections.sort(advertisedBandwidthsExitsOnly,
-  Collections.reverseOrder());
+  advertisedBandwidthsAllRelays.sort(Collections.reverseOrder());
+  advertisedBandwidthsExitsOnly.sort(Collections.reverseOrder());
   int[] fastestRelays = new int[] { 1, 2, 3, 5, 10, 20, 30, 50, 100,
   200, 300, 500, 1000, 2000, 3000, 5000 };
   for (int fastestRelay : fastestRelays) {
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 2420485..9ef3ee8 100644
--- a/src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java
+++ b/src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java
@@ -8,7 +8,6 @@ import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -124,8 +123,7 @@ public class Aggregator {
 /* Sort extrapolated network totals contained in the first array
  * element.  (The second array element contains the computed
  * network fraction as weight.) */
-Collections.sort(weightedValues,
-Comparator.comparingDouble(doubles -> doubles[0]));
+weightedValues.sort(Comparator.comparingDouble(doubles -> doubles[0]));
 
 /* For the weighted mean, sum up all previously extrapolated
  * values weighted with their network fractions (which happens to
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 2c525d7..7acf1e8 100644
--- a/src/main/java/org/torproject/metrics/stats/hidserv/Simulate.java
+++ b/src/main/java/org/torproject/metrics/stats/hidserv/Simulate.java
@@ -171,8 +171,7 @@ public class Simulate {
 }
   } while (totalReportingProbability < fraction - 0.001
   || totalReportingProbability > fraction + 0.001);
-  Collections.sort(singleRelayExtrapolations,
-  Comparator.comparingDouble(o -> o[0]));
+  singleRelayExtrapolations.sort(Comparator.comparingDouble(o -> o[0]));
   double totalProbability = 0.0;
   double totalValues = 0.0;
   double totalInterquartileProbability = 0.0;
@@ -326,7 +325,7 @@ public class Simulate {
 }
   } while (totalReportingProbability < fraction - 0.001
   || totalReportingProbability > fraction + 0.001);
-  Collections.sort(singleRelayExtrapolations,
+  singleRelayExtrapolations.sort(
   Comparator.comparingDouble(doubles -> doubles[0]));
   double totalProbability = 0.0;
   double totalValues = 0.0;
diff --git a/src/main/java/org/torproject/metrics/web/MetricServlet.java 
b/src/main/java/org/torproject/metrics/web/MetricServlet.java
index b3de046..3b279a9 100644
--- a/src/main/java/org/torproject/metrics/web/MetricServlet.java
+++ b/src/main/java/org/torproject/metrics/web/MetricServlet.java
@@ -5,7 +5,6 @@ package org.torproject.metrics.web;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -71,8 +70,7 @@ public abstract class MetricServlet extends AnyServlet {
   }
 }
 this.sortedEvents.addAll(ContentProvider.getInstance().getNewsList());
-Collections.sort(this.sortedEvents,
-(o1, o2) -> o2.getStart().compareTo(o1.getStart()));
+this.sortedEvents.sort((o1, o2) -> o2.getStart().compareTo(o1.getStart()));
   }
 }
 
diff --git a/src/main/java/org/torproject/metrics/web/NewsServlet.java 
b/src/main/java/org/torproject/metrics/web/NewsServlet.java
index fc4d39f..f47f189 100644
--- a/src/main/java/org/torproject/metrics/web/NewsServlet.java
+++

[tor-commits] [metrics-web/master] Replace String.indexOf with .contains.

2018-08-27 Thread karsten

commit 3323843202d5151b32cb2a84ac1d09a64825d9d1
Author: Karsten Loesing 
Date:   Mon Aug 20 15:33:52 2018 +0200

Replace String.indexOf with .contains.
---
 src/main/java/org/torproject/metrics/web/UpdateNews.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/torproject/metrics/web/UpdateNews.java 
b/src/main/java/org/torproject/metrics/web/UpdateNews.java
index a1b9249..4de7952 100644
--- a/src/main/java/org/torproject/metrics/web/UpdateNews.java
+++ b/src/main/java/org/torproject/metrics/web/UpdateNews.java
@@ -101,10 +101,10 @@ public class UpdateNews {
 String shortDesc = desc
 .replaceAll("\\<.*?\\>", "")
 .replaceAll("&.*;", "");
-if (shortDesc.indexOf(". ") != -1) {
+if (shortDesc.contains(". ")) {
   shortDesc = shortDesc.substring(0, shortDesc.indexOf(". "));
 }
-if (shortDesc.indexOf(" (") != -1) {
+if (shortDesc.contains(" (")) {
   shortDesc = shortDesc.substring(0, shortDesc.indexOf(" ("));
 }
 entry.shortDescription = shortDesc;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [collector/master] Simplify bridge descriptor tests.

2018-08-27 Thread karsten

commit 61881b9c76ff821d2f42b05a950524c7a087f8a2
Author: Karsten Loesing 
Date:   Mon Aug 20 11:01:28 2018 +0200

Simplify bridge descriptor tests.
---
 .../bridgedescs/SanitizedBridgesWriterTest.java| 84 +++---
 .../bridgedescs/TestDescriptorBuilder.java | 11 ++-
 2 files changed, 46 insertions(+), 49 deletions(-)

diff --git 
a/src/test/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriterTest.java
 
b/src/test/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriterTest.java
index 91332a5..b791f88 100644
--- 
a/src/test/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriterTest.java
+++ 
b/src/test/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriterTest.java
@@ -224,7 +224,7 @@ public class SanitizedBridgesWriterTest {
   public void testServerDescriptorAdditionalAnnotation()
   throws Exception {
 this.defaultServerTestDescriptorBuilder.insertBeforeLineStartingWith(
-"@purpose bridge", Arrays.asList("@source 198.50.200.131"));
+"@purpose bridge", "@source 198.50.200.131");
 this.runTest();
 assertEquals("Expected 3 sanitized descriptors.", 3,
 this.parsedFiles.size());
@@ -237,7 +237,7 @@ public class SanitizedBridgesWriterTest {
 this.configuration.setProperty(Key.BridgeDescriptorMappingsLimit.name(),
 "3");
 this.defaultServerTestDescriptorBuilder.insertBeforeLineStartingWith(
-"platform ", Arrays.asList("or-address [2:5:2:5:2:5:2:5]:25"));
+"platform ", "or-address [2:5:2:5:2:5:2:5]:25");
 Path bridgeIpSecretsFile = Paths.get(statsDirectory, "bridge-ip-secrets");
 BufferedWriter writer = Files.newBufferedWriter(bridgeIpSecretsFile,
 StandardCharsets.UTF_8);
@@ -259,7 +259,7 @@ public class SanitizedBridgesWriterTest {
   @Test
   public void testServerDescriptorRouterLineTruncated() throws Exception {
 this.defaultServerTestDescriptorBuilder.replaceLineStartingWith("router ",
-Arrays.asList("router MeekGoogle"));
+"router MeekGoogle");
 this.runTest();
 assertTrue("Sanitized server descriptor with invalid router line.",
 this.parsedServerDescriptors.isEmpty());
@@ -269,8 +269,8 @@ public class SanitizedBridgesWriterTest {
   public void testServerDescriptorProtoLine() throws Exception {
 this.defaultServerTestDescriptorBuilder
 .replaceLineStartingWith("protocols ",
-Arrays.asList("proto Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 "
-+ "HSRend=1-2 Link=1-4 LinkAuth=1 Microdesc=1-2 Relay=1-2"));
+"proto Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 "
++ "HSRend=1-2 Link=1-4 LinkAuth=1 Microdesc=1-2 Relay=1-2");
 this.runTest();
 assertFalse("Sanitized server descriptor with valid proto line.",
 this.parsedServerDescriptors.isEmpty());
@@ -279,7 +279,7 @@ public class SanitizedBridgesWriterTest {
   @Test
   public void testServerDescriptorFingerprintTruncated() throws Exception {
 this.defaultServerTestDescriptorBuilder.replaceLineStartingWith(
-"fingerprint ", Arrays.asList("fingerprint 4"));
+"fingerprint ", "fingerprint 4");
 this.runTest();
 assertTrue("Sanitized server descriptor with invalid fingerprint "
 + "line.", this.parsedServerDescriptors.isEmpty());
@@ -289,7 +289,7 @@ public class SanitizedBridgesWriterTest {
   public void testServerDescriptorFingerprintInvalidHex()
   throws Exception {
 this.defaultServerTestDescriptorBuilder.replaceLineStartingWith(
-"fingerprint ", Arrays.asList("fingerprint FUN!"));
+"fingerprint ", "fingerprint FUN!");
 this.runTest();
 assertTrue("Sanitized server descriptor with invalid fingerprint "
 + "line.", this.parsedServerDescriptors.isEmpty());
@@ -299,8 +299,7 @@ public class SanitizedBridgesWriterTest {
   public void testServerDescriptorFingerprintOpt() throws Exception {
 this.defaultServerTestDescriptorBuilder
 .replaceLineStartingWith("fingerprint ",
-Arrays.asList("opt fingerprint 46D4 A711 97B8 FA51 5A82 6C6B 017C 522F 
"
-+ "E264 655B"));
+"opt fingerprint 46D4 A711 97B8 FA51 5A82 6C6B 017C 522F E264 655B");
 this.runTest();
 this.parsedServerDescriptors.get(0).contains("opt fingerprint 88F7 "
 + "4584 0F47 CE0C 6A4F E61D 8279 50B0 6F9E 4534");
@@ -310,7 +309,7 @@ public class SanitizedBridgesWriterTest {
   public void testServerDescriptorExtraInfoDigestInvalidHex()
   throws Exception {
 this.defaultServerTestDescriptorBuilder.replaceLineStartingWith(
-"extra-info-digest ", Arrays.asList("extra-info-digest 6"));
+"extra-info-digest ", "extra-info-digest 6");
 this.runTest();
 assertTrue("Sanitized server descriptor with invalid extra-info "
 + "line.", this.parsedServerDescriptors.isEmpty());
@@ -320,9 +319,9 @@ public class SanitizedBridgesWriterTest {
   public void

[tor-commits] [metrics-web/master] Remove unthrown exceptions.

2018-08-27 Thread karsten

commit 5560134c84a9113016f715a04cede6246eaeaf87
Author: Karsten Loesing 
Date:   Mon Aug 20 14:49:55 2018 +0200

Remove unthrown exceptions.
---
 src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java | 5 ++---
 src/main/java/org/torproject/metrics/web/GraphImageServlet.java| 4 +---
 src/main/java/org/torproject/metrics/web/ResearchStatsServlet.java | 4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java 
b/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java
index cfbdd6c..95c495e 100644
--- a/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java
+++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java
@@ -51,13 +51,12 @@ class Parser {
   }
 
   Ipv6NetworkStatus parseRelayNetworkStatusConsensus(
-  RelayNetworkStatusConsensus consensus) throws Exception {
+  RelayNetworkStatusConsensus consensus) {
 return this.parseStatus(true, consensus.getValidAfterMillis(),
 consensus.getStatusEntries().values());
   }
 
-  Ipv6NetworkStatus parseBridgeNetworkStatus(BridgeNetworkStatus status)
-  throws Exception {
+  Ipv6NetworkStatus parseBridgeNetworkStatus(BridgeNetworkStatus status) {
 return this.parseStatus(false, status.getPublishedMillis(),
 status.getStatusEntries().values());
   }
diff --git a/src/main/java/org/torproject/metrics/web/GraphImageServlet.java 
b/src/main/java/org/torproject/metrics/web/GraphImageServlet.java
index 1c5a8ca..b8b2fbc 100644
--- a/src/main/java/org/torproject/metrics/web/GraphImageServlet.java
+++ b/src/main/java/org/torproject/metrics/web/GraphImageServlet.java
@@ -6,7 +6,6 @@ package org.torproject.metrics.web;
 import java.io.BufferedOutputStream;
 import java.io.IOException;
 
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -33,8 +32,7 @@ public class GraphImageServlet extends HttpServlet {
 
   @Override
   public void doGet(HttpServletRequest request,
-  HttpServletResponse response) throws IOException,
-  ServletException {
+  HttpServletResponse response) throws IOException {
 
 /* Find out which graph type was requested and make sure we know this
  * graph type and file type. */
diff --git a/src/main/java/org/torproject/metrics/web/ResearchStatsServlet.java 
b/src/main/java/org/torproject/metrics/web/ResearchStatsServlet.java
index 4d06241..e4d665c 100644
--- a/src/main/java/org/torproject/metrics/web/ResearchStatsServlet.java
+++ b/src/main/java/org/torproject/metrics/web/ResearchStatsServlet.java
@@ -55,7 +55,7 @@ public class ResearchStatsServlet extends HttpServlet {
 
   @Override
   public void doGet(HttpServletRequest request,
-  HttpServletResponse response) throws IOException, ServletException {
+  HttpServletResponse response) throws IOException {
 File statsFile = this.determineStatsFile(request);
 if (statsFile == null) {
   response.sendError(HttpServletResponse.SC_NOT_FOUND);
@@ -84,7 +84,7 @@ public class ResearchStatsServlet extends HttpServlet {
   }
 
   private void writeStatsFile(File statsFile,
-  HttpServletResponse response) throws IOException, ServletException {
+  HttpServletResponse response) throws IOException {
 response.setContentType("text/csv");
 response.setHeader("Content-Length", String.valueOf(
 statsFile.length()));



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [collector/master] Use parameterized log statements.

2018-08-27 Thread karsten

commit 556a0a5ff74548edced024a5a8b40cac392b8d3a
Author: Karsten Loesing 
Date:   Tue Aug 21 10:40:08 2018 +0200

Use parameterized log statements.
---
 .../org/torproject/metrics/collector/Main.java |   2 +-
 .../bridgedescs/BridgeSnapshotReader.java  |  43 +++--
 .../bridgedescs/SanitizedBridgesWriter.java|   4 +-
 .../metrics/collector/cron/Scheduler.java  |  19 ++-
 .../collector/exitlists/ExitListDownloader.java|  10 +-
 .../metrics/collector/indexer/CreateIndexJson.java |  10 +-
 .../collector/onionperf/OnionPerfDownloader.java   |   6 +-
 .../collector/relaydescs/ArchiveReader.java|  27 ++--
 .../collector/relaydescs/ArchiveWriter.java|  74 -
 .../relaydescs/CachedRelayDescriptorReader.java|  30 ++--
 .../collector/relaydescs/ReferenceChecker.java |   4 +-
 .../relaydescs/RelayDescriptorDownloader.java  | 179 ++---
 .../relaydescs/RelayDescriptorParser.java  |   8 +-
 .../collector/webstats/SanitizeWeblogs.java|   2 +-
 14 files changed, 189 insertions(+), 229 deletions(-)

diff --git a/src/main/java/org/torproject/metrics/collector/Main.java 
b/src/main/java/org/torproject/metrics/collector/Main.java
index 6230e36..46e93af 100644
--- a/src/main/java/org/torproject/metrics/collector/Main.java
+++ b/src/main/java/org/torproject/metrics/collector/Main.java
@@ -103,7 +103,7 @@ public class Main {
   + ") and provide at least one data source and one data sink. "
   + "Refer to the manual for more information.");
 } catch (IOException e) {
-  log.error("Cannot write default configuration. Reason: " + e, e);
+  log.error("Cannot write default configuration.", e);
   throw new RuntimeException(e);
 }
   }
diff --git 
a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java
 
b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java
index fccee5e..4f72b5a 100644
--- 
a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java
+++ 
b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java
@@ -49,7 +49,7 @@ public class BridgeSnapshotReader {
 boolean modified = false;
 if (bdDir.exists()) {
   if (pbdFile.exists()) {
-logger.debug("Reading file " + pbdFile.getAbsolutePath() + "...");
+logger.debug("Reading file {}...", pbdFile.getAbsolutePath());
 try {
   BufferedReader br = new BufferedReader(new FileReader(pbdFile));
   String line;
@@ -57,16 +57,13 @@ public class BridgeSnapshotReader {
 parsed.add(line);
   }
   br.close();
-  logger.debug("Finished reading file "
-  + pbdFile.getAbsolutePath() + ".");
+  logger.debug("Finished reading file {}.", pbdFile.getAbsolutePath());
 } catch (IOException e) {
-  logger.warn("Failed reading file "
-  + pbdFile.getAbsolutePath() + "!", e);
+  logger.warn("Failed reading file {}!", pbdFile.getAbsolutePath(), e);
   return;
 }
   }
-  logger.debug("Importing files in directory " + bridgeDirectoriesDir
-  + "/...");
+  logger.debug("Importing files in directory {}/...", 
bridgeDirectoriesDir);
   Set descriptorImportHistory = new HashSet<>();
   int parsedFiles = 0;
   int skippedFiles = 0;
@@ -99,8 +96,8 @@ public class BridgeSnapshotReader {
   String fn = pop.getName();
   String[] fnParts = fn.split("-");
   if (fnParts.length != 5) {
-logger.warn("Invalid bridge descriptor tarball file name: "
-+ fn + ".  Skipping.");
+logger.warn("Invalid bridge descriptor tarball file name: {}. "
++ "Skipping.", fn);
 continue;
   }
   String authorityPart = String.format("%s-%s-", fnParts[0],
@@ -123,7 +120,7 @@ public class BridgeSnapshotReader {
   break;
 default:
   logger.warn("Did not recognize the bridge authority that "
-  + "generated " + fn + ".  Skipping.");
+  + "generated {}. Skipping.", fn);
   continue;
   }
   String dateTime = datePart.substring(0, 10) + " "
@@ -226,32 +223,28 @@ public class BridgeSnapshotReader {
 parsed.add(pop.getName());
 modified = true;
   } catch (IOException e) {
-logger.warn("Could not parse bridge snapshot "
-+ pop.getName() + "!", e);
+logger.warn("Could not parse bridge snapshot {}!", pop.getName(),
+e);
 continue;
   }
 }
   }
-  logger.debug("Finished importing files in directory "
-  + bridgeDirectoriesDir + "/.  In total, we parsed "
-  + parsedFiles + " files (skipped " +

[tor-commits] [collector/master] Remove unnecessary boxing.

2018-08-27 Thread karsten

commit 3c89aaebfb93d2dd146a693ee104ac1fd1fc9b47
Author: Karsten Loesing 
Date:   Mon Aug 20 15:00:18 2018 +0200

Remove unnecessary boxing.
---
 .../collector/sync/SyncPersistenceTest.java| 52 +++---
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git 
a/src/test/java/org/torproject/metrics/collector/sync/SyncPersistenceTest.java 
b/src/test/java/org/torproject/metrics/collector/sync/SyncPersistenceTest.java
index 101fa8b..a8f7095 100644
--- 
a/src/test/java/org/torproject/metrics/collector/sync/SyncPersistenceTest.java
+++ 
b/src/test/java/org/torproject/metrics/collector/sync/SyncPersistenceTest.java
@@ -41,14 +41,14 @@ public class SyncPersistenceTest {
 {"exit-lists/2016-09-20-13-02-00", // expected recent path
  new String[]{"exit-lists/2016/09/20/2016-09-20-13-02-00"}, // exp. out
  "2016-09-20-13-02-00", // test-filename in src/test/resources
- Integer.valueOf(1), // expected recent count of descs files
- Integer.valueOf(1)}, // expected output count of descs files
+1, // expected recent count of descs files
+1}, // expected output count of descs files
 
 {"torperf/op-nl-1048576-2017-04-11.tpf",
  new String[]{"torperf/2017/04/11/op-nl-1048576-2017-04-11.tpf"},
  "op-nl-1048576-2017-04-11.tpf",
- Integer.valueOf(1),
- Integer.valueOf(1)},
+1,
+1},
 
 {"webstats/archive.torproject.org_"
  + "archeotrichon.torproject.org_access.log_20151007.xz",
@@ -57,8 +57,8 @@ public class SyncPersistenceTest {
  + "_access.log_20151007.xz"},
  "archeotrichon.torproject.org/archive.torproject.org_"
  + "archeotrichon.torproject.org_access.log_20151007.xz",
- Integer.valueOf(1),
- Integer.valueOf(1)},
+1,
+1},
 
 {"webstats/metrics.torproject.org_"
  + "meronense.torproject.org_access.log_20170531.xz",
@@ -67,8 +67,8 @@ public class SyncPersistenceTest {
  + "_access.log_20170531.xz"},
  "meronense.torproject.org/metrics.torproject.org_"
  + "meronense.torproject.org_access.log_20170531.gz",
- Integer.valueOf(1),
- Integer.valueOf(1)},
+1,
+1},
 
 {"relay-descriptors/server-descriptors/"
  + "2016-10-05-19-06-17-server-descriptors",
@@ -93,23 +93,23 @@ public class SyncPersistenceTest {
  "relay-descriptors/server-descriptor/2016/10/a/0/"
  + "a0ed9227a9413f140445002ce412f8828591e7ec"},
  "relay-2016-10-02-16-05-00-server-descriptors",
- Integer.valueOf(1),
- Integer.valueOf(10)},
+1,
+10},
 
 {"relay-descriptors/consensuses/2016-09-20-13-00-00-consensus",
  new String[]{"relay-descriptors/consensus/2016/09/20/"
  + "2016-09-20-13-00-00-consensus"},
  "2016-09-20-13-00-00-consensus",
- Integer.valueOf(1),
- Integer.valueOf(1)},
+1,
+1},
 
 {"relay-descriptors/microdescs/consensus-microdesc/"
  + "2016-10-02-17-00-00-consensus-microdesc",
  new 
String[]{"relay-descriptors/microdesc/2016/10/consensus-microdesc/"
  + "02/2016-10-02-17-00-00-consensus-microdesc"},
  "2016-10-02-17-00-00-consensus-microdesc",
- Integer.valueOf(1),
- Integer.valueOf(1)},
+1,
+1},
 
 {"relay-descriptors/votes/2016-10-01-16-00-00-vote"
  + "-0232AF901C31A04EE9848595AF9BB7620D4C5B2E"
@@ -120,8 +120,8 @@ public class SyncPersistenceTest {
  + "-FEE63B4AB7CE5A6BDD09E9A5C4F01BD61EB7E4F1"},
  "2016-10-01-16-00-00-vote-0232AF901C31A04EE9848595AF9BB7620D4C5B2E-"
  + "FEE63B4AB7CE5A6BDD09E9A5C4F01BD61EB7E4F1",
- Integer.valueOf(1),
- Integer.valueOf(1)},
+1,
+1},
 
 {"relay-descriptors/votes/2016-09-20-13-00-00-vote-"
  + "49015F787433103580E3B66A1707A00E60F2D15B"
@@ -132,8 +132,8 @@ public class SyncPersistenceTest {
  + "-60ADC6BEC262AE921A1037D54C8A3976367DBE87"},
  "2016-09-20-13-00-00-vote-49015F787433103580E3B66A1707A00E60F2D15B"
  + "-60ADC6BEC262AE921A1037D54C8A3976367DBE87",
- Integer.valueOf(1),
- Integer.valueOf(1)},
+1,
+1},
 
 {"relay-descriptors/extra-infos/2016-10-05-19-06-17-extra-infos",
  new String[]{"relay-descriptors/extra-info/2016/10/9/a/"
@@ -155,8 +155,8 @@ public class SyncPersistenceTest {
  "relay-descriptors/extra-info/2016/10/0/4/"
  + "04219ada0be922fa7518d36b0d8e66afc55e8603"},
 "relay-2016-10-02-08-05-00-extra-infos",
- Integer.valueOf(1),
- Integer.valueOf(9)},
+1,
+9},
 
 {"bridge-descriptors/extra-infos/2016-10-05-19-06-17-extra-infos",

[tor-commits] [collector/master] Use Java 5 and 7 idioms in more places.

2018-08-27 Thread karsten

commit 3ba8bdcc16b3bf9ec24eed8a44b981a069092879
Author: Karsten Loesing 
Date:   Mon Aug 20 12:21:11 2018 +0200

Use Java 5 and 7 idioms in more places.
---
 .../bridgedescs/SanitizedBridgesWriter.java |  3 +--
 .../metrics/collector/conf/Configuration.java   |  4 ++--
 .../metrics/collector/relaydescs/ArchiveReader.java |  2 +-
 .../metrics/collector/relaydescs/ArchiveWriter.java | 21 +++--
 .../collector/relaydescs/ReferenceChecker.java  |  7 ++-
 .../relaydescs/RelayDescriptorDownloader.java   |  4 ++--
 .../collector/relaydescs/RelayDescriptorParser.java |  5 +
 .../metrics/collector/webstats/LogFileMap.java  |  4 ++--
 8 files changed, 18 insertions(+), 32 deletions(-)

diff --git 
a/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java
 
b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java
index 305c09a..6511e66 100644
--- 
a/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java
+++ 
b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java
@@ -307,8 +307,7 @@ public class SanitizedBridgesWriter extends CollecTorMain {
   /* Invalid IPv6 address. */
   return null;
 }
-for (int i = 0; i < parts.length; i++) {
-  String part = parts[i];
+for (String part : parts) {
   if (part.contains(".")) {
 String[] ipParts = part.split("\\.");
 byte[] ipv4Bytes = new byte[4];
diff --git 
a/src/main/java/org/torproject/metrics/collector/conf/Configuration.java 
b/src/main/java/org/torproject/metrics/collector/conf/Configuration.java
index 503ebbf..6f38c45 100644
--- a/src/main/java/org/torproject/metrics/collector/conf/Configuration.java
+++ b/src/main/java/org/torproject/metrics/collector/conf/Configuration.java
@@ -263,8 +263,8 @@ public class Configuration extends Observable implements 
Cloneable {
 try {
   checkClass(key, SourceType[].class);
   String[] interim = props.getProperty(key.name()).split(FIELDSEP);
-  for (int i = 0; i < interim.length; i++) {
-SourceType st = SourceType.valueOf(interim[i].trim());
+  for (String anInterim : interim) {
+SourceType st = SourceType.valueOf(anInterim.trim());
 if (null == res) {
   res = EnumSet.of(st);
 } else {
diff --git 
a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java 
b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java
index 84ad2b6..0119aef 100644
--- 
a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java
+++ 
b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java
@@ -276,7 +276,7 @@ public class ArchiveReader {
   if (!this.microdescriptorValidAfterTimes.containsKey(
   microdescriptor)) {
 this.microdescriptorValidAfterTimes.put(microdescriptor,
-new HashSet());
+new HashSet<>());
   }
   this.microdescriptorValidAfterTimes.get(microdescriptor).add(
   validAfterTime);
diff --git 
a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java 
b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java
index 11388f2..31dfdef 100644
--- 
a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java
+++ 
b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java
@@ -230,8 +230,7 @@ public class ArchiveWriter extends CollecTorMain {
 continue;
   }
   if (!this.storedServerDescriptors.containsKey(published)) {
-this.storedServerDescriptors.put(published,
-new HashMap());
+this.storedServerDescriptors.put(published, new HashMap<>());
   }
   String serverDescriptorDigest = parts[1];
   String extraInfoDescriptorDigest = parts[2].equals("NA") ? null
@@ -259,8 +258,7 @@ public class ArchiveWriter extends CollecTorMain {
 continue;
   }
   if (!this.storedExtraInfoDescriptors.containsKey(published)) {
-this.storedExtraInfoDescriptors.put(published,
-new HashSet());
+this.storedExtraInfoDescriptors.put(published, new HashSet<>());
   }
   String extraInfoDescriptorDigest = parts[1];
   this.storedExtraInfoDescriptors.get(published).add(
@@ -286,8 +284,7 @@ public class ArchiveWriter extends CollecTorMain {
 continue;
   }
   if (!this.storedMicrodescriptors.containsKey(validAfter)) {
-this.storedMicrodescriptors.put(validAfter,
-new HashSet());
+this.storedMicrodescriptors.put(validAfter, new HashSet<>());
   }
   String microdescriptorDigest = parts[1];
   this.storedMicrodescriptors.get(validAfter).add(
@@ -706,8 +703,7 @@ public class

[tor-commits] [onionoo/master] Use Arrays.asList with varargs.

2018-08-27 Thread karsten

commit 81b186c3bf2b97c8eb35cc6e83588ad9d2e94800
Author: Karsten Loesing 
Date:   Mon Aug 20 16:16:12 2018 +0200

Use Arrays.asList with varargs.
---
 .../onionoo/server/MostFrequentString.java |  2 +-
 .../torproject/onionoo/server/ResourceServlet.java |  4 +-
 .../onionoo/docs/SummaryDocumentTest.java  | 14 +++---
 .../torproject/onionoo/docs/UptimeStatusTest.java  |  4 +-
 .../onionoo/server/ResourceServletTest.java| 53 +++---
 .../server/SummaryDocumentComparatorTest.java  | 14 +++---
 .../onionoo/writer/UptimeDocumentWriterTest.java   |  8 ++--
 7 files changed, 50 insertions(+), 49 deletions(-)

diff --git 
a/src/main/java/org/torproject/onionoo/server/MostFrequentString.java 
b/src/main/java/org/torproject/onionoo/server/MostFrequentString.java
index dc9bb02..3d4d4c2 100644
--- a/src/main/java/org/torproject/onionoo/server/MostFrequentString.java
+++ b/src/main/java/org/torproject/onionoo/server/MostFrequentString.java
@@ -35,7 +35,7 @@ class MostFrequentString {
 for (Map.Entry e : stringFrequencies.entrySet()) {
   if (!sortedFrequencies.containsKey(e.getValue())) {
 sortedFrequencies.put(e.getValue(), new TreeSet<>(
-Arrays.asList(new String[] { e.getKey() } )));
+Arrays.asList(e.getKey(;
   } else {
 sortedFrequencies.get(e.getValue()).add(e.getKey());
   }
diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java 
b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java
index dce5601..4257348 100644
--- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java
+++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java
@@ -592,10 +592,10 @@ public class ResourceServlet extends HttpServlet {
   Pattern.compile("^[0-9a-zA-Z_,-]*$");
 
   private static HashSet knownOrderParameters = new HashSet<>(
-  Arrays.asList(new String[] { OrderParameterValues.CONSENSUS_WEIGHT_ASC,
+  Arrays.asList(OrderParameterValues.CONSENSUS_WEIGHT_ASC,
   OrderParameterValues.CONSENSUS_WEIGHT_DES,
   OrderParameterValues.FIRST_SEEN_ASC,
-  OrderParameterValues.FIRST_SEEN_DES }));
+  OrderParameterValues.FIRST_SEEN_DES));
 
   private String[] parseOrderParameter(String parameter) {
 if (!orderParameterPattern.matcher(parameter).matches()) {
diff --git a/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java 
b/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java
index 120a226..be183e3 100644
--- a/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java
+++ b/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java
@@ -16,18 +16,18 @@ public class SummaryDocumentTest {
   private SummaryDocument createSummaryDocumentRelayTorkaZ() {
 return new SummaryDocument(true, "TorkaZ",
 "000C5F55BD4814B917CC474BD537F1A3B33CCE2A", Arrays.asList(
-new String[] { "62.216.201.221", "62.216.201.222",
-"62.216.201.223" }), DateTimeHelper.parse("2013-04-19 05:00:00"),
-false, new TreeSet<>(Arrays.asList(new String[] { "Running",
-"Valid" })), 20L, "de",
+"62.216.201.221", "62.216.201.222",
+"62.216.201.223"), DateTimeHelper.parse("2013-04-19 05:00:00"),
+false, new TreeSet<>(Arrays.asList("Running",
+"Valid")), 20L, "de",
 DateTimeHelper.parse("2013-04-18 05:00:00"), "AS8767",
 "m-net telekommunikations gmbh",
 "torkaz  "
 + "", new TreeSet<>(Arrays.asList(
-new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC",
-"0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B" })),
+"001C13B3A55A71B977CA65EC85539D79C653A3FC",
+"0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B")),
 new TreeSet<>(Arrays.asList(
-new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC" })), null,
+"001C13B3A55A71B977CA65EC85539D79C653A3FC")), null,
 null, null, null, true);
   }
 
diff --git a/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java 
b/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java
index 1b567ac..31a7ef9 100644
--- a/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java
+++ b/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java
@@ -201,7 +201,7 @@ public class UptimeStatusTest {
   }
 
   private static final SortedSet RUNNING_FLAG =
-  new TreeSet<>(Arrays.asList(new String[] { "Running" }));
+  new TreeSet<>(Arrays.asList("Running"));
 
   @Test()
   public void testAddFlagsToNoFlagsEnd() {
@@ -251,7 +251,7 @@ public class UptimeStatusTest {
   }
 
   private static final SortedSet RUNNING_VALID_FLAGS =
-  new TreeSet<>(Arrays.asList(new String[] { "Running", "Valid" }));
+  new TreeSet<>(Arrays.asList("Running", "Valid"));
 
   @Test()
   public void testDontCompressDifferentFlags() {
diff --git 
a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java

[tor-commits] [collector/master] Remove unthrown exceptions.

2018-08-27 Thread karsten

commit cfd3aecaf7456432841cffe07b90ed0070429d6e
Author: Karsten Loesing 
Date:   Mon Aug 20 14:47:34 2018 +0200

Remove unthrown exceptions.
---
 src/main/java/org/torproject/metrics/collector/Main.java | 2 +-
 .../metrics/collector/bridgedescs/BridgeDescriptorParser.java| 4 +---
 .../metrics/collector/bridgedescs/SanitizedBridgesWriter.java| 3 +--
 .../metrics/collector/exitlists/ExitListDownloader.java  | 2 +-
 .../torproject/metrics/collector/indexer/CreateIndexJson.java| 3 +--
 .../torproject/metrics/collector/relaydescs/ArchiveWriter.java   | 2 +-
 .../org/torproject/metrics/collector/webstats/LogFileMap.java| 9 +++--
 .../torproject/metrics/collector/webstats/SanitizeWeblogs.java   | 3 +--
 src/test/java/org/torproject/metrics/collector/MainTest.java | 6 +++---
 .../collector/bridgedescs/BridgeDescriptorParserTest.java| 2 +-
 .../metrics/collector/bridgedescs/TarballTestBuilder.java| 2 +-
 .../org/torproject/metrics/collector/conf/ConfigurationTest.java | 4 ++--
 src/test/java/org/torproject/metrics/collector/cron/Broken.java  | 3 +--
 src/test/java/org/torproject/metrics/collector/cron/Counter.java | 3 +--
 src/test/java/org/torproject/metrics/collector/cron/Dummy.java   | 3 +--
 .../org/torproject/metrics/collector/sync/FileCollector.java | 4 +---
 .../torproject/metrics/collector/sync/SyncPersistenceTest.java   | 4 ++--
 .../torproject/metrics/collector/webstats/LogMetadataTest.java   | 2 +-
 18 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/src/main/java/org/torproject/metrics/collector/Main.java 
b/src/main/java/org/torproject/metrics/collector/Main.java
index 6233dd2..05aead7 100644
--- a/src/main/java/org/torproject/metrics/collector/Main.java
+++ b/src/main/java/org/torproject/metrics/collector/Main.java
@@ -61,7 +61,7 @@ public class Main {
* At most one argument.
* See class description {@link Main}.
*/
-  public static void main(String[] args) throws Exception {
+  public static void main(String[] args) {
 try {
   Path confPath = null;
   if (args == null || args.length == 0) {
diff --git 
a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java
 
b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java
index 5134f0f..c993d89 100644
--- 
a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java
+++ 
b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java
@@ -3,8 +3,6 @@
 
 package org.torproject.metrics.collector.bridgedescs;
 
-import org.torproject.metrics.collector.conf.ConfigurationException;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,7 +30,7 @@ public class BridgeDescriptorParser {
   /** Parses the first line of the given descriptor data to determine the
* descriptor type and passes it to the sanitized bridges writer. */
   public void parse(byte[] allData, String dateTime,
-  String authorityFingerprint) throws ConfigurationException {
+  String authorityFingerprint) {
 try {
   BufferedReader br = new BufferedReader(new StringReader(
   new String(allData, "US-ASCII")));
diff --git 
a/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java
 
b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java
index 6511e66..7c335c9 100644
--- 
a/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java
+++ 
b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java
@@ -440,8 +440,7 @@ public class SanitizedBridgesWriter extends CollecTorMain {
* Sanitizes a network status and writes it to disk.
*/
   public void sanitizeAndStoreNetworkStatus(byte[] data,
-  String publicationTime, String authorityFingerprint)
-  throws ConfigurationException {
+  String publicationTime, String authorityFingerprint) {
 
 if (this.persistenceProblemWithSecrets) {
   /* There's a persistence problem, so we shouldn't scrub more IP
diff --git 
a/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java
 
b/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java
index 4ef8974..2531cb7 100644
--- 
a/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java
+++ 
b/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java
@@ -194,7 +194,7 @@ public class ExitListDownloader extends CollecTorMain {
 
   /** Delete all files from the rsync directory that have not been modified
* in the last three days. */
-  public void cleanUpRsyncDirectory() throws ConfigurationException {
+  public void cleanUpRsyncDirectory() {
 long cutOffMillis = System.currentTimeMillis()
 - 3L * 24L * 60L * 60L * 1000L;
 Stack allFiles = new Stack<>();
diff --git

[tor-commits] [onionoo/master] Simplify compareTo methods.

2018-08-27 Thread karsten

commit f8ee7cf0ece963f35c311ed9e057271cdd5992bf
Author: Karsten Loesing 
Date:   Mon Aug 20 15:22:37 2018 +0200

Simplify compareTo methods.
---
 src/main/java/org/torproject/onionoo/docs/ClientsHistory.java | 3 +--
 src/main/java/org/torproject/onionoo/docs/UptimeHistory.java  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java 
b/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java
index ba21458..15e70c5 100644
--- a/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java
+++ b/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java
@@ -194,8 +194,7 @@ public class ClientsHistory implements 
Comparable {
 
   @Override
   public int compareTo(ClientsHistory other) {
-return this.startMillis < other.startMillis ? -1
-: this.startMillis > other.startMillis ? 1 : 0;
+return Long.compare(this.startMillis, other.startMillis);
   }
 
   @Override
diff --git a/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java 
b/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java
index f8cc116..d549f92 100644
--- a/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java
+++ b/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java
@@ -128,8 +128,7 @@ public class UptimeHistory implements 
Comparable {
 } else if (!this.relay && other.relay) {
   return 1;
 }
-return this.startMillis < other.startMillis ? -1
-: this.startMillis > other.startMillis ? 1 : 0;
+return Long.compare(this.startMillis, other.startMillis);
   }
 
   @Override



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Remove redundant escape in regular expression.

2018-08-27 Thread karsten

commit ab164e7a4b5228d9b7dc53d72f36d9ab070bf934
Author: Karsten Loesing 
Date:   Mon Aug 20 20:50:53 2018 +0200

Remove redundant escape in regular expression.
---
 src/main/java/org/torproject/metrics/web/UpdateNews.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/torproject/metrics/web/UpdateNews.java 
b/src/main/java/org/torproject/metrics/web/UpdateNews.java
index 4de7952..2865516 100644
--- a/src/main/java/org/torproject/metrics/web/UpdateNews.java
+++ b/src/main/java/org/torproject/metrics/web/UpdateNews.java
@@ -99,7 +99,7 @@ public class UpdateNews {
 .replaceAll("â", "")
 .replaceAll("â", "");
 String shortDesc = desc
-.replaceAll("\\<.*?\\>", "")
+.replaceAll("<.*?>", "")
 .replaceAll("&.*;", "");
 if (shortDesc.contains(". ")) {
   shortDesc = shortDesc.substring(0, shortDesc.indexOf(". "));



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Replace System.{out|err} calls with proper logging.

2018-08-27 Thread karsten

commit 344f7a5da0436ded44eb49fd0874473aa6b18b1a
Author: Karsten Loesing 
Date:   Mon Aug 20 21:51:29 2018 +0200

Replace System.{out|err} calls with proper logging.
---
 .../org/torproject/metrics/stats/clients/Main.java |  9 ++-
 .../metrics/stats/connbidirect/Main.java   | 80 +++---
 .../metrics/stats/hidserv/Aggregator.java  | 11 ++-
 .../stats/hidserv/ComputedNetworkFractions.java| 19 ++---
 .../metrics/stats/hidserv/DocumentStore.java   | 40 ++-
 .../stats/hidserv/ExtrapolatedHidServStats.java| 13 +++-
 .../metrics/stats/hidserv/Extrapolator.java|  9 ++-
 .../org/torproject/metrics/stats/hidserv/Main.java | 21 +++---
 .../torproject/metrics/stats/hidserv/Parser.java   | 30 
 .../stats/hidserv/ReportedHidServStats.java|  9 ++-
 .../torproject/metrics/stats/hidserv/Simulate.java | 16 +++--
 .../org/torproject/metrics/web/UpdateNews.java |  9 ++-
 12 files changed, 160 insertions(+), 106 deletions(-)

diff --git a/src/main/java/org/torproject/metrics/stats/clients/Main.java 
b/src/main/java/org/torproject/metrics/stats/clients/Main.java
index 4f083b9..3ccfe96 100644
--- a/src/main/java/org/torproject/metrics/stats/clients/Main.java
+++ b/src/main/java/org/torproject/metrics/stats/clients/Main.java
@@ -12,6 +12,9 @@ import org.torproject.descriptor.ExtraInfoDescriptor;
 import org.torproject.descriptor.NetworkStatusEntry;
 import org.torproject.descriptor.RelayNetworkStatusConsensus;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
@@ -25,6 +28,8 @@ import java.util.TreeMap;
 
 public class Main {
 
+  private static Logger log = LoggerFactory.getLogger(Main.class);
+
   /** Executes this data-processing module. */
   public static void main(String[] args) throws Exception {
 parseArgs(args);
@@ -46,8 +51,8 @@ public class Main {
   writeToSingleFile = false;
   byStatsDateNotByDescHour = false;
 } else {
-  System.err.println("Usage: java " + Main.class.getName()
-  + " [ --stats-date | --desc-hour ]");
+  log.warn("Usage: java {} [ --stats-date | --desc-hour ]",
+  Main.class.getName());
   System.exit(1);
 }
   }
diff --git a/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java 
b/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java
index 4474966..c4f1b34 100644
--- a/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java
+++ b/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java
@@ -8,6 +8,9 @@ import org.torproject.descriptor.DescriptorReader;
 import org.torproject.descriptor.DescriptorSourceFactory;
 import org.torproject.descriptor.ExtraInfoDescriptor;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -30,6 +33,8 @@ import java.util.TreeSet;
 
 public class Main {
 
+  private static Logger log = LoggerFactory.getLogger(Main.class);
+
   static class RawStat implements Comparable {
 
 /* Date when the statistics interval ended in days since the epoch. */
@@ -73,13 +78,13 @@ public class Main {
   return new RawStat(dateDays, fingerprint, fractionRead,
   fractionWrite, fractionBoth);
 } else {
-  System.err.println("Could not deserialize raw statistic from "
-  + "string '" + string + "'.");
+  log.warn("Could not deserialize raw statistic from string '" + string
+  + "'.");
   return null;
 }
   } catch (NumberFormatException e) {
-System.err.println("Could not deserialize raw statistic from "
-+ "string '" + string + "'.");
+log.warn("Could not deserialize raw statistic from string '{}'.",
+string, e);
 return null;
   }
 }
@@ -133,14 +138,13 @@ public class Main {
 SortedMap parseHistory = parseParseHistory(
 readStringFromFile(parseHistoryFile));
 if (parseHistory == null) {
-  System.err.println("Could not parse "
-  + parseHistoryFile.getAbsolutePath() + ".  Proceeding without "
-  + "parse history.");
+  log.warn("Could not parse {}. Proceeding without parse history.",
+  parseHistoryFile.getAbsolutePath());
 }
 SortedMap aggregateStats = parseAggregateStats(
 readStringFromFile(aggregateStatsFile));
 if (aggregateStats == null) {
-  System.err.println("Could not parse previously aggregated "
+  log.warn("Could not parse previously aggregated "
   + "statistics.  Not proceeding, because we would otherwise "
   + "lose previously aggregated values for which we don't have "
   + "raw statistics anymore.");
@@ -150,7 +154,7 @@ public class Main {
 parseHistory = addRawStatsFromDescriptors(newRawStats,
 descriptorsDirectories, parseHistory);
 if (parseHistory ==

[tor-commits] [metrics-web/master] Inline redundant local variables.

2018-08-27 Thread karsten

commit e04eec7cb742efb5348925524d9a37d5d0a66a7a
Author: Karsten Loesing 
Date:   Tue Aug 21 14:09:58 2018 +0200

Inline redundant local variables.
---
 src/main/java/org/torproject/metrics/stats/hidserv/Parser.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java 
b/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java
index 5970e32..558ce39 100644
--- a/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java
+++ b/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java
@@ -241,9 +241,7 @@ public class Parser {
   private long removeNoise(long reportedNumber, long binSize) {
 long roundedToNearestRightSideOfTheBin =
 Math.floorDiv((reportedNumber + binSize / 2), binSize) * binSize;
-long subtractedHalfOfBinSize =
-roundedToNearestRightSideOfTheBin - binSize / 2;
-return subtractedHalfOfBinSize;
+return roundedToNearestRightSideOfTheBin - binSize / 2;
   }
 
   /** Parses the given consensus. */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Use diamond operator.

2018-08-27 Thread karsten

commit 429c9e01a5425ad6f39432adcea97f85d8d30813
Author: Karsten Loesing 
Date:   Mon Aug 20 15:06:18 2018 +0200

Use diamond operator.
---
 src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java| 2 +-
 .../torproject/metrics/stats/hidserv/ComputedNetworkFractions.java| 4 ++--
 2 files changed, 3 insertions(+), 3 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 5cafb1b..004bcf8 100644
--- a/src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java
+++ b/src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java
@@ -93,7 +93,7 @@ public class Aggregator {
   }
   if (extrapolated.getFractionDirOnionsSeen() > 0.0) {
 if (!extrapolatedOnions.containsKey(date)) {
-  extrapolatedOnions.put(date, new ArrayList());
+  extrapolatedOnions.put(date, new ArrayList<>());
 }
 extrapolatedOnions.get(date).add(new double[] {
 extrapolated.getExtrapolatedDirOnionsSeen(),
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 48f3679..64547cc 100644
--- 
a/src/main/java/org/torproject/metrics/stats/hidserv/ComputedNetworkFractions.java
+++ 
b/src/main/java/org/torproject/metrics/stats/hidserv/ComputedNetworkFractions.java
@@ -84,7 +84,7 @@ public class ComputedNetworkFractions implements Document {
   }
 
   private static Map previouslyFormattedDates =
-  Collections.synchronizedMap(new HashMap());
+  Collections.synchronizedMap(new HashMap<>());
 
   /** Returns a string representation of this object, consisting of two
* strings: the first string contains fingerprint and valid-after date,
@@ -117,7 +117,7 @@ public class ComputedNetworkFractions implements Document {
   }
 
   private static Map previouslyParsedDates =
-  Collections.synchronizedMap(new HashMap());
+  Collections.synchronizedMap(new HashMap<>());
 
   /** Instantiates an empty fractions object that will be initialized more
* by the parse method.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [collector/master] Inline redundant local variables.

2018-08-27 Thread karsten

commit 7c44c114e47603df5e643c67975568821ab6f7cb
Author: Karsten Loesing 
Date:   Tue Aug 21 14:10:41 2018 +0200

Inline redundant local variables.
---
 .../metrics/collector/bridgedescs/BridgeSnapshotReader.java| 5 ++---
 .../metrics/collector/bridgedescs/SanitizedBridgesWriter.java  | 7 ++-
 .../org/torproject/metrics/collector/indexer/CreateIndexJson.java  | 6 ++
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git 
a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java
 
b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java
index 4f72b5a..f16122a 100644
--- 
a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java
+++ 
b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java
@@ -44,10 +44,9 @@ public class BridgeSnapshotReader {
 }
 
 SortedSet parsed = new TreeSet<>();
-File bdDir = bridgeDirectoriesDir;
 File pbdFile = new File(statsDirectory, "parsed-bridge-directories");
 boolean modified = false;
-if (bdDir.exists()) {
+if (bridgeDirectoriesDir.exists()) {
   if (pbdFile.exists()) {
 logger.debug("Reading file {}...", pbdFile.getAbsolutePath());
 try {
@@ -73,7 +72,7 @@ public class BridgeSnapshotReader {
   int parsedExtraInfoDescriptors = 0;
   int skippedExtraInfoDescriptors = 0;
   Stack filesInInputDir = new Stack<>();
-  filesInInputDir.add(bdDir);
+  filesInInputDir.add(bridgeDirectoriesDir);
   while (!filesInInputDir.isEmpty()) {
 File pop = filesInInputDir.pop();
 if (pop.isDirectory()) {
diff --git 
a/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java
 
b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java
index d9a0322..921396c 100644
--- 
a/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java
+++ 
b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java
@@ -274,11 +274,10 @@ public class SanitizedBridgesWriter extends CollecTorMain 
{
   byte[] secret = this.getSecretForMonth(month);
   System.arraycopy(secret, 0, hashInput, 24, 31);
   byte[] hashOutput = DigestUtils.sha256(hashInput);
-  String hashedAddress = "10."
+  return "10."
   + (((int) hashOutput[0] + 256) % 256) + "."
   + (((int) hashOutput[1] + 256) % 256) + "."
   + (((int) hashOutput[2] + 256) % 256);
-  return hashedAddress;
 } else {
   return "127.0.0.1";
 }
@@ -1090,9 +1089,7 @@ public class SanitizedBridgesWriter extends CollecTorMain 
{
   masterKeyEd25519, 0, masterKeyEd25519.length);
   String masterKeyEd25519Base64 = Base64.encodeBase64String(
   masterKeyEd25519);
-  String masterKeyEd25519Base64NoTrailingEqualSigns =
-  masterKeyEd25519Base64.replaceAll("=", "");
-  return masterKeyEd25519Base64NoTrailingEqualSigns;
+  return masterKeyEd25519Base64.replaceAll("=", "");
 }
 extensionStart += 4 + extensionLength;
   }
diff --git 
a/src/main/java/org/torproject/metrics/collector/indexer/CreateIndexJson.java 
b/src/main/java/org/torproject/metrics/collector/indexer/CreateIndexJson.java
index a018f8b..a40798e 100644
--- 
a/src/main/java/org/torproject/metrics/collector/indexer/CreateIndexJson.java
+++ 
b/src/main/java/org/torproject/metrics/collector/indexer/CreateIndexJson.java
@@ -146,16 +146,14 @@ public class CreateIndexJson extends CollecTorMain {
 }
   }
 }
-DirectoryNode directoryNode = new DirectoryNode(
+return new DirectoryNode(
 directory.getName(), fileNodes.isEmpty() ? null : fileNodes,
 directoryNodes.isEmpty() ? null : directoryNodes);
-return directoryNode;
   }
 
   private FileNode indexFile(File file) {
-FileNode fileNode = new FileNode(file.getName(), file.length(),
+return new FileNode(file.getName(), file.length(),
 dateTimeFormat.format(file.lastModified()));
-return fileNode;
   }
 
   private void writeIndex(IndexNode indexNode) throws Exception {



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Replace addAll with parameterized constructor call.

2018-08-27 Thread karsten

commit e57ed27ed3d5b043769699ee78cfca3453d4dca9
Author: Karsten Loesing 
Date:   Mon Aug 20 16:26:07 2018 +0200

Replace addAll with parameterized constructor call.
---
 .../torproject/metrics/stats/servers/ConsensusStatsFileHandler.java| 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git 
a/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java
 
b/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java
index c736496..c1c1e8b 100644
--- 
a/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java
+++ 
b/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java
@@ -321,9 +321,8 @@ public class ConsensusStatsFileHandler {
 /* Add average number of bridges per day to the database. */
 if (connectionUrl != null) {
   try {
-Map insertRows = new HashMap<>();
 Map updateRows = new HashMap<>();
-insertRows.putAll(this.bridgesPerDay);
+Map insertRows = new HashMap<>(this.bridgesPerDay);
 Connection conn = DriverManager.getConnection(connectionUrl);
 conn.setAutoCommit(false);
 Statement statement = conn.createStatement();



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Replace anonymous types with lambdas.

2018-08-27 Thread karsten

commit cb966bc48ce30d4cef0195b713168e2020e412bf
Author: Karsten Loesing 
Date:   Mon Aug 20 15:10:15 2018 +0200

Replace anonymous types with lambdas.
---
 .../metrics/stats/hidserv/Aggregator.java  |  7 +---
 .../torproject/metrics/stats/hidserv/Simulate.java | 14 ++--
 .../org/torproject/metrics/web/NewsServlet.java|  8 ++---
 .../torproject/metrics/web/RObjectGenerator.java   | 39 ++
 4 files changed, 23 insertions(+), 45 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 004bcf8..2420485 100644
--- a/src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java
+++ b/src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java
@@ -125,12 +125,7 @@ public class Aggregator {
  * element.  (The second array element contains the computed
  * network fraction as weight.) */
 Collections.sort(weightedValues,
-new Comparator() {
-  public int compare(double[] first, double[] second) {
-return Double.compare(first[0], second[0]);
-  }
-}
-);
+Comparator.comparingDouble(doubles -> doubles[0]));
 
 /* For the weighted mean, sum up all previously extrapolated
  * values weighted with their network fractions (which happens to
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 a7bc1c3..2c525d7 100644
--- a/src/main/java/org/torproject/metrics/stats/hidserv/Simulate.java
+++ b/src/main/java/org/torproject/metrics/stats/hidserv/Simulate.java
@@ -172,12 +172,7 @@ public class Simulate {
   } while (totalReportingProbability < fraction - 0.001
   || totalReportingProbability > fraction + 0.001);
   Collections.sort(singleRelayExtrapolations,
-  new Comparator() {
-public int compare(double[] o1, double[] o2) {
-  return o1[0] < o2[0] ? -1 : o1[0] > o2[0] ? 1 : 0;
-}
-  }
-  );
+  Comparator.comparingDouble(o -> o[0]));
   double totalProbability = 0.0;
   double totalValues = 0.0;
   double totalInterquartileProbability = 0.0;
@@ -332,12 +327,7 @@ public class Simulate {
   } while (totalReportingProbability < fraction - 0.001
   || totalReportingProbability > fraction + 0.001);
   Collections.sort(singleRelayExtrapolations,
-  new Comparator() {
-public int compare(double[] first, double[] second) {
-  return Double.compare(first[0], second[0]);
-}
-  }
-  );
+  Comparator.comparingDouble(doubles -> doubles[0]));
   double totalProbability = 0.0;
   double totalValues = 0.0;
   double totalInterquartileProbability = 0.0;
diff --git a/src/main/java/org/torproject/metrics/web/NewsServlet.java 
b/src/main/java/org/torproject/metrics/web/NewsServlet.java
index a5775dd..fc4d39f 100644
--- a/src/main/java/org/torproject/metrics/web/NewsServlet.java
+++ b/src/main/java/org/torproject/metrics/web/NewsServlet.java
@@ -7,7 +7,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
@@ -37,11 +36,8 @@ public class NewsServlet extends AnyServlet {
 sortedNews.add(news);
   }
 }
-Collections.sort(sortedNews, new Comparator() {
-  public int compare(News o1, News o2) {
-return o1.getStart().compareTo(o2.getStart()) * -1;
-  }
-});
+Collections.sort(sortedNews,
+(o1, o2) -> o1.getStart().compareTo(o2.getStart()) * -1);
 this.sortedNews = sortedNews;
 SortedMap countries = new TreeMap<>();
 for (String[] country : Countries.getInstance().getCountryList()) {
diff --git a/src/main/java/org/torproject/metrics/web/RObjectGenerator.java 
b/src/main/java/org/torproject/metrics/web/RObjectGenerator.java
index 49e24ec..9943f17 100644
--- a/src/main/java/org/torproject/metrics/web/RObjectGenerator.java
+++ b/src/main/java/org/torproject/metrics/web/RObjectGenerator.java
@@ -76,30 +76,27 @@ public class RObjectGenerator implements 
ServletContextListener {
 servletContext.setAttribute("RObjectGenerator", this);
 
 /* Periodically generate R objects with default parameters. */
-new Thread() {
-  @Override
-  public void run() {
-long lastUpdated = 0L;
-long sleep;
-while (true) {
-  while ((sleep = maxCacheAge * 1000L / 2L + lastUpdated
-  - System.currentTimeMillis()) > 0L) {
-try {
-  Thread.sleep(sleep);
-} catch (InterruptedException e) {
-  /* Nothing we can handle. */
-}
+new Thread(() -> {
+  long

[tor-commits] [metrics-web/master] Update ExoneraTor translations.

2018-08-27 Thread karsten

commit 9f0cc38f82aacdfea3b7af16104082f7e09802e8
Author: Karsten Loesing 
Date:   Mon Aug 20 10:28:59 2018 +0200

Update ExoneraTor translations.
---
 .../web/properties/ExoneraTor_de.properties| 18 ++
 .../web/properties/ExoneraTor_fr.properties| 22 --
 .../web/properties/ExoneraTor_ro.properties| 14 --
 .../web/properties/ExoneraTor_sv.properties| 18 ++
 4 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/src/main/resources/web/properties/ExoneraTor_de.properties 
b/src/main/resources/web/properties/ExoneraTor_de.properties
index d830e31..fbe8464 100644
--- a/src/main/resources/web/properties/ExoneraTor_de.properties
+++ b/src/main/resources/web/properties/ExoneraTor_de.properties
@@ -4,14 +4,14 @@ form.timestamp.label=Datum
 form.search.label=Suchen
 summary.heading=Zusammenfassung
 summary.serverproblem.dbnoconnect.title=Server-Problem
-summary.serverproblem.dbnoconnect.body.text=Es kann keine Verbindung zur 
Datenbank hergestellt werden. Bitte versuchen Sie es sp\u00e4ter noch einmal. 
Sollte dieses Problem weiterhin bestehen %s.
+summary.serverproblem.dbnoconnect.body.text=Es kann keine Verbindung zur 
Datenbank hergestellt werden. Bitte versuchen Sie es sp\u00e4ter noch einmal. 
Sollte dieses Problem weiterhin bestehen %s!
 summary.serverproblem.dbnoconnect.body.link=lassen Sie es uns bitte wissen
 summary.serverproblem.dbempty.title=Server-Problem
-summary.serverproblem.dbempty.body.text=Die Datenbank scheint leer zu sein. 
Bitte versuchen Sie es sp\u00e4ter noch einmal. Sollte dieses Problem weiterhin 
bestehen %s.
+summary.serverproblem.dbempty.body.text=Die Datenbank scheint leer zu sein. 
Bitte versuchen Sie es sp\u00e4ter noch einmal. Sollte dieses Problem weiterhin 
bestehen %s!
 summary.serverproblem.dbempty.body.link=lassen Sie es uns bitte wissen
 summary.invalidparams.notimestamp.title=Kein Datum angegeben
 summary.invalidparams.notimestamp.body=Sie m\u00fcssen ein Datum angeben.
-summary.invalidparams.noip.title=Keine IP-Adresse angegeben.
+summary.invalidparams.noip.title=Keine IP-Adresse angegeben
 summary.invalidparams.noip.body=Sie m\u00fcssen eine IP-Adresse angeben.
 summary.invalidparams.timestamprange.title=Datum au\u00dferhalb des 
zul\u00e4ssigen Bereichs
 summary.invalidparams.timestamprange.body=Die Datenbank enth\u00e4lt keine 
Daten vom %s. Bitte w\u00e4hlen Sie ein Datum zwischen %s und %s aus.
@@ -19,8 +19,10 @@ summary.invalidparams.invalidip.title=Ung\u00fcltige 
IP-Adresse
 summary.invalidparams.invalidip.body=%s ist keine g\u00fcltige IP-Adresse. 
Zul\u00e4ssige IP-Adress-Formate sind %s oder %s.
 summary.invalidparams.invalidtimestamp.title=Ung\u00fcltiges Datum
 summary.invalidparams.invalidtimestamp.body=%s ist kein g\u00fcltiges Datum. 
Das zul\u00e4ssige Datumsformat ist %s.
+summary.invalidparams.timestamptoorecent.title=Datumsparameter zu neu
+summary.invalidparams.timestamptoorecent.body=M\u00f6glicherweise enth\u00e4lt 
die Datenbank noch nicht gen\u00fcgend Daten, um diese Anfrage korrekt zu 
beantworten. Das letzte g\u00fcltige Datum ist vorgestern. Bitte wiederholen 
Sie Ihre Suche an einem anderen Tag.
 summary.serverproblem.nodata.title=Server-Problem
-summary.serverproblem.nodata.body.text=Die Datenbank enth\u00e4lt keine Daten 
f\u00fcr das angegebene Datum. Bitte versuchen Sie es sp\u00e4ter noch einmal. 
Sollte dieses Problem weiterhin bestehen %s.
+summary.serverproblem.nodata.body.text=Die Datenbank enth\u00e4lt keine Daten 
f\u00fcr das angegebene Datum. Bitte versuchen Sie es sp\u00e4ter noch einmal. 
Sollte dieses Problem weiterhin bestehen %s!
 summary.serverproblem.nodata.body.link=lassen Sie es uns bitte wissen
 summary.negativesamenetwork.title=Keine \u00dcbereinstimmungen gefunden
 summary.negativesamenetwork.body=Es wurde kein Tor-Server mit der IP-Adresse 
%s am %s bzw. am Tag vorher oder nachher gefunden. Es wurden jedoch benachbarte 
IP-Adressen im selben /%d-Netzwerk an diesen Tagen gefunden:
@@ -41,12 +43,12 @@ technicaldetails.exit.yes=Ja
 technicaldetails.exit.no=Nein
 permanentlink.heading=Dauerhafter Link
 footer.abouttor.heading=\u00dcber Tor
-footer.abouttor.body.text=Tor ist ein internationales Softwareprojekt, um 
Internetverbindungen zu anonymisieren indem %s. Wenn Sie eine 
Internetverbindung sehen, die von einem Tor-Server kommt, stammt diese in der 
Regel von jemandem, der Tor benutzt, und nicht vom Betreiber des Tor-Servers 
selbst. Weder The Tor Project, Inc. noch die Tor-Server-Betreiber besitzen 
Aufzeichnungen \u00fcber die Internetverbindungen im Tor-Netzwerk und 
k\u00f6nnen daher keine Auskunft \u00fcber den Ursprung der Internetverbindung 
geben. Mehr Informationen \u00fcber Tor erhalten Sie %s. The Tor Project, Inc. 
steht Ihnen jederzeit f\u00fcr %s zur Verf\u00fcgung.
-footer.abouttor.body.link1=Datenpakete verschl\u00fcsselt und \u00fcber eine 
Reihe von Stationen geleitet werden, bevor diese ihr

[tor-commits] [metrics-web/master] Remove now redundant mapping.

2018-08-27 Thread karsten

commit e75bc297c2d4728946dffd369a2a8fb6c914d52a
Author: Karsten Loesing 
Date:   Mon Aug 20 15:54:31 2018 +0200

Remove now redundant mapping.
---
 src/main/java/org/torproject/metrics/stats/webstats/Main.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/java/org/torproject/metrics/stats/webstats/Main.java 
b/src/main/java/org/torproject/metrics/stats/webstats/Main.java
index 5d4..a154e64 100644
--- a/src/main/java/org/torproject/metrics/stats/webstats/Main.java
+++ b/src/main/java/org/torproject/metrics/stats/webstats/Main.java
@@ -122,9 +122,6 @@ public class Main {
   }
   try {
 Map parsedLogLines = logFile.logLines().parallel()
-/* The following mapping can be removed with metrics-lib
-   version > 2.2.0 */
-.map(line -> (WebServerAccessLog.Line) line)
 .collect(groupingByConcurrent(line
 -> String.format("%s %s %d", line.getMethod().name(),
 truncateString(line.getRequest(), 2048), line.getResponse()),



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Delete methods that only call their super.

2018-08-27 Thread karsten

commit af0900d18c1461db90a9512231e9342ad4c57a64
Author: Karsten Loesing 
Date:   Mon Aug 20 20:16:06 2018 +0200

Delete methods that only call their super.
---
 .../metrics/stats/hidserv/DateTimeHelper.java | 19 +--
 .../java/org/torproject/metrics/web/AboutServlet.java |  5 -
 .../org/torproject/metrics/web/BubblesServlet.java|  5 -
 .../torproject/metrics/web/DevelopmentServlet.java|  5 -
 .../java/org/torproject/metrics/web/ErrorServlet.java |  5 -
 .../org/torproject/metrics/web/GlossaryServlet.java   |  5 -
 .../java/org/torproject/metrics/web/IndexServlet.java |  5 -
 .../java/org/torproject/metrics/web/LinkServlet.java  |  5 -
 .../org/torproject/metrics/web/MetricsLibServlet.java |  5 -
 .../org/torproject/metrics/web/OnionooServlet.java|  5 -
 .../org/torproject/metrics/web/OperationServlet.java  |  5 -
 .../torproject/metrics/web/RelaySearchServlet.java|  5 -
 .../metrics/web/ReproducibleMetricsServlet.java   |  5 -
 .../org/torproject/metrics/web/ResearchServlet.java   |  5 -
 .../org/torproject/metrics/web/ServicesServlet.java   |  5 -
 .../org/torproject/metrics/web/SourcesServlet.java|  5 -
 .../java/org/torproject/metrics/web/StatsServlet.java |  5 -
 17 files changed, 1 insertion(+), 98 deletions(-)

diff --git 
a/src/main/java/org/torproject/metrics/stats/hidserv/DateTimeHelper.java 
b/src/main/java/org/torproject/metrics/stats/hidserv/DateTimeHelper.java
index 58a785e..ade7024 100644
--- a/src/main/java/org/torproject/metrics/stats/hidserv/DateTimeHelper.java
+++ b/src/main/java/org/torproject/metrics/stats/hidserv/DateTimeHelper.java
@@ -40,24 +40,7 @@ public class DateTimeHelper {
* timestamps, protected using ThreadLocal to ensure that each thread
* uses its own instances. */
   private static ThreadLocal> dateFormats =
-  new ThreadLocal>() {
-
-public Map get() {
-  return super.get();
-}
-
-protected Map initialValue() {
-  return new HashMap<>();
-}
-
-public void remove() {
-  super.remove();
-}
-
-public void set(Map value) {
-  super.set(value);
-}
-  };
+  ThreadLocal.withInitial(HashMap::new);
 
   /** Returns an instance of DateFormat for the given format, and if no
* such instance exists, creates one and puts it in the map. */
diff --git a/src/main/java/org/torproject/metrics/web/AboutServlet.java 
b/src/main/java/org/torproject/metrics/web/AboutServlet.java
index 30cb606..db39120 100644
--- a/src/main/java/org/torproject/metrics/web/AboutServlet.java
+++ b/src/main/java/org/torproject/metrics/web/AboutServlet.java
@@ -14,11 +14,6 @@ public class AboutServlet extends AnyServlet {
   private static final long serialVersionUID = 97168997894664L;
 
   @Override
-  public void init() throws ServletException {
-super.init();
-  }
-
-  @Override
   public void doGet(HttpServletRequest request,
   HttpServletResponse response) throws IOException, ServletException {
 
diff --git a/src/main/java/org/torproject/metrics/web/BubblesServlet.java 
b/src/main/java/org/torproject/metrics/web/BubblesServlet.java
index 8f83184..d59c0f5 100644
--- a/src/main/java/org/torproject/metrics/web/BubblesServlet.java
+++ b/src/main/java/org/torproject/metrics/web/BubblesServlet.java
@@ -16,11 +16,6 @@ public class BubblesServlet extends MetricServlet {
   private static final long serialVersionUID = -6011833075497881033L;
 
   @Override
-  public void init() throws ServletException {
-super.init();
-  }
-
-  @Override
   public void doGet(HttpServletRequest request,
   HttpServletResponse response) throws IOException, ServletException {
 String requestUri = request.getRequestURI();
diff --git a/src/main/java/org/torproject/metrics/web/DevelopmentServlet.java 
b/src/main/java/org/torproject/metrics/web/DevelopmentServlet.java
index a330ab1..540273d 100644
--- a/src/main/java/org/torproject/metrics/web/DevelopmentServlet.java
+++ b/src/main/java/org/torproject/metrics/web/DevelopmentServlet.java
@@ -14,11 +14,6 @@ public class DevelopmentServlet extends AnyServlet {
   private static final long serialVersionUID = 6850919895248020945L;
 
   @Override
-  public void init() throws ServletException {
-super.init();
-  }
-
-  @Override
   public void doGet(HttpServletRequest request,
   HttpServletResponse response) throws IOException, ServletException {
 
diff --git a/src/main/java/org/torproject/metrics/web/ErrorServlet.java 
b/src/main/java/org/torproject/metrics/web/ErrorServlet.java
index f3d6974..49fbd68 100644
--- a/src/main/java/org/torproject/metrics/web/ErrorServlet.java
+++ b/src/main/java/org/torproject/metrics/web/ErrorServlet.java
@@ -14,11 +14,6 @@ public class ErrorServlet extends AnyServlet {
   private static final long serialVersionUID = 6850919895248020945L;
 
   @Override
-  public void init() throws ServletException {
-super.init();
-  }
-
-  @Override
   public void

[tor-commits] [onionoo/master] Remove an unnecessary return statement.

2018-08-27 Thread karsten

commit 91588c989c0c4cd489b3a13f11683266247399cb
Author: Karsten Loesing 
Date:   Tue Aug 21 11:47:29 2018 +0200

Remove an unnecessary return statement.
---
 src/main/java/org/torproject/onionoo/server/RequestHandler.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/torproject/onionoo/server/RequestHandler.java 
b/src/main/java/org/torproject/onionoo/server/RequestHandler.java
index 81cd8dc..d1e9cce 100644
--- a/src/main/java/org/torproject/onionoo/server/RequestHandler.java
+++ b/src/main/java/org/torproject/onionoo/server/RequestHandler.java
@@ -209,7 +209,6 @@ public class RequestHandler {
   private void filterByType() {
 if (this.type == null) {
   /* Not filtering by type. */
-  return;
 } else if (this.type.equals("relay")) {
   this.filteredBridges.clear();
 } else {



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Use more powerful Map methods.

2018-08-27 Thread karsten

commit c5f0530e1b2ffba49dc51155ca80d3d5104dfe15
Author: Karsten Loesing 
Date:   Mon Aug 20 15:20:36 2018 +0200

Use more powerful Map methods.
---
 src/main/java/org/torproject/metrics/web/News.java | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/org/torproject/metrics/web/News.java 
b/src/main/java/org/torproject/metrics/web/News.java
index deeddf2..bd80ad4 100644
--- a/src/main/java/org/torproject/metrics/web/News.java
+++ b/src/main/java/org/torproject/metrics/web/News.java
@@ -87,11 +87,7 @@ public class News {
 }
 List placeNames = new ArrayList<>();
 for (String place : this.places) {
-  if (countries.containsKey(place)) {
-placeNames.add(countries.get(place));
-  } else {
-placeNames.add("Unknown Country");
-  }
+  placeNames.add(countries.getOrDefault(place, "Unknown Country"));
 }
 return placeNames;
   }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Remove some more redundant modifiers.

2018-08-27 Thread karsten

commit 9892034b2d9df696c618e11cc0bd8d563128e79f
Author: Karsten Loesing 
Date:   Tue Aug 21 09:45:59 2018 +0200

Remove some more redundant modifiers.
---
 src/main/java/org/torproject/metrics/stats/hidserv/Document.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/Document.java 
b/src/main/java/org/torproject/metrics/stats/hidserv/Document.java
index 7c915a1..5711a53 100644
--- a/src/main/java/org/torproject/metrics/stats/hidserv/Document.java
+++ b/src/main/java/org/torproject/metrics/stats/hidserv/Document.java
@@ -15,12 +15,12 @@ public interface Document {
* group.  Ideally, the first string is equivalent for many documents
* stored in the same file, and the second string is different for those
* documents. */
-  public String[] format();
+  String[] format();
 
   /** Initializes an object using the given array of two strings.
*
* These are the same two strings that the format method
* provides. */
-  public boolean parse(String[] formattedStrings);
+  boolean parse(String[] formattedStrings);
 }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Remove redundant initializers.

2018-08-27 Thread karsten

commit 9e505746e5cc6495a0d9687d300d09cdee1e2bda
Author: Karsten Loesing 
Date:   Mon Aug 20 16:30:04 2018 +0200

Remove redundant initializers.
---
 .../metrics/stats/hidserv/ExtrapolatedHidServStats.java   | 8 
 .../torproject/metrics/stats/hidserv/ReportedHidServStats.java| 6 +++---
 .../metrics/stats/servers/ConsensusStatsFileHandler.java  | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

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 d4a741d..9379d87 100644
--- 
a/src/main/java/org/torproject/metrics/stats/hidserv/ExtrapolatedHidServStats.java
+++ 
b/src/main/java/org/torproject/metrics/stats/hidserv/ExtrapolatedHidServStats.java
@@ -142,10 +142,10 @@ public class ExtrapolatedHidServStats implements Document 
{
   return false;
 }
 String fingerprint = secondParts[0];
-double extrapolatedRendRelayedCells = 0.0;
-double fractionRendRelayedCells = 0.0;
-double extrapolatedDirOnionsSeen = 0.0;
-double fractionDirOnionsSeen = 0.0;
+double extrapolatedRendRelayedCells;
+double fractionRendRelayedCells;
+double extrapolatedDirOnionsSeen;
+double fractionDirOnionsSeen;
 try {
   extrapolatedRendRelayedCells = secondParts[1].equals("") ? 0.0
   : Double.parseDouble(secondParts[1]);
diff --git 
a/src/main/java/org/torproject/metrics/stats/hidserv/ReportedHidServStats.java 
b/src/main/java/org/torproject/metrics/stats/hidserv/ReportedHidServStats.java
index 0ff5fd4..08ab024 100644
--- 
a/src/main/java/org/torproject/metrics/stats/hidserv/ReportedHidServStats.java
+++ 
b/src/main/java/org/torproject/metrics/stats/hidserv/ReportedHidServStats.java
@@ -120,9 +120,9 @@ public class ReportedHidServStats implements Document {
 if (statsEndMillis == DateTimeHelper.NO_TIME_AVAILABLE) {
   return false;
 }
-long statsIntervalSeconds = -1L;
-long rendRelayedCells = -1L;
-long dirOnionsSeen = -1L;
+long statsIntervalSeconds;
+long rendRelayedCells;
+long dirOnionsSeen;
 try {
   statsIntervalSeconds = Long.parseLong(secondParts[1]);
   rendRelayedCells = Long.parseLong(secondParts[2]);
diff --git 
a/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java
 
b/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java
index c1c1e8b..ebbce60 100644
--- 
a/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java
+++ 
b/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java
@@ -71,7 +71,7 @@ public class ConsensusStatsFileHandler {
   private int bridgeResultsAdded = 0;
 
   /* Database connection string. */
-  private String connectionUrl = null;
+  private String connectionUrl;
 
   private SimpleDateFormat dateTimeFormat;
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Use parameterized map for parameters.

2018-08-27 Thread karsten

commit a695f2ff928ea8593fe268d4c883e07920c67865
Author: Karsten Loesing 
Date:   Mon Aug 20 16:01:54 2018 +0200

Use parameterized map for parameters.
---
 src/main/java/org/torproject/metrics/web/RObjectGenerator.java  | 6 +++---
 src/main/java/org/torproject/metrics/web/TableParameterChecker.java | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/torproject/metrics/web/RObjectGenerator.java 
b/src/main/java/org/torproject/metrics/web/RObjectGenerator.java
index 9943f17..196e834 100644
--- a/src/main/java/org/torproject/metrics/web/RObjectGenerator.java
+++ b/src/main/java/org/torproject/metrics/web/RObjectGenerator.java
@@ -92,7 +92,7 @@ public class RObjectGenerator implements 
ServletContextListener {
   generateTable(tableId, new HashMap(), false);
 }
 for (String graphId : availableGraphs.keySet()) {
-  generateGraph(graphId, "png", new HashMap(), false);
+  generateGraph(graphId, "png", new HashMap<>(), false);
 }
 lastUpdated = System.currentTimeMillis();
   }
@@ -108,7 +108,7 @@ public class RObjectGenerator implements 
ServletContextListener {
* the given parameters, possibly after checking whether the cache
* already contains that graph. */
   public RObject generateGraph(String requestedGraph, String fileType,
-  Map parameterMap, boolean checkCache) {
+  Map parameterMap, boolean checkCache) {
 if (!this.availableGraphs.containsKey(requestedGraph)
 || this.availableGraphs.get(requestedGraph).getFunction()
 == null) {
@@ -168,7 +168,7 @@ public class RObjectGenerator implements 
ServletContextListener {
* possibly after checking whether the cache already contains that
* table. */
   public List> generateTable(String requestedTable,
-  Map parameterMap, boolean checkCache) {
+  Map parameterMap, boolean checkCache) {
 if (!this.availableTables.containsKey(requestedTable)
 || this.availableTables.get(requestedTable).getFunction()
 == null) {
diff --git 
a/src/main/java/org/torproject/metrics/web/TableParameterChecker.java 
b/src/main/java/org/torproject/metrics/web/TableParameterChecker.java
index 02e9acb..a919097 100644
--- a/src/main/java/org/torproject/metrics/web/TableParameterChecker.java
+++ b/src/main/java/org/torproject/metrics/web/TableParameterChecker.java
@@ -57,7 +57,7 @@ public class TableParameterChecker {
* the parameters are invalid.
*/
   public Map checkParameters(String tableType,
-  Map requestParameters) {
+  Map requestParameters) {
 
 /* Check if the table type exists. */
 if (tableType == null
@@ -80,8 +80,8 @@ public class TableParameterChecker {
   String[] startParameter = null;
   String[] endParameter = null;
   if (requestParameters != null) {
-startParameter = (String[]) requestParameters.get("start");
-endParameter = (String[]) requestParameters.get("end");
+startParameter = requestParameters.get("start");
+endParameter = requestParameters.get("end");
   }
   long endTimestamp = System.currentTimeMillis();
   if (endParameter != null && endParameter.length > 0



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

1 2 3 4 >

1 - 100 of 342 matches

Mail list logo