date:20180118

[tor-commits] [tor-browser-build/master] Pick up Firefox changes

2018-01-18 Thread gk

commit 980115dae789978ea0050a50a8c74a9e8f745ebb
Author: Georg Koppen 
Date:   Fri Jan 19 07:27:58 2018 +

Pick up Firefox changes

Use tor-browser -2 and build number bump
---
 projects/firefox-langpacks/config | 2 +-
 projects/firefox/config   | 4 ++--
 rbm.conf  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/firefox-langpacks/config 
b/projects/firefox-langpacks/config
index 4e42939..04cd7dd 100644
--- a/projects/firefox-langpacks/config
+++ b/projects/firefox-langpacks/config
@@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") 
%]-[% c("var/buil
 
 var:
   ff_version: '[% pc("firefox", "var/firefox_version") %]'
-  ff_build: build1
+  ff_build: build2
   ff_arch: linux-i686
   input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
 
diff --git a/projects/firefox/config b/projects/firefox/config
index c433deb..4157500 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% 
c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-1-build2'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-2-build1'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 gpg_keyring: torbutton.gpg
@@ -28,7 +28,7 @@ targets:
   torbrowser_update_channel: release
 
   nightly:
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-1'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-2'
 tag_gpg_id: 0
 var:
   torbrowser_update_channel: default
diff --git a/rbm.conf b/rbm.conf
index abe0547..12b1fd0 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
 
 var:
   torbrowser_version: '8.0a1'
-  torbrowser_build: 'build2'
+  torbrowser_build: 'build3'
   torbrowser_incremental_from:
 - 7.5a10
   project_name: tor-browser

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

[tor-commits] [tor-browser-build/maint-7.5] Picking up newer Firefox changes

2018-01-18 Thread gk

commit 61257a0f6a3a06f894dd50ca38165beab3f3f605
Author: Georg Koppen 
Date:   Fri Jan 19 07:16:19 2018 +

Picking up newer Firefox changes

Use branch -2 and build number bump
---
 projects/firefox-langpacks/config | 2 +-
 projects/firefox/config   | 2 +-
 rbm.conf  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/firefox-langpacks/config 
b/projects/firefox-langpacks/config
index 4e42939..04cd7dd 100644
--- a/projects/firefox-langpacks/config
+++ b/projects/firefox-langpacks/config
@@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") 
%]-[% c("var/buil
 
 var:
   ff_version: '[% pc("firefox", "var/firefox_version") %]'
-  ff_build: build1
+  ff_build: build2
   ff_arch: linux-i686
   input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
 
diff --git a/projects/firefox/config b/projects/firefox/config
index 374ade7..962f340 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% 
c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-1-build1'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-2-build1'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 gpg_keyring: torbutton.gpg
diff --git a/rbm.conf b/rbm.conf
index a70778b..9e18b53 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
 
 var:
   torbrowser_version: '7.5'
-  torbrowser_build: 'build2'
+  torbrowser_build: 'build3'
   torbrowser_incremental_from:
 - 7.0.11
   project_name: tor-browser

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

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

2018-01-18 Thread translation

commit c7ecc0efa7128253f95e49e11deaec6d50c3d7aa
Author: Translation commit bot 
Date:   Fri Jan 19 00:52:52 2018 +

Update translations for exoneratorproperties
---
 pt_BR/exonerator.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/exonerator.properties b/pt_BR/exonerator.properties
index 3d62f2c69..464d17183 100644
--- a/pt_BR/exonerator.properties
+++ b/pt_BR/exonerator.properties
@@ -25,7 +25,7 @@ summary.serverproblem.nodata.title=Problema no servidor
 summary.serverproblem.nodata.body.text=O banco de dados nÃ£o contÃ©m nenhum 
dado da data requisitada. Por favor, tente mais tarde. Se o problema 
persisitir, por favor %s.
 summary.serverproblem.nodata.body.link=informe-nos
 summary.negativesamenetwork.title=Resultado: negativo
-summary.negativesamenetwork.body=NÃ³s nÃ£o encontramos o endereÃ§o IP %s em um 
dia de %s, mas encontramos outros endereÃ§os IP de retransmissores Tor na mesma 
rede /%d nesse perÃodo:
+summary.negativesamenetwork.body=O endereÃ§o IP %s nÃ£o foi encontrado em um 
dia de %s, mas outros endereÃ§os IP de retransmissores Tor na mesma rede /%d 
foram encontrados nesse perÃodo:
 summary.positive.title=Resultado: positivo
 summary.positive.body=NÃ³s encontramos um ou mais retransmissores Tor no 
endereÃ§o IP %s, no dia %s, que clientes Tor provavelmente conheciam.
 summary.negative.title=Resultado: negativo

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

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

2018-01-18 Thread translation

commit 5ae9ed0f216876d9e2bbdc1efb0a7b862c43b38c
Author: Translation commit bot 
Date:   Fri Jan 19 00:20:25 2018 +

Update translations for exoneratorproperties
---
 pt_BR/exonerator.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pt_BR/exonerator.properties b/pt_BR/exonerator.properties
index 1542dc52a..3d62f2c69 100644
--- a/pt_BR/exonerator.properties
+++ b/pt_BR/exonerator.properties
@@ -1,4 +1,4 @@
-form.explanation=Insira um endereÃ§o IP e uma data para descobrir se esse 
endereÃ§o foi usado como um retransmissor Tor:
+form.explanation=Insira um endereÃ§o IP e uma data para saber se esse 
endereÃ§o foi usado como um retransmissor Tor:
 form.ip.label=EndereÃ§o IP
 form.timestamp.label=Data
 form.search.label=Procurar
@@ -10,9 +10,9 @@ summary.serverproblem.dbempty.title=Problema no servidor
 summary.serverproblem.dbempty.body.text=O banco de dados parece estar vazio. 
Por favor, tente mais tarde. Se o problema persistir, por favor %s!
 summary.serverproblem.dbempty.body.link=informe-nos
 summary.invalidparams.notimestamp.title=O parÃ¢metro de data nÃ£o foi 
fornecido.
-summary.invalidparams.notimestamp.body=Desculpe, vocÃª precisa fornecer o 
parÃ¢metro de data tmabÃ©m.
+summary.invalidparams.notimestamp.body=O parÃ¢metro de data tambÃ©m deve ser 
fornecido.
 summary.invalidparams.noip.title=O parÃ¢metro de endereÃ§o IP nÃ£o foi 
fornecido.
-summary.invalidparams.noip.body=Desculpe, vocÃª tambÃ©m precisa fornecer o 
parÃ¢metro de endereÃ§o IP.
+summary.invalidparams.noip.body=O parÃ¢metro de endereÃ§o IP tambÃ©m deve ser 
fornecido.
 summary.invalidparams.timestamprange.title=O parÃ¢metro de data estÃ¡ fora do 
intervalo.
 summary.invalidparams.timestamprange.body=Desculpe, o baco de dados nÃ£o 
contÃ©m nenhum dado de %s. Por favor, escolha uma data entre %s e %s.
 summary.invalidparams.invalidip.title=O parÃ¢metro de endereÃ§o IP Ã© 
invÃ¡lido.

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

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

2018-01-18 Thread translation

commit 408c4fb3c27a0ae8e0d1d337ec6c0e8c3e02
Author: Translation commit bot 
Date:   Thu Jan 18 19:18:22 2018 +

Update translations for torbutton-aboutdialogdtd
---
 mk/aboutdialog.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/aboutdialog.dtd b/mk/aboutdialog.dtd
index c863bfb27..f55705e5c 100644
--- a/mk/aboutdialog.dtd
+++ b/mk/aboutdialog.dtd
@@ -1,6 +1,6 @@
 
 
-
+
 
 
 

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

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

2018-01-18 Thread translation

commit 4380703bf41677faeb4f502c20d355172d7c98b0
Author: Translation commit bot 
Date:   Thu Jan 18 19:18:27 2018 +

Update translations for torbutton-aboutdialogdtd_completed
---
 mk/aboutdialog.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/aboutdialog.dtd b/mk/aboutdialog.dtd
index c863bfb27..f55705e5c 100644
--- a/mk/aboutdialog.dtd
+++ b/mk/aboutdialog.dtd
@@ -1,6 +1,6 @@
 
 
-
+
 
 
 

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

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2018-01-18 Thread translation

commit fec72d2fa7da9e1b39b88b65b48f4ce59dc98e44
Author: Translation commit bot 
Date:   Thu Jan 18 18:50:31 2018 +

Update translations for tor-browser-manual
---
 ru/ru.po | 16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/ru/ru.po b/ru/ru.po
index 5c039ba76..c14cc1351 100644
--- a/ru/ru.po
+++ b/ru/ru.po
@@ -1434,14 +1434,17 @@ msgid ""
 "from finding bridges by Internet scanning. obfs4 bridges are less likely to "
 "be blocked than obfs3 bridges."
 msgstr ""
+"obfs4 Ð´ÐµÐ»Ð°ÐµÑ ÑÑÐ°ÑÐ¸Ðº Tor Ð²ÑÐ³Ð»ÑÐ´ÑÑÐ¸Ð¼ ÑÐ»ÑÑÐ°Ð¹Ð½Ð¾, 
ÐºÐ°Ðº Ð¸ obfs3, Ð° ÑÐ°ÐºÐ¶Ðµ Ð¼ÐµÑÐ°ÐµÑ "
+"ÑÐµÐ½Ð·Ð¾ÑÐ°Ð¼ Ð½Ð°Ð¹ÑÐ¸ Ð¼Ð¾ÑÑÑ Ð¿ÑÑÑÐ¼ ÑÐºÐ°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ 
ÐÐ½ÑÐµÑÐ½ÐµÑÐ°. ÐÐ¾ÑÑÑ ÑÐ¸Ð¿Ð° obfs4 ÑÐ»Ð¾Ð¶Ð½ÐµÐµ "
+"Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ, ÑÐµÐ¼ Ð¼Ð¾ÑÑÑ ÑÐ¸Ð¿Ð° obfs3."
 
 #: transports.page:56
 msgid "Scramblesuit"
-msgstr ""
+msgstr "ScrambleSuit"
 
 #: transports.page:61
 msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges."
-msgstr ""
+msgstr "ScrambleSuit Ð¿Ð¾ÑÐ¾Ð¶ Ð½Ð° obfs4, Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑ 
Ð´ÑÑÐ³Ð¾Ðµ Ð¼Ð½Ð¾Ð¶ÐµÑÑÐ²Ð¾ Ð¼Ð¾ÑÑÐ¾Ð²."
 
 #: transports.page:69
 msgid "FTE"
@@ -1452,10 +1455,12 @@ msgid ""
 "FTE (format-transforming encryption) disguises Tor traffic as ordinary web "
 "(HTTP) traffic."
 msgstr ""
+"FTE (Ð¿ÐµÑÐµÐ´Ð°ÑÑÐµÐµ ÑÐ¾ÑÐ¼Ð°Ñ ÑÐ¸ÑÑÐ¾Ð²Ð°Ð½Ð¸Ðµ) 
Ð¼Ð°ÑÐºÐ¸ÑÑÐµÑ ÑÑÐ°ÑÐ¸Ðº Tor Ð¿Ð¾Ð´ Ð²Ð¸Ð´Ð¾Ð¼ Ð¾Ð±ÑÑÐ½Ð¾Ð³Ð¾ "
+"Ð²ÐµÐ±-ÑÑÐ°ÑÐ¸ÐºÐ° (HTTP)."
 
 #: transports.page:82
 msgid "meek"
-msgstr ""
+msgstr "meek"
 
 #: transports.page:87
 msgid ""
@@ -1464,6 +1469,11 @@ msgid ""
 "Web Services; meek-azure makes it look like you are using a Microsoft web "
 "site; and meek-google makes it look like you are using Google search."
 msgstr ""
+"ÐÑÐ¾Ñ ÑÐ¸Ð¿ ÑÑÐ°Ð½ÑÐ¿Ð¾ÑÑÐ° Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÐµÑ Ð´ÐµÐ»Ð°ÑÑ Ð²Ð¸Ð´, 
ÑÑÐ¾ Ð²Ñ Ð¿ÑÐ¾ÑÐ¼Ð°ÑÑÐ¸Ð²Ð°ÐµÑÐµ ÐºÐ°ÐºÐ¾Ð¹-ÑÐ¾ "
+"Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÐ¹ Ð²ÐµÐ±-ÑÐ°Ð¹Ñ Ð²Ð¼ÐµÑÑÐ¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ 
Tor. meek-amazon Ð´ÐµÐ»Ð°ÐµÑ Ð²Ð¸Ð´, ÑÑÐ¾ Ð²Ñ"
+" Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÐµ Amazon Web Services; meek-azure Ð´ÐµÐ»Ð°ÐµÑ Ð²Ð¸Ð´, 
ÑÑÐ¾ Ð²Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÐµ "
+"Ð²ÐµÐ±-ÑÐ°Ð¹Ñ Microsoft, Ð° meek-google Ð´ÐµÐ»Ð°ÐµÑ Ð²Ð¸Ð´, ÐºÐ°Ðº 
Ð±ÑÐ´ÑÐ¾ Ð²Ñ Ð¿Ð¾Ð»ÑÐ·ÑÐµÑÐµÑÑ "
+"Ð¿Ð¾Ð¸ÑÐºÐ¾Ð¼ Google."
 
 #: troubleshooting.page:6
 msgid "What to do if Tor Browser doesnât work"

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

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2018-01-18 Thread translation

commit e6dec0a7ddd46cc6aaeb0826002e89fe1dfad8c8
Author: Translation commit bot 
Date:   Thu Jan 18 18:20:33 2018 +

Update translations for tor-browser-manual
---
 ru/ru.po | 49 -
 1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/ru/ru.po b/ru/ru.po
index f09769b60..5c039ba76 100644
--- a/ru/ru.po
+++ b/ru/ru.po
@@ -1247,7 +1247,7 @@ msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Tor Browser Ð´Ð»Ñ 
Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÐ¸ Ð¸ ÑÐ´Ð¾
 
 #: security-slider.page:10
 msgid "Security Slider"
-msgstr ""
+msgstr "ÐÐµÑÐµÐºÐ»ÑÑÐ°ÑÐµÐ»Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÐ¸"
 
 #: security-slider.page:11
 msgid ""
@@ -1257,6 +1257,12 @@ msgid ""
 "some web pages from functioning properly, so you should weigh your security "
 "needs against the degree of usability you require."
 msgstr ""
+"Ð£ Tor Browser ÐµÑÑÑ \"ÐÐµÑÐµÐºÐ»ÑÑÐ°ÑÐµÐ»Ñ 
Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÐ¸\", ÐºÐ¾ÑÐ¾ÑÑÐ¹ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÐµÑ Ð²Ð°Ð¼ "
+"ÑÑÐ¸Ð»Ð¸ÑÑ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÑ, Ð¾ÑÐºÐ»ÑÑÐ°Ñ 
Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÑÐ½Ð½ÑÐµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ Ð²ÐµÐ±-ÑÐ°Ð¹ÑÐ¾Ð², 
ÐºÐ¾ÑÐ¾ÑÑÐµ "
+"Ð¼Ð¾Ð³ÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑÑÑ Ð´Ð»Ñ Ð°ÑÐ°Ðº Ð² Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ð¸ 
Ð²Ð°ÑÐµÐ¹ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÐ¸ Ð¸ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾ÑÑÐ¸. "
+"Ð£Ð²ÐµÐ»Ð¸ÑÐµÐ½Ð¸Ðµ ÑÑÐ¾Ð²Ð½Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÐ¸ Ð² Tor Browser 
Ð¼Ð¾Ð¶ÐµÑ Ð¿Ð¾Ð¼ÐµÑÐ°ÑÑ Ð½ÐµÐºÐ¾ÑÐ¾ÑÑÐ¼ Ð²ÐµÐ±-"
+"ÑÑÑÐ°Ð½Ð¸ÑÐ°Ð¼ ÑÐ°Ð±Ð¾ÑÐ°ÑÑ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾, ÑÐ°Ðº ÑÑÐ¾ Ð²Ñ 
Ð´Ð¾Ð»Ð¶Ð½Ñ Ð²Ð·Ð²ÐµÑÐ¸ÑÑ Ð²Ð°ÑÐ¸ Ð¿Ð¾ÑÑÐµÐ±Ð½Ð¾ÑÑÐ¸ Ð² "
+"Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÐ¸ Ð¿Ð¾ ÑÑÐ°Ð²Ð½ÐµÐ½Ð¸Ñ Ñ ÑÐ´Ð¾Ð±ÑÑÐ²Ð¾Ð¼ 
Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ, ÐºÐ¾ÑÐ¾ÑÐ¾Ðµ Ð²Ð°Ð¼ ÑÑÐµÐ±ÑÐµÑÑÑ."
 
 #: security-slider.page:21
 msgid "Accessing the Security Slider"
@@ -1280,10 +1286,12 @@ msgid ""
 "The Security Slider is located in Torbuttonâs âPrivacy and Security "
 "Settingsâ menu."
 msgstr ""
+"Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ ÑÑÐ¾Ð²Ð½ÐµÐ¼ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÐ¸ Ð½Ð°Ñ
Ð¾Ð´Ð¸ÑÑÑ Ð² Ð¼ÐµÐ½Ñ \"ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÐ¸ Ð¸ "
+"ÐºÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ÑÑÐ¸\" Torbutton."
 
 #: security-slider.page:32
 msgid "Security Levels"
-msgstr ""
+msgstr "Ð£ÑÐ¾Ð²Ð½Ð¸ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÐ¸"
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
@@ -1295,12 +1303,16 @@ msgid ""
 "external ref='media/security-slider/slider_window.png' "
 "md5='c733bdccd1731ed1a772777b25bae7a1'"
 msgstr ""
+"external ref='media/security-slider/slider_window.png' "
+"md5='c733bdccd1731ed1a772777b25bae7a1'"
 
 #: security-slider.page:36
 msgid ""
 "Increasing the level of the Security Slider will disable or partially "
 "disable certain browser features to protect against possible attacks."
 msgstr ""
+"Ð£Ð²ÐµÐ»Ð¸ÑÐµÐ½Ð¸Ðµ ÑÑÐ¾Ð²Ð½Ñ Ð² Ð¿ÐµÑÐµÐºÐ»ÑÑÐ°ÑÐµÐ»Ðµ 
Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÐ¸ Ð¾ÑÐºÐ»ÑÑÐ°ÐµÑ Ð¿Ð¾Ð»Ð½Ð¾ÑÑÑÑ Ð¸Ð»Ð¸ "
+"ÑÐ°ÑÑÐ¸ÑÐ½Ð¾ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÑÐ½Ð½ÑÐµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÐ¸, ÑÑÐ¾Ð±Ñ 
Ð·Ð°ÑÐ¸ÑÐ°ÑÑ Ð¾Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½ÑÑ Ð°ÑÐ°Ðº."
 
 #: security-slider.page:42
 msgid "High"
@@ -1315,6 +1327,13 @@ msgid ""
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
+"ÐÐ° ÑÑÐ¾Ð¼ ÑÑÐ¾Ð²Ð½Ðµ, Ð±Ð»Ð°Ð³Ð¾Ð´Ð°ÑÑ NoScript Ð´Ð»Ñ 
Ð¿ÑÐ¾Ð¸Ð³ÑÑÐ²Ð°Ð½Ð¸Ñ HTML5 Ð²Ð¸Ð´ÐµÐ¾ Ð¸ Ð°ÑÐ´Ð¸Ð¾ "
+"ÑÑÐµÐ±ÑÐµÑÑÑ ÐºÐ»Ð¸Ðº; Ð²ÑÐµ Ð¾Ð¿ÑÐ¸Ð¼Ð¸Ð·Ð°ÑÐ¸Ð¸ 
Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÐµÐ»ÑÐ½Ð¾ÑÑÐ¸ JavaScript Ð¾ÑÐºÐ»ÑÑÐ°ÑÑÑÑ; "
+"Ð½ÐµÐºÐ¾ÑÐ¾ÑÑÐµ Ð¼Ð°ÑÐµÐ¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸Ðµ ÑÐ¾ÑÐ¼ÑÐ»Ñ Ð¼Ð¾Ð³ÑÑ 
Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑÑÑ Ð½ÐµÐ²ÐµÑÐ½Ð¾; Ð¾ÑÐºÐ»ÑÑÐ°ÑÑÑÑ "
+"Ð½ÐµÐºÐ¾ÑÐ¾ÑÑÐµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÐ¸ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ 
ÑÑÐ¸ÑÑÐ¾Ð²; Ð¾ÑÐºÐ»ÑÑÐ°ÑÑÑÑ Ð½ÐµÐºÐ¾ÑÐ¾ÑÑÐµ ÑÐ¸Ð¿Ñ "
+"Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ð¹; JavaScript Ð¾ÑÐºÐ»ÑÑÐ°ÐµÑÑÑ Ð¿Ð¾ 
ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ Ð½Ð° Ð²ÑÐµÑ ÑÐ°Ð¹ÑÐ°Ñ; Ð·Ð°Ð¿ÑÐµÑÐ°ÑÑÑÑ"
+" Ð±Ð¾Ð»ÑÑÐ¸Ð½ÑÑÐ²Ð¾ Ð²Ð¸Ð´ÐµÐ¾ Ð¸ Ð°ÑÐ´Ð¸Ð¾ ÑÐ¾ÑÐ¼Ð°ÑÐ¾Ð²; 
Ð½ÐµÐºÐ¾ÑÐ¾ÑÑÐµ ÑÑÐ¸ÑÑÑ Ð¸ Ð·Ð½Ð°ÑÐºÐ¸ Ð¼Ð¾Ð³ÑÑ "
+"Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ Ð½ÐµÐºÐ¾ÑÑÐµÐºÑÐ½Ð¾."
 
 #: security-slider.page:53
 msgid "Medium-High"
@@ -1329,6 +1348,12 @@ msgid ""
 "disabled by default on all non-HTTPS sites."
 msgstr ""
+"ÐÐ° ÑÑÐ¾Ð¼ ÑÑÐ¾Ð²Ð½Ðµ, Ð±Ð»Ð°Ð³Ð¾Ð´Ð°ÑÑ NoScript Ð´Ð»Ñ 
Ð¿ÑÐ¾Ð¸Ð³ÑÑÐ²Ð°Ð½Ð¸Ñ HTML5 Ð²Ð¸Ð´ÐµÐ¾ Ð¸ Ð°ÑÐ´Ð¸Ð¾ "
+"ÑÑÐµÐ±ÑÐµÑÑÑ ÐºÐ»Ð¸Ðº; Ð²ÑÐµ Ð¾Ð¿ÑÐ¸Ð¼Ð¸Ð·Ð°ÑÐ¸Ð¸ 
Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÐµÐ»ÑÐ½Ð¾ÑÑÐ¸ JavaScript Ð¾ÑÐºÐ»ÑÑÐ°ÑÑÑÑ; "
+"Ð½ÐµÐºÐ¾ÑÐ¾ÑÑÐµ Ð¼Ð°ÑÐµÐ¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸Ðµ ÑÐ¾ÑÐ¼ÑÐ»Ñ Ð¼Ð¾Ð³ÑÑ 
Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑÑÑ Ð½ÐµÐ²ÐµÑÐ½Ð¾; Ð¾ÑÐºÐ»ÑÑÐ°ÑÑÑÑ "
+"Ð½ÐµÐºÐ¾ÑÐ¾ÑÑÐµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÐ¸ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ 
ÑÑÐ¸ÑÑÐ¾Ð²; Ð¾ÑÐºÐ»ÑÑÐ°ÑÑÑÑ Ð½ÐµÐºÐ¾ÑÐ¾ÑÑÐµ ÑÐ¸Ð¿Ñ "
+"Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ð¹; JavaScript Ð¾ÑÐºÐ»ÑÑÐ°ÐµÑÑÑ Ð¿Ð¾ 
ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ Ð½Ð° Ð²ÑÐµÑ Ð½Ðµ HTTPS ÑÐ°Ð¹ÑÐ°Ñ."
 
 #:

[tor-commits] [doctor/master] Add address:or_port to subject of fingerprint changing emails

2018-01-18 Thread atagar

commit 3ba00eed8820be005b9b3699bbe54fedcce25d87
Author: Damian Johnson 
Date:   Thu Jan 18 09:13:57 2018 -0800

Add address:or_port to subject of fingerprint changing emails

Requested by nusenu.
---
 fingerprint_change_checker.py | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/fingerprint_change_checker.py b/fingerprint_change_checker.py
index b1791d6..284dac9 100755
--- a/fingerprint_change_checker.py
+++ b/fingerprint_change_checker.py
@@ -89,7 +89,12 @@ def main():
 
   body += "\n"
 
-util.send(EMAIL_SUBJECT, body = body, to = 
['bad-rel...@lists.torproject.org', 'ata...@torproject.org'])
+subject = EMAIL_SUBJECT
+
+if len(alarm_for) == 1:
+  subject += ' (%s:%s') % alarm_for[0]
+
+util.send(subject, body = body, to = ['bad-rel...@lists.torproject.org', 
'ata...@torproject.org'])
 
 # register that we've notified for these
 



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

[tor-commits] [doctor/master] Bump tor versions

2018-01-18 Thread atagar

commit c75d82a3be70c5247dfbc3e4f878803bb351b00e
Author: Damian Johnson 
Date:   Thu Jan 18 09:40:21 2018 -0800

Bump tor versions
---
 package_versions.py | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/package_versions.py b/package_versions.py
index b289562..63eae3b 100755
--- a/package_versions.py
+++ b/package_versions.py
@@ -31,15 +31,15 @@ Package = collections.namedtuple('Package', ['platform', 
'url', 'version', 'rege
 
 PACKAGES = [
   ('tor', [
-Package('mac', 
'https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/tor.rb',
 '0.3.1.9', 'tor-([0-9\.]+).tar.gz'),
-Package('debian', 'https://packages.debian.org/sid/tor', '0.3.1.9', 
DEBIAN_VERSION),
-Package('fedora', 'https://apps.fedoraproject.org/packages/tor', 
'0.3.1.9', FEDORA_VERSION),
-Package('gentoo', 'https://packages.gentoo.org/packages/net-vpn/tor', 
'0.3.1.9', None),
+Package('mac', 
'https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/tor.rb',
 '0.3.2.9', 'tor-([0-9\.]+).tar.gz'),
+Package('debian', 'https://packages.debian.org/sid/tor', '0.3.2.9', 
DEBIAN_VERSION),
+Package('fedora', 'https://apps.fedoraproject.org/packages/tor', 
'0.3.2.9', FEDORA_VERSION),
+Package('gentoo', 'https://packages.gentoo.org/packages/net-vpn/tor', 
'0.3.2.9', None),
 Package('archlinux', 
'https://www.archlinux.org/packages/community/x86_64/tor/', '0.3.1.9', 
ARCH_LINUX_VERSION),
-Package('slackware', 
'https://slackbuilds.org/repository/14.2/network/tor/', '0.3.1.9', 
'tor-([0-9\.]+).tar.gz'),
-Package('freebsd', 'https://www.freshports.org/security/tor/', '0.3.1.9', 
FREEBSD_VERSION),
-Package('openbsd', 
'https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/tor/Makefile?rev=HEAD=text/x-cvsweb-markup',
 '0.3.1.9', OPENBSD_DIST_VERSION),
-Package('netbsd', 'http://pkgsrc.se/net/tor', '0.3.1.9', NETBSD_VERSION),
+Package('slackware', 
'https://slackbuilds.org/repository/14.2/network/tor/', '0.3.2.9', 
'tor-([0-9\.]+).tar.gz'),
+Package('freebsd', 'https://www.freshports.org/security/tor/', '0.3.2.9', 
FREEBSD_VERSION),
+Package('openbsd', 
'https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/tor/Makefile?rev=HEAD=text/x-cvsweb-markup',
 '0.3.2.9', OPENBSD_DIST_VERSION),
+Package('netbsd', 'http://pkgsrc.se/net/tor', '0.3.2.9', NETBSD_VERSION),
   ]),
   ('nyx', [
 Package('gentoo', 'https://packages.gentoo.org/packages/net-misc/nyx', 
'2.0.4', None),

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

[tor-commits] [doctor/master] Add platform and contact to fingerprint change email

2018-01-18 Thread atagar

commit 2b5d7877f379f54999f24d37f0c36b9940d2495c
Author: Damian Johnson 
Date:   Thu Jan 18 09:30:02 2018 -0800

Add platform and contact to fingerprint change email

Requested by nusenu.
---
 fingerprint_change_checker.py | 22 --
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/fingerprint_change_checker.py b/fingerprint_change_checker.py
index 284dac9..96bdb2a 100755
--- a/fingerprint_change_checker.py
+++ b/fingerprint_change_checker.py
@@ -62,16 +62,26 @@ def main():
   # if we've changed more than ten times in the last ten days then alarm
 
   if len(prior_fingerprints) >= 10:
-alarm_for.add((relay.address, relay.or_port))
+alarm_for.add((relay.address, relay.or_port, relay.fingerprint))
 
   if alarm_for and not is_notification_suppressed(alarm_for):
 log.debug("Sending a notification for %i relays..." % len(alarm_for))
 body = EMAIL_BODY
 
-for address, or_port in alarm_for:
+for address, or_port, fingerprint in alarm_for:
+  try:
+desc = downloader.get_server_descriptors(fingerprint).run()[0]
+  except:
+desc = None  # might not be available, just used for extra info
+
   fp_changes = fingerprint_changes[(address, or_port)]
   log.debug("* %s:%s has had %i fingerprints: %s" % (address, or_port, 
len(fp_changes), ', '.join(fp_changes.keys(
-  body += "* %s:%s\n" % (address, or_port)
+
+  if desc:
+body += "* %s:%s (platform: %s, contact: %s)\n" % (address, or_port, 
desc.platform.decode('utf-8', 'replace'), desc.contact)
+  else:
+body += "* %s:%s\n" % (address, or_port)
+
   count = 0
 
   for fingerprint in sorted(fp_changes, reverse = True, key = lambda k: 
fp_changes[k]):
@@ -92,7 +102,7 @@ def main():
 subject = EMAIL_SUBJECT
 
 if len(alarm_for) == 1:
-  subject += ' (%s:%s') % alarm_for[0]
+  subject += ' (%s:%s)' % list(alarm_for)[0][:2]
 
 util.send(subject, body = body, to = ['bad-rel...@lists.torproject.org', 
'ata...@torproject.org'])
 
@@ -100,7 +110,7 @@ def main():
 
 current_time = str(int(time.time()))
 
-for address, or_port in alarm_for:
+for address, or_port, _ in alarm_for:
   last_notified_config.set('%s:%s' % (address, or_port), current_time)
 
 last_notified_config.save()
@@ -162,7 +172,7 @@ def is_notification_suppressed(fingerprint_changes):
   log.debug("Checking if notification should be suppressed...")
   last_notified_config = conf.get_config('last_notified')
 
-  for address, or_port in fingerprint_changes:
+  for address, or_port, _ in fingerprint_changes:
 key = '%s:%s' % (address, or_port)
 suppression_time = ONE_DAY - (int(time.time()) - 
last_notified_config.get(key, 0))
 



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

[tor-commits] [nyx/master] Typo fix

2018-01-18 Thread atagar

commit b52802ab5d6d13764b4aa367d24433cdbd8bf123
Author: Damian Johnson 
Date:   Thu Jan 18 09:04:09 2018 -0800

Typo fix

Nice catch from torix on 
https://trac.torproject.org/projects/tor/ticket/24923
---
 web/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/index.html b/web/index.html
index 39437ac..3ce18f0 100644
--- a/web/index.html
+++ b/web/index.html
@@ -372,7 +372,7 @@ sudo python setup.py install
   
 https://apps.fedoraproject.org/packages/nyx; id="fedora">
 https://apps.fedoraproject.org/packages/nyx; 
class="platform-title">Fedora
-Packages maintained by Juan for Fedora using dnf or 
yum.
+Package maintained by Juan for Fedora using dnf or 
yum.
 % sudo dnf install nyx
   
 
@@ -715,7 +715,7 @@ logged_events BW, NOTICE, WARN, ERR
 
   
 
-  Compenent Visability
+  Component Visibility
 
   
 

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

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

2018-01-18 Thread translation

commit 42a460baf217544d7683564dc20eaf43d1f6e774
Author: Translation commit bot 
Date:   Thu Jan 18 16:17:50 2018 +

Update translations for torbutton-torbuttondtd
---
 pt/torbutton.dtd | 34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pt/torbutton.dtd b/pt/torbutton.dtd
index f439b2ede..2235022d1 100644
--- a/pt/torbutton.dtd
+++ b/pt/torbutton.dtd
@@ -27,24 +27,24 @@
 
 
 
-
+
 
 
-
+
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 

___
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-01-18 Thread translation

commit 9f1e82825a8b53c4cd129df23174d9e844ed9a51
Author: Translation commit bot 
Date:   Thu Jan 18 16:17:07 2018 +

Update translations for tails-misc
---
 pt.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt.po b/pt.po
index dd83e3a5c..95d08f7bb 100644
--- a/pt.po
+++ b/pt.po
@@ -24,7 +24,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-13 20:10+0200\n"
-"PO-Revision-Date: 2017-10-07 16:32+\n"
+"PO-Revision-Date: 2018-01-18 15:59+\n"
 "Last-Translator: Manuela Silva \n"
 "Language-Team: Portuguese 
(http://www.transifex.com/otf/torproject/language/pt/)\n"
 "MIME-Version: 1.0\n"

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

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

2018-01-18 Thread translation

commit 3bf5cb991116e680241faa3b19744f0b0d08a179
Author: Translation commit bot 
Date:   Thu Jan 18 16:17:13 2018 +

Update translations for tails-misc_completed
---
 pt.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt.po b/pt.po
index dd83e3a5c..95d08f7bb 100644
--- a/pt.po
+++ b/pt.po
@@ -24,7 +24,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-13 20:10+0200\n"
-"PO-Revision-Date: 2017-10-07 16:32+\n"
+"PO-Revision-Date: 2018-01-18 15:59+\n"
 "Last-Translator: Manuela Silva \n"
 "Language-Team: Portuguese 
(http://www.transifex.com/otf/torproject/language/pt/)\n"
 "MIME-Version: 1.0\n"

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

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

2018-01-18 Thread translation

commit d4493664ec696bcfab3f14aadd62dc34672bb8fe
Author: Translation commit bot 
Date:   Thu Jan 18 16:16:25 2018 +

Update translations for torbirdy_completed
---
 pt/torbirdy.dtd | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pt/torbirdy.dtd b/pt/torbirdy.dtd
index 3c132dec6..6b844c118 100644
--- a/pt/torbirdy.dtd
+++ b/pt/torbirdy.dtd
@@ -38,6 +38,8 @@
 
 
 
+
+
 
 
 

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

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

2018-01-18 Thread translation

commit e9a9aa7852115199901d06f0754a97fe1858037c
Author: Translation commit bot 
Date:   Thu Jan 18 16:16:17 2018 +

Update translations for torbirdy
---
 pt/torbirdy.dtd | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pt/torbirdy.dtd b/pt/torbirdy.dtd
index 21ba60a6d..6b844c118 100644
--- a/pt/torbirdy.dtd
+++ b/pt/torbirdy.dtd
@@ -38,9 +38,7 @@
 
 
 
-
-
-
+
 
 
 

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

[tor-commits] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed

2018-01-18 Thread translation

commit 6fd6e5f09c57c57675c6b27a7c530b8d5d43492d
Author: Translation commit bot 
Date:   Thu Jan 18 15:47:00 2018 +

Update translations for tor-launcher-properties_completed
---
 pt/torlauncher.properties | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pt/torlauncher.properties b/pt/torlauncher.properties
index bd6085da0..ce9f98559 100644
--- a/pt/torlauncher.properties
+++ b/pt/torlauncher.properties
@@ -14,9 +14,9 @@ torlauncher.tor_bootstrap_failed_details=%1$S falhou (%2$S).
 
 torlauncher.unable_to_start_tor=NÃ£o Ã© possÃvel iniciar o Tor.\n\n %S
 torlauncher.tor_missing=O executÃ¡vel do Tor estÃ¡ em falta.
-torlauncher.torrc_missing=O ficheiro torc nÃ£o existe e nÃ£o pode ser criado.
-torlauncher.datadir_missing=O diretÃ³rio de dados Tor nÃ£o existe e nÃ£o pode 
ser criado.
-torlauncher.password_hash_missing=NÃ£o foi possÃvel obter a senha "hashed".
+torlauncher.torrc_missing=O ficheiro torc estÃ¡ em falta e nÃ£o foi possÃvel 
criÃ¡-lo.
+torlauncher.datadir_missing=A diretoria de dados Tor nÃ£o existe e nÃ£o foi 
possÃvel criÃ¡-la.
+torlauncher.password_hash_missing=NÃ£o foi possÃvel obter a palavra-passe 
"hashed".
 
 torlauncher.failed_to_get_settings=NÃ£o Ã© possÃvel obter as configuraÃ§Ãµes 
do Tor\n\n %S
 torlauncher.failed_to_save_settings=NÃ£o Ã© possÃvel guardar as 
configuraÃ§Ãµes do Tor\n\n %S
@@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Deve especificar uma ou 
mais pontes.
 torlauncher.error_default_bridges_type_missing=Deve selecionar o tipo de 
transporte para as pontes fornecidas
 torlauncher.error_bridge_bad_default_type=NÃ£o estÃ£o disponÃveis as pontes 
fornecidas que tÃªm o tipo de transporte %S. Por favor, ajuste as suas 
configuraÃ§Ãµes.
 
-torlauncher.recommended_bridge=(recomendado)
+torlauncher.bridge_suffix.meek-amazon=(funciona na China)
+torlauncher.bridge_suffix.meek-azure=(funciona na China)
 
 torlauncher.connect=Ligar
 torlauncher.restart_tor=Reiniciar o Tor
@@ -41,7 +42,7 @@ torlauncher.forAssistance2=Para assistÃªncia, visite %S
 
 torlauncher.copiedNLogMessages=CÃ³pia completa. EstÃ£o prontas %S mensagens do 
registo de eventos do Tor para serem coladas num editor de texto ou numa 
mensagem de correio eletrÃ³nico.
 
-torlauncher.bootstrapStatus.conn_dir=A ligar ao diretÃ³rio do retransmissor
+torlauncher.bootstrapStatus.conn_dir=A ligar Ã  diretoria do retransmissor
 torlauncher.bootstrapStatus.handshake_dir=A estabelecer uma ligaÃ§Ã£o de 
diretoria encriptada
 torlauncher.bootstrapStatus.requesting_status=A obter o estado da rede
 torlauncher.bootstrapStatus.loading_status=A carregar o estado da rede

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

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

2018-01-18 Thread translation

commit c8cdd165417c90006f3b4dbeb2814e3cf7f42d80
Author: Translation commit bot 
Date:   Thu Jan 18 15:46:04 2018 +

Update translations for liveusb-creator_completed
---
 pt/pt.po | 796 ---
 1 file changed, 347 insertions(+), 449 deletions(-)

diff --git a/pt/pt.po b/pt/pt.po
index 0e7021c9b..c0b7061e6 100644
--- a/pt/pt.po
+++ b/pt/pt.po
@@ -6,9 +6,10 @@
 # Cesar Silva , 2017
 # testsubject67 , 2014
 # Francisco P. , 2013
+# Henrique Rodrigues, 2017
 # Koh Pyreit , 2013
 # Manuela Silva , 2015
-# Manuela Silva , 2014,2017
+# Manuela Silva , 2014,2017-2018
 # Manuela Silva , 2015
 # Pedro Albuquerque , 2015
 # SÃ©rgio Marques , 2016
@@ -20,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2017-04-14 14:16+\n"
+"POT-Creation-Date: 2017-11-10 15:57+0100\n"
+"PO-Revision-Date: 2018-01-18 15:41+\n"
 "Last-Translator: Manuela Silva \n"
 "Language-Team: Portuguese 
(http://www.transifex.com/otf/torproject/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -30,591 +31,488 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../liveusb/gui.py:451
-msgid "\"Clone & Install\""
-msgstr "\"Clonar e Instalar\""
+#: ../tails_installer/creator.py:101
+msgid "You must run this application as root"
+msgstr "Deve executar esta aplicaÃ§Ã£o como 'root'"
 
-#: ../liveusb/gui.py:453
-msgid "\"Install from ISO\""
-msgstr "\"instalar do ISO\""
+#: ../tails_installer/creator.py:147
+msgid "Extracting live image to the target device..."
+msgstr "A extrair a imagem live para o dispositivo de destino..."
 
-#: ../liveusb/dialog.py:157 ../liveusb/launcher_ui.py:153
+#: ../tails_installer/creator.py:154
 #, python-format
-msgid "%(distribution)s Installer"
-msgstr "Instalador %(distribution)s"
+msgid "Wrote to device at %(speed)d MB/sec"
+msgstr "Gravado para o dispositivo a %(speed)d MB/seg"
 
-#: ../liveusb/gui.py:804
-#, python-format
-msgid "%(filename)s selected"
-msgstr "%(filename)s selecionado"
+#: ../tails_installer/creator.py:184
+msgid "Setting up OLPC boot file..."
+msgstr "A configurar o ficheiro de arranque do OLPC ..."
 
-#: ../liveusb/gui.py:424
+#: ../tails_installer/creator.py:315
 #, python-format
-msgid "%(size)s %(label)s"
-msgstr "%(size)s %(label)s"
+msgid ""
+"There was a problem executing the following command: `%(command)s`.\n"
+"A more detailed error log has been written to '%(filename)s'."
+msgstr "Ocorreu um erro ao executar o seguinte comando: `%(command)s`.\nFoi 
guardado um registo detalhado do erro no '%(filename)s'."
 
-#: ../liveusb/gui.py:430
-#, python-format
-msgid "%(vendor)s %(model)s (%(details)s) - %(device)s"
-msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s"
+#: ../tails_installer/creator.py:334
+msgid "Verifying SHA1 checksum of LiveCD image..."
+msgstr "A verificar a soma de verificaÃ§Ã£o SHA1 da imagem do CD Live..."
 
-#: ../liveusb/creator.py:1097
-#, python-format
-msgid "%s already bootable"
-msgstr "%s jÃ¡ Ã© de arranque"
+#: ../tails_installer/creator.py:338
+msgid "Verifying SHA256 checksum of LiveCD image..."
+msgstr "A verificar a soma de verificaÃ§Ã£o SHA256 da imagem do CD Live..."
 
-#: ../liveusb/launcher_ui.py:160
+#: ../tails_installer/creator.py:354
 msgid ""
-"http://www.w3.org/TR/REC-html40/strict.dtd\;>\n"
-"\n"
-"p, li { white-space: pre-wrap; }\n"
-"\n"
-"Need 
help? Read the documentation."
-msgstr "http://www.w3.org/TR/REC-html40/strict.dtd\;>\n\np, li { 
white-space: pre-wrap; }\n\nPrecisa de ajuda? Leia a documentaÃ§Ã£o."
-
-#: ../liveusb/launcher_ui.py:155
-msgid ""
-"\n"
-"Install Tails on another USB stick by copying the Tails system that you 
are currently using..\n"
-"\n"
-"The USB stick that you install on is formatted and all data is 
lost.\n"
-"\n"
-"The encrypted persistent storage of the Tails USB stick that you are 
currently using is not copied.\n"
-"\n"
-""
-msgstr "\nInstale o Tails em outra pen USB copiando o sistema Tails 
que estÃ¡ a usar atualmente..\n\nA pen USB onde vocÃª vai instalar 
serÃ¡ formatada e todos os dados serÃ£o perdidos.\n\nO armazenamento 
encriptado persistente da pen USB Tails que estÃ¡ a usar nÃ£o Ã© 
copiado.\n\n"
+"Error: The SHA1 of your Live CD is invalid.  You can run this program with "
+"the --noverify argument to bypass this verification check."
+msgstr "Erro: A assinatura digital SHA1 do seu CD Live estÃ¡ incorreta. Pode 
executar este programa com o argumento --noverify para evitar esta 
verificaÃ§Ã£o."
 
-#: ../liveusb/launcher_ui.py:157
-msgid ""
-"\n"
-"Upgrade

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

2018-01-18 Thread translation

commit 685a5064cfe689ab3dcb863ed4bdd1b5fecb6e93
Author: Translation commit bot 
Date:   Thu Jan 18 15:45:57 2018 +

Update translations for liveusb-creator
---
 pt/pt.po | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pt/pt.po b/pt/pt.po
index c683a11ac..c0b7061e6 100644
--- a/pt/pt.po
+++ b/pt/pt.po
@@ -9,7 +9,7 @@
 # Henrique Rodrigues, 2017
 # Koh Pyreit , 2013
 # Manuela Silva , 2015
-# Manuela Silva , 2014,2017
+# Manuela Silva , 2014,2017-2018
 # Manuela Silva , 2015
 # Pedro Albuquerque , 2015
 # SÃ©rgio Marques , 2016
@@ -22,8 +22,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-10 15:57+0100\n"
-"PO-Revision-Date: 2017-11-11 03:09+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-01-18 15:41+\n"
+"Last-Translator: Manuela Silva \n"
 "Language-Team: Portuguese 
(http://www.transifex.com/otf/torproject/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -285,7 +285,7 @@ msgstr "NÃ£o Ã© possÃvel encontrar"
 msgid ""
 "Make sure to extract the entire tails-installer zip file before running this"
 " program."
-msgstr ""
+msgstr "Certifique-se que extrai todo o ficheiro zip do instalador tails antes 
de executar este programa."
 
 #: ../tails_installer/gui.py:69
 #, python-format
@@ -359,7 +359,7 @@ msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
 "manufacturer and Tails will fail to start on it. Please try installing on a "
 "different model."
-msgstr ""
+msgstr "A pen USB \"%(pretty_name)s\" estÃ¡ configurada como nÃ£o removÃvel 
pelo seu fabricante e Tails nÃ£o serÃ¡ iniciado na mesma. Por favor, tente 
instalar num modelo diferente."
 
 #: ../tails_installer/gui.py:567
 #, python-format
@@ -402,7 +402,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 dispositivo (%(device)s)\n\nTodos os 
dados na pen USB serÃ£o perdidos."
 
 #: ../tails_installer/gui.py:722
 #, python-format
@@ -414,7 +414,7 @@ msgid ""
 "\n"
 "\n"
 "The persistent storage on this USB stick will be preserved."
-msgstr ""
+msgstr "\n\nO armazenamento persistente nesta pen USB serÃ¡ preservado."
 
 #: ../tails_installer/gui.py:731
 #, python-format
@@ -457,7 +457,7 @@ msgstr "NÃ£o foi possÃvel encontrar o LiveOS na imagem ISO"
 #: ../tails_installer/source.py:34
 #, python-format
 msgid "Could not guess underlying block device: %s"
-msgstr ""
+msgstr "NÃ£o foi possÃvel adivinhar o dispositivo de bloco subjacente: %s"
 
 #: ../tails_installer/source.py:49
 #, python-format
@@ -499,7 +499,7 @@ msgstr "Guias de instalaÃ§Ã£o"
 
 #: ../data/tails-installer.ui.h:2
 msgid "Clone the current Tails"
-msgstr ""
+msgstr "Clone oTails atual"
 
 #: ../data/tails-installer.ui.h:3
 msgid "Use a downloaded Tails ISO image"

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

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

2018-01-18 Thread translation

commit a459134dbec70436214121ea5468cfccd00cde12
Author: Translation commit bot 
Date:   Thu Jan 18 15:51:00 2018 +

Update translations for exoneratorproperties
---
 pt/exonerator.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt/exonerator.properties b/pt/exonerator.properties
index 4fb4a3449..c27c0280f 100644
--- a/pt/exonerator.properties
+++ b/pt/exonerator.properties
@@ -19,8 +19,8 @@ summary.invalidparams.invalidip.title=ParÃ¢metro de endereÃ§o 
IP invÃ¡lido
 summary.invalidparams.invalidip.body=Desculpe mas %s nÃ£o Ã© um endereÃ§o IP 
vÃ¡lido. Os formatos de endereÃ§o IP esperados sÃ£o %s ou %s.
 summary.invalidparams.invalidtimestamp.title=ParÃ¢metro de data invÃ¡lido
 summary.invalidparams.invalidtimestamp.body=Desculpe mas %s nÃ£o Ã© uma data 
vÃ¡lida. O formato de data esperado Ã© %s.
-summary.invalidparams.timestamptoorecent.title=Date parameter too recent
-summary.invalidparams.timestamptoorecent.body=The database may not yet contain 
enough data to correctly answer this request. The latest accepted data is the 
day before yesterday. Please repeat your search on another day.
+summary.invalidparams.timestamptoorecent.title=ParÃ¢metro de data muito recente
+summary.invalidparams.timestamptoorecent.body=A base de dados pode ainda nÃ£o 
conter dados suficientes para responder corretamente a este pedido. Os Ãºltimos 
dados aceites sÃ£o de anteontem. Por favor, repita a sua pesquisa noutro dia.
 summary.serverproblem.nodata.title=Problema de servidor
 summary.serverproblem.nodata.body.text=A base de dados nÃ£o contÃ©m dados para 
a data solicitada. Por favor tente mais tarde. Se o problema persistir, por 
favor %s!
 summary.serverproblem.nodata.body.link=deixe-nos saber

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

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

2018-01-18 Thread translation

commit 68783867a9a7bbdf0105f4515aaddceb40979cdd
Author: Translation commit bot 
Date:   Thu Jan 18 15:51:08 2018 +

Update translations for exoneratorproperties_completed
---
 pt/exonerator.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pt/exonerator.properties b/pt/exonerator.properties
index a4d74e38b..c27c0280f 100644
--- a/pt/exonerator.properties
+++ b/pt/exonerator.properties
@@ -19,6 +19,8 @@ summary.invalidparams.invalidip.title=ParÃ¢metro de endereÃ§o 
IP invÃ¡lido
 summary.invalidparams.invalidip.body=Desculpe mas %s nÃ£o Ã© um endereÃ§o IP 
vÃ¡lido. Os formatos de endereÃ§o IP esperados sÃ£o %s ou %s.
 summary.invalidparams.invalidtimestamp.title=ParÃ¢metro de data invÃ¡lido
 summary.invalidparams.invalidtimestamp.body=Desculpe mas %s nÃ£o Ã© uma data 
vÃ¡lida. O formato de data esperado Ã© %s.
+summary.invalidparams.timestamptoorecent.title=ParÃ¢metro de data muito recente
+summary.invalidparams.timestamptoorecent.body=A base de dados pode ainda nÃ£o 
conter dados suficientes para responder corretamente a este pedido. Os Ãºltimos 
dados aceites sÃ£o de anteontem. Por favor, repita a sua pesquisa noutro dia.
 summary.serverproblem.nodata.title=Problema de servidor
 summary.serverproblem.nodata.body.text=A base de dados nÃ£o contÃ©m dados para 
a data solicitada. Por favor tente mais tarde. Se o problema persistir, por 
favor %s!
 summary.serverproblem.nodata.body.link=deixe-nos saber

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

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2018-01-18 Thread translation

commit 1e96c8cc74ff4f042cf0220a1429576cc9170f5b
Author: Translation commit bot 
Date:   Thu Jan 18 15:46:52 2018 +

Update translations for tor-launcher-properties
---
 pt/torlauncher.properties | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pt/torlauncher.properties b/pt/torlauncher.properties
index e03a55a91..ce9f98559 100644
--- a/pt/torlauncher.properties
+++ b/pt/torlauncher.properties
@@ -14,9 +14,9 @@ torlauncher.tor_bootstrap_failed_details=%1$S falhou (%2$S).
 
 torlauncher.unable_to_start_tor=NÃ£o Ã© possÃvel iniciar o Tor.\n\n %S
 torlauncher.tor_missing=O executÃ¡vel do Tor estÃ¡ em falta.
-torlauncher.torrc_missing=O ficheiro torc nÃ£o existe e nÃ£o pode ser criado.
-torlauncher.datadir_missing=O diretÃ³rio de dados Tor nÃ£o existe e nÃ£o pode 
ser criado.
-torlauncher.password_hash_missing=NÃ£o foi possÃvel obter a senha "hashed".
+torlauncher.torrc_missing=O ficheiro torc estÃ¡ em falta e nÃ£o foi possÃvel 
criÃ¡-lo.
+torlauncher.datadir_missing=A diretoria de dados Tor nÃ£o existe e nÃ£o foi 
possÃvel criÃ¡-la.
+torlauncher.password_hash_missing=NÃ£o foi possÃvel obter a palavra-passe 
"hashed".
 
 torlauncher.failed_to_get_settings=NÃ£o Ã© possÃvel obter as configuraÃ§Ãµes 
do Tor\n\n %S
 torlauncher.failed_to_save_settings=NÃ£o Ã© possÃvel guardar as 
configuraÃ§Ãµes do Tor\n\n %S
@@ -28,8 +28,8 @@ torlauncher.error_bridges_missing=Deve especificar uma ou 
mais pontes.
 torlauncher.error_default_bridges_type_missing=Deve selecionar o tipo de 
transporte para as pontes fornecidas
 torlauncher.error_bridge_bad_default_type=NÃ£o estÃ£o disponÃveis as pontes 
fornecidas que tÃªm o tipo de transporte %S. Por favor, ajuste as suas 
configuraÃ§Ãµes.
 
-torlauncher.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
+torlauncher.bridge_suffix.meek-amazon=(funciona na China)
+torlauncher.bridge_suffix.meek-azure=(funciona na China)
 
 torlauncher.connect=Ligar
 torlauncher.restart_tor=Reiniciar o Tor
@@ -42,7 +42,7 @@ torlauncher.forAssistance2=Para assistÃªncia, visite %S
 
 torlauncher.copiedNLogMessages=CÃ³pia completa. EstÃ£o prontas %S mensagens do 
registo de eventos do Tor para serem coladas num editor de texto ou numa 
mensagem de correio eletrÃ³nico.
 
-torlauncher.bootstrapStatus.conn_dir=A ligar ao diretÃ³rio do retransmissor
+torlauncher.bootstrapStatus.conn_dir=A ligar Ã  diretoria do retransmissor
 torlauncher.bootstrapStatus.handshake_dir=A estabelecer uma ligaÃ§Ã£o de 
diretoria encriptada
 torlauncher.bootstrapStatus.requesting_status=A obter o estado da rede
 torlauncher.bootstrapStatus.loading_status=A carregar o estado da rede

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

[tor-commits] [translation/tails-greeter-2] Update translations for tails-greeter-2

2018-01-18 Thread translation

commit 89edba1d3ad798d330013a5329e0661d54c0a8b7
Author: Translation commit bot 
Date:   Thu Jan 18 15:20:17 2018 +

Update translations for tails-greeter-2
---
 mk/mk.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mk/mk.po b/mk/mk.po
index 5ccd0b010..b0762be3a 100644
--- a/mk/mk.po
+++ b/mk/mk.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-15 21:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Zarko Gjurov , 2017\n"
+"Last-Translator: Liljana Ackovska , 2018\n"
 "Language-Team: Macedonian (https://www.transifex.com/otf/teams/1519/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +43,7 @@ msgstr ""
 
 #: ../data/greeter.ui.h:6
 msgid "Disable"
-msgstr ""
+msgstr "ÐÐ½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð¸"
 
 #. This string will never be displayed in the 1st version of the greeter.
 #: ../data/greeter.ui.h:8

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

[tor-commits] [metrics-web/master] Document the relay version used by Onionoo for recommended_version

2018-01-18 Thread karsten

commit 9aaac03c3cd7a4982f47fae7949c7e9752195238
Author: teor 
Date:   Thu Jan 18 23:25:20 2018 +1100

Document the relay version used by Onionoo for recommended_version

Sometimes relay versions are different in the descriptor and in the
consensus. Onionoo uses the consensus version.

Documentation fix for #22488.
---
 src/main/resources/web/jsps/onionoo.jsp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/resources/web/jsps/onionoo.jsp 
b/src/main/resources/web/jsps/onionoo.jsp
index b31b469..a416366 100644
--- a/src/main/resources/web/jsps/onionoo.jsp
+++ b/src/main/resources/web/jsps/onionoo.jsp
@@ -602,6 +602,7 @@ Filtering by host name is case-insensitive.
 Return only relays and bridges running a Tor software version that is
 recommended (parameter value true) or not recommended by
 the directory authorities (parameter value false).
+Uses the version in the consensus or bridge network status.
 Relays and bridges are not contained in either result, if the version they
 are running is not known.
 Parameter values are case-insensitive.
@@ -1477,6 +1478,7 @@ implementation.
 
 Boolean field saying whether the Tor software version of this relay is
 recommended by the directory authorities or not.
+Uses the relay version in the consensus.
 Omitted if either the directory authorities did not recommend versions, or
 the relay did not report which version it runs.
 
@@ -1822,6 +1824,7 @@ implementation.
 
 Boolean field saying whether the Tor software version of this bridge is
 recommended by the directory authorities or not.
+Uses the bridge version in the bridge network status.
 Omitted if either the directory authorities did not recommend versions, or
 the bridge did not report which version it runs.
 Added on November 28, 2017.

___
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-01-18 Thread nickm

commit c9b4ddc882c93984359172e3e50f785080751558
Merge: 4bfc35579 44388757c
Author: Nick Mathewson 
Date:   Thu Jan 18 08:13:48 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24826_031 | 4 
 src/or/consdiff.c| 5 -
 2 files changed, 8 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.2'

2018-01-18 Thread nickm

commit c8a27d89b26394a0e802820fe891ef75787499ab
Merge: 77026f8a8 44388757c
Author: Nick Mathewson 
Date:   Thu Jan 18 08:13:48 2018 -0500

Merge branch 'maint-0.3.2'

 changes/bug24826_031 | 4 
 src/or/consdiff.c| 5 -
 2 files changed, 8 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 'bug24826_031' into maint-0.3.1

2018-01-18 Thread nickm

commit f406b9df0533c9730b4537b39f3a7f8d232f3558
Merge: af8cadf3a 4bb831e08
Author: Nick Mathewson 
Date:   Thu Jan 18 08:13:45 2018 -0500

Merge branch 'bug24826_031' into maint-0.3.1

 changes/bug24826_031 | 4 
 src/or/consdiff.c| 5 -
 2 files changed, 8 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.1' into maint-0.3.2

2018-01-18 Thread nickm

commit 44388757c44834d63614c4e13cf88931992afc2a
Merge: 4e653ac2c f406b9df0
Author: Nick Mathewson 
Date:   Thu Jan 18 08:13:48 2018 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug24826_031 | 4 
 src/or/consdiff.c| 5 -
 2 files changed, 8 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] update comment; ignore argument on non-win

2018-01-18 Thread nickm

commit 57eab23ea57620b6d4139f684a74cb85188c12fb
Author: Nick Mathewson 
Date:   Tue Jan 16 14:35:49 2018 -0500

update comment; ignore argument on non-win
---
 src/or/connection.c | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/or/connection.c b/src/or/connection.c
index 5d9d16d37..dfb6d5bf1 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -3694,14 +3694,20 @@ connection_outbuf_too_full(connection_t *conn)
   return (conn->outbuf_flushlen > 10*CELL_PAYLOAD_SIZE);
 }
 
-/** Fix slow upload for Windows Vista and Windows 7 systems (bug #22798).
- * This achieved by tuning socket send buffer size according to hint,
- * returned by SIO_IDEAL_SEND_BACKLOG_QUERY ioctl command.
+/**
+ * On Windows Vista and Windows 7, tune the send buffer size according to a
+ * hint from the OS.
+ *
+ * This should help fix slow upload rates.
  */
 static void
+
 update_send_buffer_size(tor_socket_t sock)
 {
 #ifdef _WIN32
+  /* We only do this on Vista and 7, because earlier versions of Windows
+   * don't have the SIO_IDEAL_SEND_BACKLOG_QUERY functionality, and on
+   * later versions it isn't necessary. */
   static int isVistaOr7 = -1;
   if (isVistaOr7 == -1) {
 isVistaOr7 = 0;
@@ -3721,6 +3727,8 @@ update_send_buffer_size(tor_socket_t sock)
   , sizeof(isb), , NULL, NULL)) {
 setsockopt(sock, SOL_SOCKET, SO_SNDBUF, (const char*), sizeof(isb));
   }
+#else
+  (void) sock;
 #endif
 }
 



___
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] Improve fragile-hardening performance of consensus_split_lines.

2018-01-18 Thread nickm

commit 4bb831e0873e7e4468a44dbf9e253bcd5df18421
Author: Nick Mathewson 
Date:   Tue Jan 16 12:42:40 2018 -0500

Improve fragile-hardening performance of consensus_split_lines.

For whatever reason, in my testing, using memchr() here improves
performance over strchr() by a great deal.

Fixes bug 24826; bugfix on 0.3.1.1-alpha.
---
 changes/bug24826_031 | 4 
 src/or/consdiff.c| 5 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/changes/bug24826_031 b/changes/bug24826_031
new file mode 100644
index 0..3d4a66184
--- /dev/null
+++ b/changes/bug24826_031
@@ -0,0 +1,4 @@
+  o Minor bugfixes (performance, fragile-hardening):
+- Improve the performance of our consensus-diff application code when Tor
+  is built with the --enable-fragile-hardening option set. Fixes bug
+  24826; bugfix on  0.3.1.1-alpha.
diff --git a/src/or/consdiff.c b/src/or/consdiff.c
index 1baa11897..deaf465fe 100644
--- a/src/or/consdiff.c
+++ b/src/or/consdiff.c
@@ -1285,8 +1285,11 @@ consdiff_apply_diff(const smartlist_t *cons1,
 STATIC int
 consensus_split_lines(smartlist_t *out, const char *s, memarea_t *area)
 {
+  const char *end_of_str = s + strlen(s);
+  tor_assert(*end_of_str == '\0');
+
   while (*s) {
-const char *eol = strchr(s, '\n');
+const char *eol = memchr(s, '\n', end_of_str - s);
 if (!eol) {
   /* File doesn't end with newline. */
   return -1;



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

[tor-commits] [tor/master] Improve fragile-hardening performance of consensus_split_lines.

2018-01-18 Thread nickm

commit 4bb831e0873e7e4468a44dbf9e253bcd5df18421
Author: Nick Mathewson 
Date:   Tue Jan 16 12:42:40 2018 -0500

Improve fragile-hardening performance of consensus_split_lines.

For whatever reason, in my testing, using memchr() here improves
performance over strchr() by a great deal.

Fixes bug 24826; bugfix on 0.3.1.1-alpha.
---
 changes/bug24826_031 | 4 
 src/or/consdiff.c| 5 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/changes/bug24826_031 b/changes/bug24826_031
new file mode 100644
index 0..3d4a66184
--- /dev/null
+++ b/changes/bug24826_031
@@ -0,0 +1,4 @@
+  o Minor bugfixes (performance, fragile-hardening):
+- Improve the performance of our consensus-diff application code when Tor
+  is built with the --enable-fragile-hardening option set. Fixes bug
+  24826; bugfix on  0.3.1.1-alpha.
diff --git a/src/or/consdiff.c b/src/or/consdiff.c
index 1baa11897..deaf465fe 100644
--- a/src/or/consdiff.c
+++ b/src/or/consdiff.c
@@ -1285,8 +1285,11 @@ consdiff_apply_diff(const smartlist_t *cons1,
 STATIC int
 consensus_split_lines(smartlist_t *out, const char *s, memarea_t *area)
 {
+  const char *end_of_str = s + strlen(s);
+  tor_assert(*end_of_str == '\0');
+
   while (*s) {
-const char *eol = strchr(s, '\n');
+const char *eol = memchr(s, '\n', end_of_str - s);
 if (!eol) {
   /* File doesn't end with newline. */
   return -1;



___
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.1] Improve fragile-hardening performance of consensus_split_lines.

2018-01-18 Thread nickm

commit 4bb831e0873e7e4468a44dbf9e253bcd5df18421
Author: Nick Mathewson 
Date:   Tue Jan 16 12:42:40 2018 -0500

Improve fragile-hardening performance of consensus_split_lines.

For whatever reason, in my testing, using memchr() here improves
performance over strchr() by a great deal.

Fixes bug 24826; bugfix on 0.3.1.1-alpha.
---
 changes/bug24826_031 | 4 
 src/or/consdiff.c| 5 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/changes/bug24826_031 b/changes/bug24826_031
new file mode 100644
index 0..3d4a66184
--- /dev/null
+++ b/changes/bug24826_031
@@ -0,0 +1,4 @@
+  o Minor bugfixes (performance, fragile-hardening):
+- Improve the performance of our consensus-diff application code when Tor
+  is built with the --enable-fragile-hardening option set. Fixes bug
+  24826; bugfix on  0.3.1.1-alpha.
diff --git a/src/or/consdiff.c b/src/or/consdiff.c
index 1baa11897..deaf465fe 100644
--- a/src/or/consdiff.c
+++ b/src/or/consdiff.c
@@ -1285,8 +1285,11 @@ consdiff_apply_diff(const smartlist_t *cons1,
 STATIC int
 consensus_split_lines(smartlist_t *out, const char *s, memarea_t *area)
 {
+  const char *end_of_str = s + strlen(s);
+  tor_assert(*end_of_str == '\0');
+
   while (*s) {
-const char *eol = strchr(s, '\n');
+const char *eol = memchr(s, '\n', end_of_str - s);
 if (!eol) {
   /* File doesn't end with newline. */
   return -1;



___
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.1] Improve fragile-hardening performance of consensus_split_lines.

2018-01-18 Thread nickm

commit 4bb831e0873e7e4468a44dbf9e253bcd5df18421
Author: Nick Mathewson 
Date:   Tue Jan 16 12:42:40 2018 -0500

Improve fragile-hardening performance of consensus_split_lines.

For whatever reason, in my testing, using memchr() here improves
performance over strchr() by a great deal.

Fixes bug 24826; bugfix on 0.3.1.1-alpha.
---
 changes/bug24826_031 | 4 
 src/or/consdiff.c| 5 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/changes/bug24826_031 b/changes/bug24826_031
new file mode 100644
index 0..3d4a66184
--- /dev/null
+++ b/changes/bug24826_031
@@ -0,0 +1,4 @@
+  o Minor bugfixes (performance, fragile-hardening):
+- Improve the performance of our consensus-diff application code when Tor
+  is built with the --enable-fragile-hardening option set. Fixes bug
+  24826; bugfix on  0.3.1.1-alpha.
diff --git a/src/or/consdiff.c b/src/or/consdiff.c
index 1baa11897..deaf465fe 100644
--- a/src/or/consdiff.c
+++ b/src/or/consdiff.c
@@ -1285,8 +1285,11 @@ consdiff_apply_diff(const smartlist_t *cons1,
 STATIC int
 consensus_split_lines(smartlist_t *out, const char *s, memarea_t *area)
 {
+  const char *end_of_str = s + strlen(s);
+  tor_assert(*end_of_str == '\0');
+
   while (*s) {
-const char *eol = strchr(s, '\n');
+const char *eol = memchr(s, '\n', end_of_str - s);
 if (!eol) {
   /* File doesn't end with newline. */
   return -1;



___
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 'bug24826_031' into maint-0.3.1

2018-01-18 Thread nickm

commit f406b9df0533c9730b4537b39f3a7f8d232f3558
Merge: af8cadf3a 4bb831e08
Author: Nick Mathewson 
Date:   Thu Jan 18 08:13:45 2018 -0500

Merge branch 'bug24826_031' into maint-0.3.1

 changes/bug24826_031 | 4 
 src/or/consdiff.c| 5 -
 2 files changed, 8 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.1] Merge branch 'maint-0.3.1' into release-0.3.1

2018-01-18 Thread nickm

commit 256cd9d8777aac7cb8fd6028ef518fdcf8ab744d
Merge: 83648ef07 f406b9df0
Author: Nick Mathewson 
Date:   Thu Jan 18 08:13:48 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug24826_031 | 4 
 src/or/consdiff.c| 5 -
 2 files changed, 8 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.1] Merge branch 'bug24826_031' into maint-0.3.1

2018-01-18 Thread nickm

commit f406b9df0533c9730b4537b39f3a7f8d232f3558
Merge: af8cadf3a 4bb831e08
Author: Nick Mathewson 
Date:   Thu Jan 18 08:13:45 2018 -0500

Merge branch 'bug24826_031' into maint-0.3.1

 changes/bug24826_031 | 4 
 src/or/consdiff.c| 5 -
 2 files changed, 8 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.1' into maint-0.3.2

2018-01-18 Thread nickm

commit 44388757c44834d63614c4e13cf88931992afc2a
Merge: 4e653ac2c f406b9df0
Author: Nick Mathewson 
Date:   Thu Jan 18 08:13:48 2018 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug24826_031 | 4 
 src/or/consdiff.c| 5 -
 2 files changed, 8 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] Improve fragile-hardening performance of consensus_split_lines.

2018-01-18 Thread nickm

commit 4bb831e0873e7e4468a44dbf9e253bcd5df18421
Author: Nick Mathewson 
Date:   Tue Jan 16 12:42:40 2018 -0500

Improve fragile-hardening performance of consensus_split_lines.

For whatever reason, in my testing, using memchr() here improves
performance over strchr() by a great deal.

Fixes bug 24826; bugfix on 0.3.1.1-alpha.
---
 changes/bug24826_031 | 4 
 src/or/consdiff.c| 5 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/changes/bug24826_031 b/changes/bug24826_031
new file mode 100644
index 0..3d4a66184
--- /dev/null
+++ b/changes/bug24826_031
@@ -0,0 +1,4 @@
+  o Minor bugfixes (performance, fragile-hardening):
+- Improve the performance of our consensus-diff application code when Tor
+  is built with the --enable-fragile-hardening option set. Fixes bug
+  24826; bugfix on  0.3.1.1-alpha.
diff --git a/src/or/consdiff.c b/src/or/consdiff.c
index 1baa11897..deaf465fe 100644
--- a/src/or/consdiff.c
+++ b/src/or/consdiff.c
@@ -1285,8 +1285,11 @@ consdiff_apply_diff(const smartlist_t *cons1,
 STATIC int
 consensus_split_lines(smartlist_t *out, const char *s, memarea_t *area)
 {
+  const char *end_of_str = s + strlen(s);
+  tor_assert(*end_of_str == '\0');
+
   while (*s) {
-const char *eol = strchr(s, '\n');
+const char *eol = memchr(s, '\n', end_of_str - s);
 if (!eol) {
   /* File doesn't end with newline. */
   return -1;



___
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.1] Merge branch 'bug24826_031' into maint-0.3.1

2018-01-18 Thread nickm

commit f406b9df0533c9730b4537b39f3a7f8d232f3558
Merge: af8cadf3a 4bb831e08
Author: Nick Mathewson 
Date:   Thu Jan 18 08:13:45 2018 -0500

Merge branch 'bug24826_031' into maint-0.3.1

 changes/bug24826_031 | 4 
 src/or/consdiff.c| 5 -
 2 files changed, 8 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] Improve Windows performance with SIO_IDEAL_SEND_BACKLOG_QUERY.

2018-01-18 Thread nickm

commit 1efb84215e827e4fe887ea633eb39f06db285786
Author: Nick Mathewson 
Date:   Tue Jan 16 14:23:56 2018 -0500

Improve Windows performance with SIO_IDEAL_SEND_BACKLOG_QUERY.

Patch written by "Vort" on trac. Addresses ticket 22798.
---
 changes/bug22798|  4 
 src/common/compat.h |  3 +++
 src/or/connection.c | 34 ++
 3 files changed, 41 insertions(+)

diff --git a/changes/bug22798 b/changes/bug22798
new file mode 100644
index 0..86af6c934
--- /dev/null
+++ b/changes/bug22798
@@ -0,0 +1,4 @@
+  o Minor features (windows, performance):
+- Improve performance on Windows Vista and Windows 7 by adjusting TCP send
+  window size according to the recommendation from
+  SIO_IDEAL_SEND_BACKLOG_QUERY.  Closes ticket 22798. Patch from Vort.
diff --git a/src/common/compat.h b/src/common/compat.h
index ee1c9454d..fe2d0da08 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -10,6 +10,9 @@
 #ifdef _WIN32
 #include 
 #include 
+#ifndef SIO_IDEAL_SEND_BACKLOG_QUERY
+#define SIO_IDEAL_SEND_BACKLOG_QUERY 0x4004747b
+#endif
 #endif
 #include "torint.h"
 #include "testsupport.h"
diff --git a/src/or/connection.c b/src/or/connection.c
index 8b00d637f..5d9d16d37 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -3694,6 +3694,36 @@ connection_outbuf_too_full(connection_t *conn)
   return (conn->outbuf_flushlen > 10*CELL_PAYLOAD_SIZE);
 }
 
+/** Fix slow upload for Windows Vista and Windows 7 systems (bug #22798).
+ * This achieved by tuning socket send buffer size according to hint,
+ * returned by SIO_IDEAL_SEND_BACKLOG_QUERY ioctl command.
+ */
+static void
+update_send_buffer_size(tor_socket_t sock)
+{
+#ifdef _WIN32
+  static int isVistaOr7 = -1;
+  if (isVistaOr7 == -1) {
+isVistaOr7 = 0;
+OSVERSIONINFO osvi = { 0 };
+osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+GetVersionEx();
+if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion < 2)
+  isVistaOr7 = 1;
+  }
+  if (!isVistaOr7)
+return;
+  if (get_options()->ConstrainedSockets)
+return;
+  ULONG isb = 0;
+  DWORD bytesReturned = 0;
+  if (!WSAIoctl(sock, SIO_IDEAL_SEND_BACKLOG_QUERY, NULL, 0,
+  , sizeof(isb), , NULL, NULL)) {
+setsockopt(sock, SOL_SOCKET, SO_SNDBUF, (const char*), sizeof(isb));
+  }
+#endif
+}
+
 /** Try to flush more bytes onto conn-\>s.
  *
  * This function gets called either from conn_write_callback() in main.c
@@ -3812,6 +3842,9 @@ connection_handle_write_impl(connection_t *conn, int 
force)
 result = flush_buf_tls(or_conn->tls, conn->outbuf,
max_to_write, >outbuf_flushlen);
 
+if (result >= 0)
+  update_send_buffer_size(conn->s);
+
 /* If we just flushed the last bytes, tell the channel on the
  * or_conn to check if it needs to geoip_change_dirreq_state() */
 /*  move this to flushed_some or finished_flushing -NM */
@@ -3886,6 +3919,7 @@ connection_handle_write_impl(connection_t *conn, int 
force)
   connection_mark_for_close(conn);
   return -1;
 }
+update_send_buffer_size(conn->s);
 n_written = (size_t) result;
   }
 



___
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 'bug22798_029_squashed'

2018-01-18 Thread nickm

commit 77026f8a87064efc926f0be1e65c922f5e4ea238
Merge: 959af2024 57eab23ea
Author: Nick Mathewson 
Date:   Wed Jan 17 13:26:41 2018 -0500

Merge branch 'bug22798_029_squashed'

 changes/bug22798|  4 
 src/common/compat.h |  3 +++
 src/or/connection.c | 42 ++
 3 files changed, 49 insertions(+)

diff --cc src/or/connection.c
index 3c37c59b4,dfb6d5bf1..a020bef77
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@@ -3876,9 -3847,12 +3914,12 @@@ connection_handle_write_impl(connection
  
  /* else open, or closing */
  initial_size = buf_datalen(conn->outbuf);
 -result = flush_buf_tls(or_conn->tls, conn->outbuf,
 +result = buf_flush_to_tls(conn->outbuf, or_conn->tls,
 max_to_write, >outbuf_flushlen);
  
+ if (result >= 0)
+   update_send_buffer_size(conn->s);
+ 
  /* If we just flushed the last bytes, tell the channel on the
   * or_conn to check if it needs to geoip_change_dirreq_state() */
  /*  move this to flushed_some or finished_flushing -NM */



___
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] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-01-18 Thread nickm

commit 44388757c44834d63614c4e13cf88931992afc2a
Merge: 4e653ac2c f406b9df0
Author: Nick Mathewson 
Date:   Thu Jan 18 08:13:48 2018 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug24826_031 | 4 
 src/or/consdiff.c| 5 -
 2 files changed, 8 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.2] Merge branch 'bug24826_031' into maint-0.3.1

2018-01-18 Thread nickm

commit f406b9df0533c9730b4537b39f3a7f8d232f3558
Merge: af8cadf3a 4bb831e08
Author: Nick Mathewson 
Date:   Thu Jan 18 08:13:45 2018 -0500

Merge branch 'bug24826_031' into maint-0.3.1

 changes/bug24826_031 | 4 
 src/or/consdiff.c| 5 -
 2 files changed, 8 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-browser-build/maint-7.5] Bump build tag

2018-01-18 Thread gk

commit 670dd59f827203277130d3999c9193eadb1b6022
Author: Georg Koppen 
Date:   Thu Jan 18 12:56:44 2018 +

Bump build tag
---
 rbm.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rbm.conf b/rbm.conf
index b966705..a70778b 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
 
 var:
   torbrowser_version: '7.5'
-  torbrowser_build: 'build1'
+  torbrowser_build: 'build2'
   torbrowser_incremental_from:
 - 7.0.11
   project_name: tor-browser

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

[tor-commits] [tor-browser-build/maint-7.5] Bug 24930: update keyring path used to debootstrap precise images

2018-01-18 Thread gk

commit e9fb651a29f6b649929bbeced662dcad4c1d6fc4
Author: Nicolas Vigier 
Date:   Thu Jan 18 13:24:43 2018 +0100

Bug 24930: update keyring path used to debootstrap precise images

After switching the image we use for debootstrapping from 17.04 to
16.04.3 (in #24924), the path containing the keys for precise changed.
---
 projects/debootstrap-image/config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/debootstrap-image/config 
b/projects/debootstrap-image/config
index a06cc53..2c470be 100644
--- a/projects/debootstrap-image/config
+++ b/projects/debootstrap-image/config
@@ -44,13 +44,13 @@ targets:
   container:
 suite: precise
 arch: amd64
-debootstrap_opt: 
--keyring=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
+debootstrap_opt: 
--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg
   precise-i386:
 var:
   container:
 suite: precise
 arch: i386
-debootstrap_opt: 
--keyring=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
+debootstrap_opt: 
--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg
   utopic-amd64:
 var:
   container:

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

[tor-commits] [tor-browser-build/master] Bump tbb build tag

2018-01-18 Thread gk

commit 8643124e7deac88282ce0c071e1b1c6ee7548985
Author: Georg Koppen 
Date:   Thu Jan 18 12:05:44 2018 +

Bump tbb build tag
---
 rbm.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rbm.conf b/rbm.conf
index 2d8fd60..abe0547 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
 
 var:
   torbrowser_version: '8.0a1'
-  torbrowser_build: 'build1'
+  torbrowser_build: 'build2'
   torbrowser_incremental_from:
 - 7.5a10
   project_name: tor-browser

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

[tor-commits] [tor-browser-build/master] Bump browser build tag (to -build2)

2018-01-18 Thread gk

commit 2cba8ee37a7f189b77f6ff93ada78c0240b03deb
Author: Georg Koppen 
Date:   Thu Jan 18 11:58:08 2018 +

Bump browser build tag (to -build2)
---
 projects/firefox/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 235a552..c433deb 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% 
c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-1-build1'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-1-build2'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 gpg_keyring: torbutton.gpg

___
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-52.6.0esr-8.0-1] fixup! Bug 22548: Firefox downgrades VP9 videos to VP8.

2018-01-18 Thread gk

commit d93d0469d2b21b67869369063e17074563a49abf
Author: Georg Koppen 
Date:   Thu Jan 18 10:53:20 2018 +

fixup! Bug 22548: Firefox downgrades VP9 videos to VP8.
---
 dom/media/Benchmark.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/media/Benchmark.cpp b/dom/media/Benchmark.cpp
index af0f4a562da4..2c4cf1c3e368 100644
--- a/dom/media/Benchmark.cpp
+++ b/dom/media/Benchmark.cpp
@@ -80,7 +80,7 @@ VP9Benchmark::IsVP9DecodeFast()
 
   uint32_t decodeFps = Preferences::GetUint(sBenchmarkFpsPref);
   uint32_t threshold =
-Preferences::GetUint("media.benchmark.vp9.threshold", 0);
+Preferences::GetUint("media.benchmark.vp9.threshold", 0U);
 
   return decodeFps >= threshold;
 #endif

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

[tor-commits] [metrics-web/master] Update news.json to version 218 of doc/MetricsTimeline.

2018-01-18 Thread karsten

commit 41b6bcfa4656d54a769b63f87b230cf36a8e7ce1
Author: Karsten Loesing 
Date:   Thu Jan 18 12:03:44 2018 +0100

Update news.json to version 218 of doc/MetricsTimeline.
---
 src/main/resources/web/json/news.json | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/src/main/resources/web/json/news.json 
b/src/main/resources/web/json/news.json
index 8f81364..8da74f9 100644
--- a/src/main/resources/web/json/news.json
+++ b/src/main/resources/web/json/news.json
@@ -2683,6 +2683,14 @@
 ]
   },
   {
+"start": "2017-12-12",
+"end": "2018-01-18",
+"protocols": [
+  "meek"
+],
+"description": "Outage of the https://atlas.torproject.org/#details/C20658946DD706A7A2181159A1A04CD838570D04\;>meek.bamsoftware.com
 (unthrottled for public use), https://atlas.torproject.org/#details/AA033EEB61601B2B7312D89B62AAA23DC3ED8A34\;>meek.bamsoftware.com:7443
 (former meek-azure, now unused), and https://atlas.torproject.org/#details/D36B0328969EC57AB3085A4470882D99A09C0492\;>gaeuploader.meek.bamsoftware.com
 (used by https://github.com/katherinelitor/GAEuploader\;>GAEuploader) 
bridges."
+  },
+  {
 "start": "2017-12-05",
 "end": "2017-12-15",
 "places": [
@@ -2746,6 +2754,13 @@
 ]
   },
   {
+"start": "2018-01-16",
+"description": "Tor 0.3.2.9 reaches deb.torproject.org.",
+"links": [
+  "https://metrics.torproject.org/versions.html?start=2017-12-01=2018-03-01\;>relay
 versions graph"
+]
+  },
+  {
 "start": "2016-02-24",
 "places": [
   "tm"

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

[tor-commits] [tor-browser-build/master] No branch -2 for nightlies anymore

2018-01-18 Thread gk

commit a5d545cece11bc2a5161e9bf40460de16d2b245b
Author: Georg Koppen 
Date:   Thu Jan 18 10:57:51 2018 +

No branch -2 for nightlies anymore
---
 projects/firefox/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index d2d0bb7..235a552 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -28,7 +28,7 @@ targets:
   torbrowser_update_channel: release
 
   nightly:
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-2'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-1'
 tag_gpg_id: 0
 var:
   torbrowser_update_channel: default

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

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

2018-01-18 Thread translation

commit 6ba3925303433023c4f1f8417c0f47268ff4ab2c
Author: Translation commit bot 
Date:   Thu Jan 18 10:15:24 2018 +

Update translations for whisperback
---
 uk/uk.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/uk/uk.po b/uk/uk.po
index ad3d1cfbd..3968fb15d 100644
--- a/uk/uk.po
+++ b/uk/uk.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-20 12:09+\n"
-"PO-Revision-Date: 2018-01-18 09:44+\n"
+"PO-Revision-Date: 2018-01-18 10:14+\n"
 "Last-Translator: O Herenko \n"
 "Language-Team: Ukrainian 
(http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -45,11 +45,11 @@ msgstr "ÐÐ¼ÑÐ½Ð½Ð° %s Ð½Ðµ Ð±ÑÐ»Ð° Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð° Ð² 
Ð¶Ð¾Ð´Ð½Ð¾Ð¼Ñ ÑÐ°Ð¹
 
 #: ../whisperBack/gui.py:110
 msgid "Name of the affected software"
-msgstr ""
+msgstr "ÐÐ°Ð·Ð²Ð° ÑÑÐ°Ð¶ÐµÐ½Ð¾Ð³Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð½Ð¾Ð³Ð¾ 
Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑÐµÐ½Ð½Ñ"
 
 #: ../whisperBack/gui.py:112
 msgid "Exact steps to reproduce the error"
-msgstr ""
+msgstr "Ð¢Ð¾ÑÐ½Ñ ÐºÑÐ¾ÐºÐ¸ Ð´Ð»Ñ Ð²ÑÐ´ÑÐ²Ð¾ÑÐµÐ½Ð½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸"
 
 #: ../whisperBack/gui.py:114
 msgid "Actual result and description of the error"

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

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

2018-01-18 Thread translation

commit 47d08ad21320399651e7afdae8b602b0d8809166
Author: Translation commit bot 
Date:   Thu Jan 18 10:15:30 2018 +

Update translations for whisperback_completed
---
 uk/uk.po | 61 +++--
 1 file changed, 39 insertions(+), 22 deletions(-)

diff --git a/uk/uk.po b/uk/uk.po
index 451eed567..3968fb15d 100644
--- a/uk/uk.po
+++ b/uk/uk.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # LinuxChata, 2014
+# O Herenko , 2018
 # Pinro Lomil , 2013
 # ÐÑÐ±Ð¾Ð¼Ð¸Ñ , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 19:54+0100\n"
-"PO-Revision-Date: 2016-10-22 23:20+\n"
-"Last-Translator: ÐÑÐ±Ð¾Ð¼Ð¸Ñ \n"
+"POT-Creation-Date: 2017-03-20 12:09+\n"
+"PO-Revision-Date: 2018-01-18 10:14+\n"
+"Last-Translator: O Herenko \n"
 "Language-Team: Ukrainian 
(http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,40 +43,56 @@ msgid ""
 "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
 msgstr "ÐÐ¼ÑÐ½Ð½Ð° %s Ð½Ðµ Ð±ÑÐ»Ð° Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð° Ð² Ð¶Ð¾Ð´Ð½Ð¾Ð¼Ñ 
ÑÐ°Ð¹Ð»Ñ ÐºÐ¾Ð½ÑÑÐ³ÑÑÐ°ÑÑÑ /etc/whisperback/config.py, 
~/.whisperback/config.py, ./config.py"
 
-#: ../whisperBack/gui.py:148
+#: ../whisperBack/gui.py:110
+msgid "Name of the affected software"
+msgstr "ÐÐ°Ð·Ð²Ð° ÑÑÐ°Ð¶ÐµÐ½Ð¾Ð³Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð½Ð¾Ð³Ð¾ 
Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑÐµÐ½Ð½Ñ"
+
+#: ../whisperBack/gui.py:112
+msgid "Exact steps to reproduce the error"
+msgstr "Ð¢Ð¾ÑÐ½Ñ ÐºÑÐ¾ÐºÐ¸ Ð´Ð»Ñ Ð²ÑÐ´ÑÐ²Ð¾ÑÐµÐ½Ð½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸"
+
+#: ../whisperBack/gui.py:114
+msgid "Actual result and description of the error"
+msgstr "Ð¤Ð°ÐºÑÐ¸ÑÐ½Ð¸Ð¹ ÑÐµÐ·ÑÐ»ÑÑÐ°Ñ Ñ Ð¾Ð¿Ð¸Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸"
+
+#: ../whisperBack/gui.py:116
+msgid "Desired result"
+msgstr "ÐÐ°Ð¶Ð°Ð½Ð¸Ð¹ ÑÐµÐ·ÑÐ»ÑÑÐ°Ñ"
+
+#: ../whisperBack/gui.py:152
 msgid "Unable to load a valid configuration."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ Ð²ÑÑÐ½Ñ 
ÐºÐ¾Ð½ÑÑÐ³ÑÑÐ°ÑÑÑ."
 
-#: ../whisperBack/gui.py:214
+#: ../whisperBack/gui.py:218
 msgid "Sending mail..."
 msgstr "ÐÑÐ´Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð½Ñ Ð»Ð¸ÑÑÐ°..."
 
-#: ../whisperBack/gui.py:215
+#: ../whisperBack/gui.py:219
 msgid "Sending mail"
 msgstr "ÐÑÐ´Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð½Ñ Ð»Ð¸ÑÑÐ°"
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:217
+#: ../whisperBack/gui.py:221
 msgid "This could take a while..."
 msgstr "Ð¦Ðµ Ð¼Ð¾Ð¶Ðµ Ð·Ð°Ð¹Ð½ÑÑÐ¸ Ð´ÐµÑÐºÐ¸Ð¹ ÑÐ°Ñ..."
 
-#: ../whisperBack/gui.py:232
+#: ../whisperBack/gui.py:236
 msgid "The contact email adress doesn't seem valid."
 msgstr "ÐÐµÐ²ÑÑÐ½Ð° ÐºÐ¾Ð½ÑÐ°ÐºÑÐ½Ð° Ð°Ð´ÑÐµÑÐ° ÐµÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ñ 
Ð¿Ð¾ÑÑÐ¸."
 
-#: ../whisperBack/gui.py:249
+#: ../whisperBack/gui.py:253
 msgid "Unable to send the mail: SMTP error."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²ÑÐ´Ð¿ÑÐ°Ð²Ð¸ÑÐ¸ Ð»Ð¸ÑÑ: Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° 
SMTP."
 
-#: ../whisperBack/gui.py:251
+#: ../whisperBack/gui.py:255
 msgid "Unable to connect to the server."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð¿ÑÐ´ÐºÐ»ÑÑÐ¸ÑÐ¸ÑÑ Ð´Ð¾ ÑÐµÑÐ²ÐµÑÑ."
 
-#: ../whisperBack/gui.py:253
+#: ../whisperBack/gui.py:257
 msgid "Unable to create or to send the mail."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ ÑÑÐ²Ð¾ÑÐ¸ÑÐ¸ Ð°Ð±Ð¾ Ð²ÑÐ´Ð¿ÑÐ°Ð²Ð¸ÑÐ¸ 
Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ."
 
-#: ../whisperBack/gui.py:256
+#: ../whisperBack/gui.py:260
 msgid ""
 "\n"
 "\n"
@@ -84,20 +101,20 @@ msgid ""
 "If it does not work, you will be offered to save the bug report."
 msgstr "\n\nÐÐ¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿ÑÐ¾ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÑ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ 
Ð±ÑÑÐ¸ Ð²ÑÐ´Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¾ Ð¹Ð¼Ð¾Ð²ÑÑÐ½Ð¾ ÑÐµÑÐµÐ· Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð¸ Ñ 
Ð¼ÐµÑÐµÐ¶Ñ. ÐÑÐ´Ñ Ð»Ð°ÑÐºÐ°, ÑÐ¿ÑÐ¾Ð±ÑÐ¹ÑÐµ Ð¿ÑÐ´ÐºÐ»ÑÑÐ¸ÑÐ¸ÑÑ 
Ð´Ð¾ Ð¼ÐµÑÐµÐ¶Ñ Ñ Ð½Ð°ÑÐ¸ÑÐ½ÑÑÑ ÐºÐ½Ð¾Ð¿ÐºÑ Ð²ÑÐ´Ð¿ÑÐ°Ð²Ð¸ÑÐ¸ 
Ð·Ð½Ð¾Ð²Ñ.\n\n\nÐ¯ÐºÑÐ¾ ÑÐµ Ð½Ðµ Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð¶Ðµ, ÑÐ¾ ÐÐ°Ð¼ Ð±ÑÐ´Ðµ 
Ð·Ð°Ð¿ÑÐ¾Ð¿Ð¾Ð½Ð¾Ð²Ð°Ð½Ð¾ Ð·Ð±ÐµÑÐµÐ³ÑÐ¸ Ð·Ð²ÑÑ Ð¿ÑÐ¾ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÑ."
 
-#: ../whisperBack/gui.py:269
+#: ../whisperBack/gui.py:273
 msgid "Your message has been sent."
 msgstr "ÐÐ°ÑÐµ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±ÑÐ»Ð¾ Ð²ÑÐ´Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¾."
 
-#: ../whisperBack/gui.py:276
+#: ../whisperBack/gui.py:280
 msgid "An error occured during encryption."
 msgstr "ÐÑÐ¸ ÑÐ¸ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð²Ð¸Ð½Ð¸ÐºÐ»Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°."
 
-#: ../whisperBack/gui.py:296
+#: ../whisperBack/gui.py:300
 #, python-format
 msgid "Unable to save %s."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð±ÐµÑÐµÐ³ÑÐ¸ %s."
 
-#: ../whisperBack/gui.py:319
+#: ../whisperBack/gui.py:323
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -107,27 +124,27 @@ msgid ""
 "Do you want to save the bug report to a file?"
 msgstr "ÐÐ¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿ÑÐ¾ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÑ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑÑÐ¸ 
Ð²ÑÐ´Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¾ Ð¹Ð¼Ð¾Ð²ÑÑÐ½Ð¾ ÑÐµÑÐµÐ· Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð¸ Ñ

[tor-commits] [tor-browser-build/master] Release preparations for 8.0a1

2018-01-18 Thread gk

commit ecffc49f5379d2d5a4208d0d5940c386510aa600
Author: Georg Koppen 
Date:   Thu Jan 18 09:47:24 2018 +

Release preparations for 8.0a1

Changelog update and versions bump
---
 projects/firefox-langpacks/config  |  2 +-
 projects/firefox/config|  6 +++---
 projects/https-everywhere/config   |  2 +-
 .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 23 ++
 projects/tor-launcher/config   |  2 +-
 projects/tor/config|  2 +-
 projects/torbutton/config  |  2 +-
 rbm.conf   |  5 ++---
 8 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/projects/firefox-langpacks/config 
b/projects/firefox-langpacks/config
index 04cd7dd..4e42939 100644
--- a/projects/firefox-langpacks/config
+++ b/projects/firefox-langpacks/config
@@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") 
%]-[% c("var/buil
 
 var:
   ff_version: '[% pc("firefox", "var/firefox_version") %]'
-  ff_build: build2
+  ff_build: build1
   ff_arch: linux-i686
   input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
 
diff --git a/projects/firefox/config b/projects/firefox/config
index 59a4418..d2d0bb7 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,15 +1,15 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% 
c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-2-build2'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-1-build1'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 52.5.2
+  firefox_platform_version: 52.6.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
-  torbrowser_branch: 7.5
+  torbrowser_branch: 8.0
   torbrowser_update_channel: alpha
   copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
   deps:
diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config
index 34947db..ba3f3ca 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2017.12.6
+version: 2018.1.11
 git_url: https://git.torproject.org/https-everywhere.git
 git_hash: '[% c("version") %]'
 git_submodule: 1
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt 
b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index cfbe26d..5ee6e37 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,26 @@
+Tor Browser 8.0a1 -- January 23 2018
+ * All Platforms
+   * Update Firefox to 52.6.0esr
+   * Update Tor to 0.3.2.9
+   * Update Torbutton to 1.9.8.5
+ * Bug 21245: Add da translation to Torbutton and keep track of it
+ * Bug 24702: Remove Mozilla text from banner
+ * Translations update
+   * Update Tor Launcher to 0.2.14.3
+ * Translations update
+   * Update HTTPS Everywhere to 2018.1.11
+   * Bug 24756: Add noisebridge01 obfs4 bridge configuration
+   * Bug 23916: Add new MAR signing key
+   * Bug 22548: Firefox downgrades VP9 videos to VP8 for some users
+ * Windows
+   * Bug 24197: Fix win64 sandbox compile issues
+ * Build System
+   * Windows
+ * Bug 18691: switch Windows builds from precise to jessie
+   * Linux
+ * Bug 23892: Include Firefox and Tor debug files in final build directory
+ * Bug 24842: include libasan.so.2 and libubsan.so.0 in debug builds
+
 Tor Browser 7.5a10 -- December 19 2017
  * All Platforms
* Update Tor to 0.3.2.7-rc
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index c048175..5f04027 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.14.2
+version: 0.2.14.3
 git_url: https://git.torproject.org/tor-launcher.git
 git_hash: '[% c("version") %]'
 gpg_keyring: torbutton.gpg
diff --git a/projects/tor/config b/projects/tor/config
index 6f01b29..df721e1 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -1,6 +1,6 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% 
c("var/build_id") %]'
-version: 0.3.2.7-rc
+version: 0.3.2.9
 git_hash: 'tor-[% c("version") %]'
 git_url: https://git.torproject.org/tor.git
 gpg_keyring: tor.gpg
diff --git a/projects/torbutton/config b/projects/torbutton/config
index a4e8715..53d9a38 100644
--- a/projects/torbutton/config
+++ b/projects/torbutton/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.9.8.4
+version: 1.9.8.5
 git_url: https://git.torproject.org/torbutton.git
 git_hash: '[% c("version") %]'
 gpg_keyring: torbutton.gpg
diff

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

2018-01-18 Thread translation

commit 73a1b976d02ab3a310dd3368f01234c046a0b1c6
Author: Translation commit bot 
Date:   Thu Jan 18 09:45:28 2018 +

Update translations for whisperback
---
 uk/uk.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/uk/uk.po b/uk/uk.po
index 2b04a8bae..ad3d1cfbd 100644
--- a/uk/uk.po
+++ b/uk/uk.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # LinuxChata, 2014
+# O Herenko , 2018
 # Pinro Lomil , 2013
 # ÐÑÐ±Ð¾Ð¼Ð¸Ñ , 2016
 msgid ""
@@ -11,8 +12,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-20 12:09+\n"
-"PO-Revision-Date: 2017-09-24 11:54+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-01-18 09:44+\n"
+"Last-Translator: O Herenko \n"
 "Language-Team: Ukrainian 
(http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,11 +53,11 @@ msgstr ""
 
 #: ../whisperBack/gui.py:114
 msgid "Actual result and description of the error"
-msgstr ""
+msgstr "Ð¤Ð°ÐºÑÐ¸ÑÐ½Ð¸Ð¹ ÑÐµÐ·ÑÐ»ÑÑÐ°Ñ Ñ Ð¾Ð¿Ð¸Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸"
 
 #: ../whisperBack/gui.py:116
 msgid "Desired result"
-msgstr ""
+msgstr "ÐÐ°Ð¶Ð°Ð½Ð¸Ð¹ ÑÐµÐ·ÑÐ»ÑÑÐ°Ñ"
 
 #: ../whisperBack/gui.py:152
 msgid "Unable to load a valid configuration."

___
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-52.6.0esr-8.0-1] Bug 23916: Add new MAR signing key

2018-01-18 Thread gk

commit f0b673dbac3aba0c5ad6d13c4a7b04c3dd440906
Author: Georg Koppen 
Date:   Mon Jan 15 14:11:32 2018 +

Bug 23916: Add new MAR signing key

We make the certificate for the secondary key the new primary one, and
add the certificate for the new key as the secondary one.

This is the 2018 MAR signing key update.
---
 toolkit/mozapps/update/updater/release_primary.der   | Bin 1229 -> 1229 bytes
 toolkit/mozapps/update/updater/release_secondary.der | Bin 1229 -> 1229 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/toolkit/mozapps/update/updater/release_primary.der 
b/toolkit/mozapps/update/updater/release_primary.der
index 49a7c0185f1c..cce786025698 100644
Binary files a/toolkit/mozapps/update/updater/release_primary.der and 
b/toolkit/mozapps/update/updater/release_primary.der differ
diff --git a/toolkit/mozapps/update/updater/release_secondary.der 
b/toolkit/mozapps/update/updater/release_secondary.der
index cce786025698..caf3eca56804 100644
Binary files a/toolkit/mozapps/update/updater/release_secondary.der and 
b/toolkit/mozapps/update/updater/release_secondary.der differ

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

[tor-commits] [tor-browser-build/maint-7.5] Release preparations for 7.5

2018-01-18 Thread gk

commit 198ca216ffe36d01221e7883740664ce1f2e8eda
Author: Georg Koppen 
Date:   Thu Jan 18 08:36:43 2018 +

Release preparations for 7.5

Changelog update and versions bump
---
 projects/firefox-langpacks/config  |  2 +-
 projects/firefox/config|  4 +-
 projects/https-everywhere/config   |  2 +-
 .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 51 ++
 projects/tor-launcher/config   |  2 +-
 projects/tor/config|  2 +-
 projects/torbutton/config  |  2 +-
 rbm.conf   |  5 +--
 8 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/projects/firefox-langpacks/config 
b/projects/firefox-langpacks/config
index 04cd7dd..4e42939 100644
--- a/projects/firefox-langpacks/config
+++ b/projects/firefox-langpacks/config
@@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") 
%]-[% c("var/buil
 
 var:
   ff_version: '[% pc("firefox", "var/firefox_version") %]'
-  ff_build: build2
+  ff_build: build1
   ff_arch: linux-i686
   input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
 
diff --git a/projects/firefox/config b/projects/firefox/config
index 59a4418..374ade7 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,13 +1,13 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% 
c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-2-build2'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-1-build1'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 52.5.2
+  firefox_platform_version: 52.6.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 7.5
   torbrowser_update_channel: alpha
diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config
index 34947db..ba3f3ca 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2017.12.6
+version: 2018.1.11
 git_url: https://git.torproject.org/https-everywhere.git
 git_hash: '[% c("version") %]'
 git_submodule: 1
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt 
b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index cfbe26d..51f0cf9 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,54 @@
+Tor Browser 7.5 -- January 23 2018
+ * All Platforms
+   * Update Firefox to 52.6.0esr
+   * Update Tor to 0.3.2.9
+   * Update OpenSSL to 1.0.2n
+   * Update Torbutton to 1.9.8.5
+ * Bug 21847: Update copy for security slider
+ * Bug 21245: Add da translation to Torbutton and keep track of it
+ * Bug 24702: Remove Mozilla text from banner
+ * Bug 10573: Replace deprecated nsILocalFile with nsIFile (code clean-up)
+ * Translations update
+   * Update Tor Launcher to 0.2.14.3
+ * Bug 23262: Implement integrated progress bar
+ * Bug 23261: implement configuration portion of new Tor Launcher UI
+ * Bug 24623: Revise "country that censors Tor" text
+ * Bug 24624: tbb-logo.svg may cause network access
+ * Bug 23240: Retrieve current bootstrap progress before showing progress 
bar
+ * Bug 24428: Bootstrap error message sometimes lost
+ * Bug 22232: Add README on use of bootstrap status messages
+ * Bug 10573: Replace deprecated nsILocalFile with nsIFile (code clean-up)
+ * Translations update
+   * Update HTTPS Everywhere to 2018.1.11
+   * Update NoScript to 5.1.8.3
+   * Bug 23104: CSS line-height reveals the platform Tor Browser is running on
+   * Bug 24398: Plugin-container process exhausts memory
+   * Bug 22501: Requests via javascript: violate FPI
+   * Bug 24756: Add noisebridge01 obfs4 bridge configuration
+ * Windows
+   * Bug 16010: Enable content sandboxing on Windows
+   * Bug 23230: Fix build error on Windows 64
+ * OS X
+   * Bug 24566: Avoid white flashes when opening dialogs in Tor Browser
+   * Bug 23025: Add some hardening flags to macOS build
+ * Linux
+   * Bug 23970: Make "Print to File" work with sandboxing enabled
+   * Bug 23016: "Print to File" is broken on some non-english Linux systems
+   * Bug 10089: Set middlemouse.contentLoadURL to false by default
+   * Bug 18101: Suppress upload file dialog proxy bypass (linux part)
+ * Android
+   * Bug 22084: Spoof network information API
+ * Build System
+   * All Platforms
+ * Switch from gitian/tor-browser-bundle to rbm/tor-browser-build
+   * Windows
+ * Bug 22563: Update mingw-w64 to fix W^X violations
+ * Bug 20929: Bump GCC version to 5.4.0
+   * Linux
+ * Bug 20929: Bump

[tor-commits] [tor-browser-build/maint-7.5] Bug 24912: Remove selfrando export in release builds

2018-01-18 Thread gk

commit 2488ddcda9875f2c34c42fa0c3f10c9034c2b7e0
Author: Georg Koppen 
Date:   Thu Jan 18 08:12:23 2018 +

Bug 24912: Remove selfrando export in release builds
---
 projects/tor-browser/RelativeLink/start-tor-browser | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/projects/tor-browser/RelativeLink/start-tor-browser 
b/projects/tor-browser/RelativeLink/start-tor-browser
index 94a8c99..0590eed 100755
--- a/projects/tor-browser/RelativeLink/start-tor-browser
+++ b/projects/tor-browser/RelativeLink/start-tor-browser
@@ -270,7 +270,9 @@ fi
 
 LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/"
 export LD_LIBRARY_PATH
+[% IF ! c("var/release") %]
 export SELFRANDO_write_layout_file=
+[% END %]
 
 [% IF c("var/asan") -%]
 # We need to disable LSan which is enabled by default now. Otherwise we'll get

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

[tor-commits] [tor-browser-build/master] Bug 24912: Remove selfrando export in release builds

2018-01-18 Thread gk

commit a647027d20ee95355f1a5452f2b4586aeb54c68c
Author: Georg Koppen 
Date:   Thu Jan 18 08:12:23 2018 +

Bug 24912: Remove selfrando export in release builds
---
 projects/tor-browser/RelativeLink/start-tor-browser | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/projects/tor-browser/RelativeLink/start-tor-browser 
b/projects/tor-browser/RelativeLink/start-tor-browser
index 94a8c99..0590eed 100755
--- a/projects/tor-browser/RelativeLink/start-tor-browser
+++ b/projects/tor-browser/RelativeLink/start-tor-browser
@@ -270,7 +270,9 @@ fi
 
 LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/"
 export LD_LIBRARY_PATH
+[% IF ! c("var/release") %]
 export SELFRANDO_write_layout_file=
+[% END %]
 
 [% IF c("var/asan") -%]
 # We need to disable LSan which is enabled by default now. Otherwise we'll get

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

[tor-commits] [tor-browser-build/maint-7.5] Bug 24924: update ubuntu images to 16.04.3

2018-01-18 Thread gk

commit 32d20f6cf656f3504bc4567b92b85e7559884d57
Author: Nicolas Vigier 
Date:   Wed Jan 17 22:02:59 2018 +0100

Bug 24924: update ubuntu images to 16.04.3
---
 projects/debootstrap-image/config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/debootstrap-image/config 
b/projects/debootstrap-image/config
index ecb7f2d..a06cc53 100644
--- a/projects/debootstrap-image/config
+++ b/projects/debootstrap-image/config
@@ -3,7 +3,7 @@ filename: 'container-image_[% c("var/container/suite") %]-[% 
c("var/container/ar
 pkg_type: build
 
 var:
-  ubuntu_version: 17.04
+  ubuntu_version: 16.04.3
 
   container:
 use_container: 1
@@ -67,5 +67,5 @@ targets:
 input_files:
   - URL: 'http://cdimage.ubuntu.com/ubuntu-base/releases/[% 
c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") 
%]-base-amd64.tar.gz'
 filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") 
%]-base-amd64.tar.gz'
-sha256sum: df2c8fd540e474b8e1e29c0db8ed6b43a932918f1b9a8149bb82104a7c07ba2a
+sha256sum: 353b01ac60c43574c4977b1a9b7fe09a43298cb572de1a2090a8f09c5133b4d2
 

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

[tor-commits] [tor-browser-build/master] Bug 24924: update ubuntu images to 16.04.3

2018-01-18 Thread gk

commit ebd3b6efb51aa803474b56c7798db584be4d96e3
Author: Nicolas Vigier 
Date:   Wed Jan 17 22:02:59 2018 +0100

Bug 24924: update ubuntu images to 16.04.3
---
 projects/debootstrap-image/config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/debootstrap-image/config 
b/projects/debootstrap-image/config
index ecb7f2d..a06cc53 100644
--- a/projects/debootstrap-image/config
+++ b/projects/debootstrap-image/config
@@ -3,7 +3,7 @@ filename: 'container-image_[% c("var/container/suite") %]-[% 
c("var/container/ar
 pkg_type: build
 
 var:
-  ubuntu_version: 17.04
+  ubuntu_version: 16.04.3
 
   container:
 use_container: 1
@@ -67,5 +67,5 @@ targets:
 input_files:
   - URL: 'http://cdimage.ubuntu.com/ubuntu-base/releases/[% 
c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") 
%]-base-amd64.tar.gz'
 filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") 
%]-base-amd64.tar.gz'
-sha256sum: df2c8fd540e474b8e1e29c0db8ed6b43a932918f1b9a8149bb82104a7c07ba2a
+sha256sum: 353b01ac60c43574c4977b1a9b7fe09a43298cb572de1a2090a8f09c5133b4d2
 

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

61 matches

Mail list logo