[tor-commits] [nyx/master] FAQ entry for why apt-get doesn't work

2018-04-04 Thread atagar
commit 41b85f7c7c796d2190f839ef0910333f46baa5b5
Author: Damian Johnson 
Date:   Wed Apr 4 16:06:51 2018 -0700

FAQ entry for why apt-get doesn't work

This has caused confusion pretty frequently. Explaining why apt-get often
doesn't work...

  https://trac.torproject.org/projects/tor/ticket/25704
---
 web/index.html | 23 ++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/web/index.html b/web/index.html
index 22c32e2..3618a6e 100644
--- a/web/index.html
+++ b/web/index.html
@@ -161,6 +161,21 @@
   
 
 
+
+  Why can't I install with apt-get?
+  
+Installing with Debian and Ubuntu might fail with...
+% sudo apt-get install nyx
+Reading package lists... Done
+Building dependency tree
+Reading state information... Done
+E: Unable to locate package nyx
+
+If so, Nyx is not yet available in your distribution's 
repositories. Nyx is present in https://packages.debian.org/sid/nyx;>Debian Sid and https://launchpad.net/ubuntu/+source/nyx;>Ubuntu 2.0.4 (Bionic), but 
it will take time before it's available elsewhere.
+In the meantime if you see the above we suggest installing with 
'sudo pip install nyx' instead.
+  
+
+
 
   How can I report a bug?
   
@@ -353,7 +368,7 @@ sudo python setup.py install
   
 http://packages.debian.org/sid/nyx; id="debian">
 http://packages.debian.org/sid/nyx; 
class="platform-title">Debian
-Package maintained by Dererk for Debian.
+Package maintained by Dererk for Debian. Use sudo pip install nyx if this 
doesn't work.
 % sudo apt-get install nyx
   
 
@@ -825,6 +840,12 @@ logged_events BW, NOTICE, WARN, ERR
 toggleFaq($(this).parent().find('.answer'));
   });
 
+  $('.faq_no_apt_get').click(function() {
+$(".tabs").data("tabs").click("faq");
+toggleFaq($('#no_apt_get > .answer'));
+document.getElementById('no_apt_get').scrollIntoView();
+  });
+
   // when provided an anchor select the tab it resides within
 
   var anchor = window.location.hash;



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


[tor-commits] [nyx/master] Add Ubuntu to the download page

2018-04-04 Thread atagar
commit 704c025d112faba367287cc83ccf8159b4679b69
Author: Damian Johnson 
Date:   Wed Apr 4 16:08:52 2018 -0700

Add Ubuntu to the download page

Ubuntu is in pre-release freeze of their next release, which will include
Nyx...

  https://launchpad.net/ubuntu/+source/nyx
---
 web/index.html | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/web/index.html b/web/index.html
index 3618a6e..a45f143 100644
--- a/web/index.html
+++ b/web/index.html
@@ -372,14 +372,12 @@ sudo python setup.py install
 % sudo apt-get install nyx
   
 
-  
 
   
 https://apps.fedoraproject.org/packages/nyx; id="fedora">

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


[tor-commits] [webwml/master] Drop twitter link for Linus

2018-04-04 Thread atagar
commit 55ce0526974690737487db862d63d7663cebeece
Author: Damian Johnson 
Date:   Wed Apr 4 15:25:42 2018 -0700

Drop twitter link for Linus

Change per his request.
---
 about/en/corepeople.wml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index e3f3a46c..21049e25 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -437,7 +437,6 @@
 
   
   
-  https://twitter.com/ln4711;>
   https://db.torproject.org/fetchkey.cgi?fingerprint=8C4CD511095E982EB0EFBFA21E8BF34923291265;>
   Linus Nordberg
   IRC: ln5

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


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

2018-04-04 Thread translation
commit 2d19594654422dd86b4797226baab4cca2ee2152
Author: Translation commit bot 
Date:   Wed Apr 4 22:17:35 2018 +

Update translations for tails-perl5lib
---
 nl.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nl.po b/nl.po
index e90339b02..94cb7e791 100644
--- a/nl.po
+++ b/nl.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Bianca Hey , 2018
 # Volluta , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2018-03-15 12:15+\n"
-"PO-Revision-Date: 2018-03-31 13:21+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-04-04 22:17+\n"
+"Last-Translator: Bianca Hey \n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,10 +27,10 @@ msgstr "Fout"
 msgid ""
 "The device Tails is running from cannot be found. Maybe you used the 'toram'"
 " option?"
-msgstr ""
+msgstr "Het apparaat dat Tails uitvoert kan niet gevonden worden. Misschien 
heb je de optie 'toram' gebruikt?"
 
 #: ../lib/Tails/RunningSystem.pm:192
 msgid ""
 "The drive Tails is running from cannot be found. Maybe you used the 'toram' "
 "option?"
-msgstr ""
+msgstr "Het schijfstation waar Tails op wordt uitgevoerd kan niet worden 
gevonden. Misschien heb je de optie 'toram' gebruikt?"

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


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

2018-04-04 Thread translation
commit b231eed448347e6cc70596b5ccb8eee74959ed28
Author: Translation commit bot 
Date:   Wed Apr 4 22:17:39 2018 +

Update translations for tails-perl5lib_completed
---
 nl.po | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/nl.po b/nl.po
index 0f24f3705..94cb7e791 100644
--- a/nl.po
+++ b/nl.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Bianca Hey , 2018
 # Volluta , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2017-05-20 10:59+0200\n"
-"PO-Revision-Date: 2018-02-20 19:04+\n"
-"Last-Translator: Florencia Herra Vega \n"
+"POT-Creation-Date: 2018-03-15 12:15+\n"
+"PO-Revision-Date: 2018-04-04 22:17+\n"
+"Last-Translator: Bianca Hey \n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,12 +25,12 @@ msgstr "Fout"
 
 #: ../lib/Tails/RunningSystem.pm:161
 msgid ""
-"The device Tails is running from cannot be found. Maybe you used the `toram'"
+"The device Tails is running from cannot be found. Maybe you used the 'toram'"
 " option?"
-msgstr "Het apparaat waarvan Tails is opgestart kan niet worden gevonden. 
Misschien heb je de optie 'toram' gebruikt?"
+msgstr "Het apparaat dat Tails uitvoert kan niet gevonden worden. Misschien 
heb je de optie 'toram' gebruikt?"
 
 #: ../lib/Tails/RunningSystem.pm:192
 msgid ""
-"The drive Tails is running from cannot be found. Maybe you used the `toram' "
+"The drive Tails is running from cannot be found. Maybe you used the 'toram' "
 "option?"
-msgstr "Het schijfstation waarvan Tails is opgestart kan niet worden gevonden. 
Misschien heb je de optie 'toram' gebruikt?"
+msgstr "Het schijfstation waar Tails op wordt uitgevoerd kan niet worden 
gevonden. Misschien heb je de optie 'toram' gebruikt?"

___
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-04-04 Thread translation
commit 26602a7df4e775cc24b5f06311c425bffbfc6476
Author: Translation commit bot 
Date:   Wed Apr 4 22:16:42 2018 +

Update translations for tails-misc
---
 nl.po | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/nl.po b/nl.po
index 39af5165b..3aabf643b 100644
--- a/nl.po
+++ b/nl.po
@@ -6,6 +6,7 @@
 # jjjdddsssxxx , 2014
 # Adriaan Callaerts , 2013
 # André Koot , 2016
+# Bianca Hey , 2018
 # cialenhh , 2013
 # Christian Rademaker , 2014
 # Cleveridge , 2014
@@ -27,8 +28,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-12 19:03+0100\n"
-"PO-Revision-Date: 2018-03-13 02:48+\n"
-"Last-Translator: Pander \n"
+"PO-Revision-Date: 2018-04-04 22:14+\n"
+"Last-Translator: Bianca Hey \n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -92,7 +93,7 @@ msgstr "Herstarten"
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:78
 msgid "Lock screen"
-msgstr ""
+msgstr "Schermvergrendeling"
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:81
 msgid "Power Off"
@@ -224,11 +225,11 @@ msgstr "Annuleren"
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:124
 msgid "Screen Locker"
-msgstr ""
+msgstr "Schermvergrendeling"
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130
 msgid "Set up a password to unlock the screen."
-msgstr ""
+msgstr "Maak een wachtwoord aan om het scherm te ontgrendelen."
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135
 msgid "Password"
@@ -249,7 +250,7 @@ msgid ""
 "\n"
 "Or do a manual upgrade.\n"
 "See https://tails.boum.org/doc/first_steps/upgrade#manual\";
-msgstr ""
+msgstr "\"Onvoldoende geheugen om op upgrades te controleren.\n\nZorg 
ervoor dat dit systeem voldoet aan de vereisten voor het uitvoeren van 
Tails.\nZie 
file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nProbeer 
Tails opnieuw op te starten om te controleren op upgrades.\n\nOf voer een 
handmatige upgrade uit.\nZie 
https://tails.boum.org/doc/first_steps/upgrade#manual\";
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:72
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27

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


[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2018-04-04 Thread translation
commit 6795e225f99433f5b3bab97bb0fc97d8f46e4be6
Author: Translation commit bot 
Date:   Wed Apr 4 22:16:33 2018 +

Update translations for tor-launcher-network-settings
---
 nl/network-settings.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nl/network-settings.dtd b/nl/network-settings.dtd
index 004f989e9..28074c936 100644
--- a/nl/network-settings.dtd
+++ b/nl/network-settings.dtd
@@ -42,8 +42,8 @@
 
 
 
-
-
+
+
 
 
 

___
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-04-04 Thread translation
commit 1ecad3aa4d35c1839b097230617457ceba2ed384
Author: Translation commit bot 
Date:   Wed Apr 4 22:16:46 2018 +

Update translations for tails-misc_completed
---
 nl.po | 122 ++
 1 file changed, 71 insertions(+), 51 deletions(-)

diff --git a/nl.po b/nl.po
index a651e8252..3aabf643b 100644
--- a/nl.po
+++ b/nl.po
@@ -6,6 +6,7 @@
 # jjjdddsssxxx , 2014
 # Adriaan Callaerts , 2013
 # André Koot , 2016
+# Bianca Hey , 2018
 # cialenhh , 2013
 # Christian Rademaker , 2014
 # Cleveridge , 2014
@@ -26,9 +27,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-20 11:29+0100\n"
-"PO-Revision-Date: 2018-02-23 20:16+\n"
-"Last-Translator: kwadronaut \n"
+"POT-Creation-Date: 2018-03-12 19:03+0100\n"
+"PO-Revision-Date: 2018-04-04 22:14+\n"
+"Last-Translator: Bianca Hey \n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -61,36 +62,40 @@ msgid ""
 "\n"
 msgstr "Help ons je bug op te lossen!\nLees onze 
instructies voor het melden van bugs.\nGeef niet meer 
persoonlijke informatie op dan nodig!\nOver het ons geven van 
een e-mailadres\n\nAls je ons een e-mailadres geeft laat dat ons toe je 
te contacteren om het probleem\nte verhelderen. Dit is nodig voor de overgrote 
meerderheid van de meldingen die we\nontvangen, aangezien de meeste meldingen 
nutteloos zijn zonder enige contactinformatie.\nAnderzijds biedt het een 
mogelijkheid voor afluisteraars, zoals de provider van je e-mail\nof je 
internetverbinding, te bevestigen dat je Tails gebruikt.\n\n"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:17
+#: config/chroot_local-includes/usr/local/bin/electrum:57
 msgid "Persistence is disabled for Electrum"
 msgstr "De persistence feature is uitgeschakeld voor Electrum."
 
-#: config/chroot_local-includes/usr/local/bin/electrum:19
+#: config/chroot_local-includes/usr/local/bin/electrum:59
 msgid ""
 "When you reboot Tails, all of Electrum's data will be lost, including your "
 "Bitcoin wallet. It is strongly recommended to only run Electrum when its "
 "persistence feature is activated."
 msgstr "Als je Tails reboot, zal alle data van Electrum verloren gaan, 
inclusief je Bitcoin portomonnee. Het wordt sterk aangeraden om Electrum alleen 
te draaien als de persistence feature is geactiveerd."
 
-#: config/chroot_local-includes/usr/local/bin/electrum:21
+#: config/chroot_local-includes/usr/local/bin/electrum:60
 msgid "Do you want to start Electrum anyway?"
 msgstr "Weet je zeker dat je Electrum wilt starten?"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:23
+#: config/chroot_local-includes/usr/local/bin/electrum:63
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "Start"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:24
+#: config/chroot_local-includes/usr/local/bin/electrum:64
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "Sluiten"
 
-#: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-hel...@tails.boum.org/extension.js:71
+#: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:75
 msgid "Restart"
 msgstr "Herstarten"
 
-#: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-hel...@tails.boum.org/extension.js:74
+#: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:78
+msgid "Lock screen"
+msgstr "Schermvergrendeling"
+
+#: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:81
 msgid "Power Off"
 msgstr "Afsluiten"
 
@@ -119,45 +124,45 @@ msgstr "Gedetailleerde informatie over de versie:\n%s"
 msgid "not available"
 msgstr "niet beschikbaar"
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:170
 msgid "Your additional software installation failed"
 msgstr "De installatie van uw aanvullende software is mislukt"
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:120
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:171
 msgid ""
 "The installation failed. Please check your additional software "
 "configuration, or read the system log to understand better the problem."
 msgstr "De installatie is mislukt. Controleer de configuratie van uw 
aanvullende software of lees de systeem logs om het probleem beter te 
begrijpen."
 
-#: 

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

2018-04-04 Thread translation
commit afd495d89e8354ae0d64252bfd4369b45270da32
Author: Translation commit bot 
Date:   Wed Apr 4 22:16:15 2018 +

Update translations for tor-launcher-properties
---
 nl/torlauncher.properties | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nl/torlauncher.properties b/nl/torlauncher.properties
index e2d4b6985..9b19476d9 100644
--- a/nl/torlauncher.properties
+++ b/nl/torlauncher.properties
@@ -34,9 +34,9 @@ torlauncher.bridge_suffix.meek-azure=(werkt in China)
 
 torlauncher.request_a_bridge=Request a Bridge…
 torlauncher.request_a_new_bridge=Request a New Bridge…
-torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait.
+torlauncher.contacting_bridgedb=Contact maken met BridgeDB. Een ogenblik.
 torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge.
-torlauncher.bad_captcha_solution=The solution is not correct. Please try again.
+torlauncher.bad_captcha_solution=De oplossing is niet correct. Probeer opnieuw.
 torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S
 torlauncher.no_meek=This browser is not configured for meek, which is needed 
to obtain bridges.
 torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
@@ -73,6 +73,6 @@ torlauncher.bootstrapWarning.noroute=geen route naar de server
 torlauncher.bootstrapWarning.ioerror=lees/schrijffout
 torlauncher.bootstrapWarning.pt_missing=ontbrekend plugbaar vervoer
 
-torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost.
-torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the 
server.
-torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to 
the proxy.
+torlauncher.nsresult.NS_ERROR_NET_RESET=De verbinding met de server is 
verbroken.
+torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Kon niet verbinden met de 
server.
+torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Kon niet verbinden met 
de proxy.

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


[tor-commits] [stem/master] Deprecate server descriptor's hidden_service_dir field

2018-04-04 Thread atagar
commit b5b22ec965135263f26d25e7cd338d82828f3e84
Author: Damian Johnson 
Date:   Wed Apr 4 13:53:18 2018 -0700

Deprecate server descriptor's hidden_service_dir field

This field has never been populated...

  https://gitweb.torproject.org/torspec.git/commit/?id=43c2f78

We'll drop it in Stem 2.0. Interestingly when we added this I forgot to 
include
it in our docs so... cool. Think I won't correct that. ;P
---
 stem/descriptor/server_descriptor.py | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/stem/descriptor/server_descriptor.py 
b/stem/descriptor/server_descriptor.py
index 8aed42c6..4f2bcbec 100644
--- a/stem/descriptor/server_descriptor.py
+++ b/stem/descriptor/server_descriptor.py
@@ -341,10 +341,11 @@ def _parse_hibernating_line(descriptor, entries):
 def _parse_hidden_service_dir_line(descriptor, entries):
   value = _value('hidden-service-dir', entries)
 
-  if value:
-descriptor.hidden_service_dir = value.split(' ')
-  else:
-descriptor.hidden_service_dir = ['2']
+  # TODO: Remove the following field in Stem 2.0. It has never been 
populated...
+  #
+  #   https://gitweb.torproject.org/torspec.git/commit/?id=43c2f78
+
+  descriptor.hidden_service_dir = ['2']
 
 
 def _parse_uptime_line(descriptor, entries):
@@ -527,6 +528,10 @@ class ServerDescriptor(Descriptor):
   .. versionchanged:: 1.6.0
  Added the extra_info_sha256_digest, protocols, and bridge_distribution
  attributes.
+
+  .. versionchanged:: 1.7.0
+ Deprecated the hidden_service_dir field, it's never been populated
+ (:spec:`43c2f78`). This field will be removed in Stem 2.0.
   """
 
   ATTRIBUTES = {

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


[tor-commits] [stem/master] Drop compression from _download_descriptors() args

2018-04-04 Thread atagar
commit c1da1a4af97c808b479e424b5666bb702a7b597a
Author: Damian Johnson 
Date:   Mon Apr 2 10:28:19 2018 -0700

Drop compression from _download_descriptors() args

Oops, stupid me. The only reason retries are an arg for this method is so we
can deprecate while iterating. We can just reference self.compression here
instead.
---
 stem/descriptor/remote.py | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py
index e1190fc7..97fd1e5c 100644
--- a/stem/descriptor/remote.py
+++ b/stem/descriptor/remote.py
@@ -430,7 +430,7 @@ class Query(object):
 self._downloader_thread = threading.Thread(
   name = 'Descriptor Query',
   target = self._download_descriptors,
-  args = (self.compression, self.retries,)
+  args = (self.retries,)
 )
 
 self._downloader_thread.setDaemon(True)
@@ -520,7 +520,7 @@ class Query(object):
 
 return 'http://%s:%i/%s' % (address, dirport, self.resource.lstrip('/'))
 
-  def _download_descriptors(self, compression, retries):
+  def _download_descriptors(self, retries):
 try:
   use_authority = retries == 0 and self.fall_back_to_authority
   self.download_url = self._pick_url(use_authority)
@@ -529,7 +529,7 @@ class Query(object):
   response = urllib.urlopen(
 urllib.Request(
   self.download_url,
-  headers = {'Accept-Encoding': ', '.join(compression)},
+  headers = {'Accept-Encoding': ', '.join(self.compression)},
 ),
 timeout = self.timeout,
   )
@@ -564,7 +564,7 @@ class Query(object):
 
   if retries > 0:
 log.debug("Unable to download descriptors from '%s' (%i retries 
remaining): %s" % (self.download_url, retries, exc))
-return self._download_descriptors(compression, retries - 1)
+return self._download_descriptors(retries - 1)
   else:
 log.debug("Unable to download descriptors from '%s': %s" % 
(self.download_url, exc))
 self.error = exc



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


[tor-commits] [onionoo/master] Add version_status field to details documents.

2018-04-04 Thread karsten
commit 76dec0651148e99d069ab798693b22a33162b6b8
Author: Karsten Loesing 
Date:   Thu Feb 22 20:59:31 2018 +0100

Add version_status field to details documents.

Implements #24256.
---
 CHANGELOG.md   |   3 +
 .../torproject/onionoo/docs/DetailsDocument.java   |  10 ++
 .../org/torproject/onionoo/docs/DetailsStatus.java |  10 ++
 .../org/torproject/onionoo/docs/NodeStatus.java|  17 +++
 .../torproject/onionoo/server/ResponseBuilder.java |   2 +
 .../onionoo/updater/NodeDetailsStatusUpdater.java  |  23 +++-
 .../org/torproject/onionoo/updater/TorVersion.java | 150 +
 .../onionoo/updater/TorVersionStatus.java  |  47 +++
 .../onionoo/writer/DetailsDocumentWriter.java  |   1 +
 .../torproject/onionoo/updater/TorVersionTest.java | 127 +
 10 files changed, 384 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a3c468..36d6471 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changes in version 5.1-1.12.0 - 2018-??-??
 
+ * Medium changes
+   - Add version_status field to details documents.
+
  * Minor changes
- Don't attempt to un-escape character sequences in contact lines
  (like "\uk") that only happen to start like escaped utf-8 characters
diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java 
b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
index c749fba..e112efe 100644
--- a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
+++ b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java
@@ -356,6 +356,16 @@ public class DetailsDocument extends Document {
 return this.version;
   }
 
+  private String version_status;
+
+  public void setVersionStatus(String versionStatus) {
+this.version_status = versionStatus;
+  }
+
+  public String getVersionStatus() {
+return this.version_status;
+  }
+
   private SortedSet alleged_family;
 
   public void setAllegedFamily(SortedSet allegedFamily) {
diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java 
b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java
index c3cdc28..f838ec0 100644
--- a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java
+++ b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java
@@ -550,5 +550,15 @@ public class DetailsStatus extends Document {
   public String getVersion() {
 return this.version;
   }
+
+  private String version_status;
+
+  public void setVersionStatus(String versionStatus) {
+this.version_status = versionStatus;
+  }
+
+  public String getVersionStatus() {
+return this.version_status;
+  }
 }
 
diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java 
b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
index 94da8c8..1ea8b98 100644
--- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
+++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
@@ -3,6 +3,8 @@
 
 package org.torproject.onionoo.docs;
 
+import org.torproject.onionoo.updater.TorVersionStatus;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -330,6 +332,16 @@ public class NodeStatus extends Document {
 return this.version;
   }
 
+  private TorVersionStatus versionStatus;
+
+  public void setVersionStatus(TorVersionStatus versionStatus) {
+this.versionStatus = versionStatus;
+  }
+
+  public TorVersionStatus getVersionStatus() {
+return this.versionStatus;
+  }
+
   /* From exit lists: */
 
   private SortedSet exitAddresses;
@@ -572,6 +584,9 @@ public class NodeStatus extends Document {
   if (parts.length >= 25 && !parts[24].isEmpty()) {
 nodeStatus.setHostName(parts[24]);
   }
+  if (parts.length >= 26) {
+
nodeStatus.setVersionStatus(TorVersionStatus.ofAbbreviation(parts[25]));
+  }
   return nodeStatus;
 } catch (NumberFormatException e) {
   log.error("Number format exception while parsing node "
@@ -640,6 +655,8 @@ public class NodeStatus extends Document {
 .append((this.getVersion() != null ? this.getVersion() : ""));
 sb.append("\t")
 .append((this.getHostName() != null ? this.getHostName() : ""));
+sb.append("\t").append(null != this.getVersionStatus()
+? this.getVersionStatus().getAbbreviation() : "");
 return sb.toString();
   }
 }
diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java 
b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java
index e2bdf82..fcf3c8f 100644
--- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java
+++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java
@@ -339,6 +339,8 @@ public class ResponseBuilder {
 detailsDocument.getUnreachableOrAddresses());
   } else if (field.equals("version")) {
 dd.setVersion(detailsDocument.getVersion());
+

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

2018-04-04 Thread translation
commit 13127bdfafd9b48f03a5c3553f16a2c8686bd106
Author: Translation commit bot 
Date:   Wed Apr 4 16:45:41 2018 +

Update translations for https_everywhere_completed
---
 nl/https-everywhere.dtd | 24 +---
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd
index 033f37518..7b24184ac 100644
--- a/nl/https-everywhere.dtd
+++ b/nl/https-everywhere.dtd
@@ -2,34 +2,36 @@
 
 
 
-
+
+
 
 
 
 
 
-
-
+
+
 
-
+
 
 
-
+
+
 
 
 
 
 
-
+
 
-
+
 
 
 
 
-
+
 
-
-
-
+
+
+
 

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


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

2018-04-04 Thread translation
commit f55b5664c77e78a0512ac8a6f0ce2cb298b723d8
Author: Translation commit bot 
Date:   Wed Apr 4 16:45:31 2018 +

Update translations for https_everywhere
---
 nl/https-everywhere.dtd | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd
index 54c7b92df..7b24184ac 100644
--- a/nl/https-everywhere.dtd
+++ b/nl/https-everywhere.dtd
@@ -2,36 +2,36 @@
 
 
 
-
-
+
+
 
 
 
 
 
-
-
+
+
 
-
+
 
 
-
-
+
+
 
 
 
 
 
-
+
 
-
+
 
 
 
 
-
+
 
-
-
-
+
+
+
 

___
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 25710: Extract from $rootdir in mingw-w64's setup.

2018-04-04 Thread boklm
commit 5ebf06b020bb3358a1bfeea5c8ff48fd70939308
Author: David Fifield 
Date:   Wed Apr 4 00:15:14 2018 -0700

Bug 25710: Extract from $rootdir in mingw-w64's setup.

This makes it consistent with the setup of gcc and macosx-toolchain.
---
 projects/mingw-w64/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config
index 73961e4..5bfc93f 100644
--- a/projects/mingw-w64/config
+++ b/projects/mingw-w64/config
@@ -14,7 +14,7 @@ var:
   setup: |
 [% c("var/setarch") -%]
 mkdir -p /var/tmp/dist
-tar -C /var/tmp/dist -xf [% c("compiler_tarfile") %]
+tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %]
 export 
PATH="/var/tmp/dist/mingw-w64/helpers:/var/tmp/dist/mingw-w64/bin:$PATH"
 export gcclibs=/var/tmp/dist/mingw-w64/gcclibs
 targets:

___
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-04-04 Thread translation
commit 026162d1a1351d9adc824af8b3a85652955417e6
Author: Translation commit bot 
Date:   Wed Apr 4 15:20:14 2018 +

Update translations for tor-browser-manual
---
 pt/pt.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pt/pt.po b/pt/pt.po
index 9bb190563..87ede39e6 100644
--- a/pt/pt.po
+++ b/pt/pt.po
@@ -2,8 +2,8 @@
 # Manuela Silva , 2016
 # Rui Neves , 2016
 # Manuela Silva , 2016
-# Francisco P. , 2016
 # Koh Pyreit , 2016
+# Francisco P. , 2016
 # Cesar Silva , 2017
 # Alberto Castro, 2017
 msgid ""
@@ -85,7 +85,7 @@ msgstr ""
 
 #: about-tor-browser.page:50
 msgid "How Tor works"
-msgstr "Funcionamento do Tor"
+msgstr "Como o Tor funciona"
 
 #: about-tor-browser.page:52
 msgid ""
@@ -163,7 +163,7 @@ msgstr ""
 
 #: bridges.page:28
 msgid "Getting bridge addresses"
-msgstr "A obter os endereços de ponte"
+msgstr "Obter endereços de ponte"
 
 #: bridges.page:29
 msgid ""
@@ -193,15 +193,15 @@ msgstr ""
 
 #: bridges.page:51
 msgid "Entering bridge addresses"
-msgstr "Introduzindo endereços de ponte"
+msgstr "Introduzir endereços de ponte"
 
 #: bridges.page:52
 msgid ""
 "Once you have obtained some bridge addresses, you will need to enter them "
 "into Tor Launcher."
 msgstr ""
-"Uma vez que você tenha obtido alguns endereços da ponte, irá necessitar de 
"
-"introduzi-los no Lançador do Tor."
+"Assim que tiver obtido alguns endereços de ponte, terá de introduzi-los no "
+"Tor Launcher."
 
 #: bridges.page:57
 msgid ""
@@ -264,7 +264,7 @@ msgstr ""
 
 #: circumvention.page:22
 msgid "Using pluggable transports"
-msgstr "A utilizar transportes ligáveis"
+msgstr "Utilizar transportes ligáveis"
 
 #. 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

___
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_completed] Update translations for tor-browser-manual_completed

2018-04-04 Thread translation
commit 16e3f977683d542088bb7f4f651c43f31e33e096
Author: Translation commit bot 
Date:   Wed Apr 4 15:20:20 2018 +

Update translations for tor-browser-manual_completed
---
 pt/pt.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pt/pt.po b/pt/pt.po
index 9bb190563..87ede39e6 100644
--- a/pt/pt.po
+++ b/pt/pt.po
@@ -2,8 +2,8 @@
 # Manuela Silva , 2016
 # Rui Neves , 2016
 # Manuela Silva , 2016
-# Francisco P. , 2016
 # Koh Pyreit , 2016
+# Francisco P. , 2016
 # Cesar Silva , 2017
 # Alberto Castro, 2017
 msgid ""
@@ -85,7 +85,7 @@ msgstr ""
 
 #: about-tor-browser.page:50
 msgid "How Tor works"
-msgstr "Funcionamento do Tor"
+msgstr "Como o Tor funciona"
 
 #: about-tor-browser.page:52
 msgid ""
@@ -163,7 +163,7 @@ msgstr ""
 
 #: bridges.page:28
 msgid "Getting bridge addresses"
-msgstr "A obter os endereços de ponte"
+msgstr "Obter endereços de ponte"
 
 #: bridges.page:29
 msgid ""
@@ -193,15 +193,15 @@ msgstr ""
 
 #: bridges.page:51
 msgid "Entering bridge addresses"
-msgstr "Introduzindo endereços de ponte"
+msgstr "Introduzir endereços de ponte"
 
 #: bridges.page:52
 msgid ""
 "Once you have obtained some bridge addresses, you will need to enter them "
 "into Tor Launcher."
 msgstr ""
-"Uma vez que você tenha obtido alguns endereços da ponte, irá necessitar de 
"
-"introduzi-los no Lançador do Tor."
+"Assim que tiver obtido alguns endereços de ponte, terá de introduzi-los no "
+"Tor Launcher."
 
 #: bridges.page:57
 msgid ""
@@ -264,7 +264,7 @@ msgstr ""
 
 #: circumvention.page:22
 msgid "Using pluggable transports"
-msgstr "A utilizar transportes ligáveis"
+msgstr "Utilizar transportes ligáveis"
 
 #. 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

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


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

2018-04-04 Thread translation
commit d8967eaf4e0f8590cde9bb8591d16f8b9d17d13e
Author: Translation commit bot 
Date:   Wed Apr 4 15:18:11 2018 +

Update translations for tor_animation
---
 pt.srt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt.srt b/pt.srt
index de913130d..7fbe513af 100644
--- a/pt.srt
+++ b/pt.srt
@@ -51,7 +51,7 @@ para o explorar
 
 12
 00:00:34,500 --> 00:00:37,000
-Mas não se utilizar o Tor!
+Mas não, se utilizar o Tor!
 
 13
 00:00:37,140 --> 00:00:40,840
@@ -80,7 +80,7 @@ Tor também protege os nossos dados
 18
 00:00:58,400 --> 00:01:01,900
 contra empresas ou governo,
-e vigilância em massa.
+e vigilância em série.
 
 19
 00:01:02,880 --> 00:01:07,340

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


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

2018-04-04 Thread translation
commit bc758aaef13885361d5989085b3ed4a02f777fcc
Author: Translation commit bot 
Date:   Wed Apr 4 15:18:16 2018 +

Update translations for tor_animation_completed
---
 pt.srt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt.srt b/pt.srt
index de913130d..7fbe513af 100644
--- a/pt.srt
+++ b/pt.srt
@@ -51,7 +51,7 @@ para o explorar
 
 12
 00:00:34,500 --> 00:00:37,000
-Mas não se utilizar o Tor!
+Mas não, se utilizar o Tor!
 
 13
 00:00:37,140 --> 00:00:40,840
@@ -80,7 +80,7 @@ Tor também protege os nossos dados
 18
 00:00:58,400 --> 00:01:01,900
 contra empresas ou governo,
-e vigilância em massa.
+e vigilância em série.
 
 19
 00:01:02,880 --> 00:01:07,340

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


[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2018-04-04 Thread translation
commit e5a4c583fc67cbf2a2d3b0d1b105077e87cd92e6
Author: Translation commit bot 
Date:   Wed Apr 4 15:16:43 2018 +

Update translations for tor-launcher-network-settings
---
 pt/network-settings.dtd | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pt/network-settings.dtd b/pt/network-settings.dtd
index a35969182..f0576fdb4 100644
--- a/pt/network-settings.dtd
+++ b/pt/network-settings.dtd
@@ -10,7 +10,7 @@
 
 
 
-
+
 
 
 
@@ -39,11 +39,11 @@
 
 
 
-
+
 
-
-
-
+
+
+
 
 
 

___
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-04-04 Thread translation
commit 9145b9031b06211c156d6c6a600c7486bc9e0023
Author: Translation commit bot 
Date:   Wed Apr 4 15:16:53 2018 +

Update translations for tails-misc
---
 pt.po | 48 
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/pt.po b/pt.po
index 0c7808e30..675e16bba 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: 2018-03-12 19:03+0100\n"
-"PO-Revision-Date: 2018-04-03 15:51+\n"
+"PO-Revision-Date: 2018-04-04 15:05+\n"
 "Last-Translator: Manuela Silva \n"
 "Language-Team: Portuguese 
(http://www.transifex.com/otf/torproject/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -114,7 +114,7 @@ msgstr "O Sistema Live Incógnito Amnésico"
 msgid ""
 "Build information:\n"
 "%s"
-msgstr "Informações da compilação:\n%s"
+msgstr "Informação da compilação:\n%s"
 
 #: config/chroot_local-includes/usr/local/bin/tails-about:54
 msgid "not available"
@@ -163,17 +163,17 @@ msgid ""
 "The upgrade failed. This might be due to a network problem. Please check "
 "your network connection, try to restart Tails, or read the system log to "
 "understand better the problem."
-msgstr "Falha na atualização. Tal pode dever-se a um problema de rede. 
Verifique a ligação à rede, tente reiniciar o Tails, ou leia o registo do 
sistema para uma melhor compreensão do problema."
+msgstr "A atualização falhou. Pode dever-se a um problema da rede. Por 
favor, verifique a ligação à rede, tente reiniciar o Tails, ou leia o 
registo do sistema para uma melhor compreensão do problema."
 
 #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:52
 msgid "Synchronizing the system's clock"
-msgstr "Sincronizando o relógio do sistema"
+msgstr "A sincronizar o relógio do sistema"
 
 #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:53
 msgid ""
 "Tor needs an accurate clock to work properly, especially for Hidden "
 "Services. Please wait..."
-msgstr "Tor necessita de um relógio preciso para funcionar corretamente, 
especialmente para Serviços Escondidos. Por favor, aguarde..."
+msgstr "O Tor precisa de um relógio preciso para funcionar corretamente, 
especialmente para os 'Serviços Ocultados'. Por favor, aguarde..."
 
 #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:87
 msgid "Failed to synchronize the clock!"
@@ -181,11 +181,11 @@ msgstr "Ocorreu uma falha ao sincronizar o relógio!"
 
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
-msgstr "Esta versão do Tails possui algumas questões de sgurança 
conhecidas:"
+msgstr "Esta versão do Tails tem alguns problemas de segurança conhecidos:"
 
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:134
 msgid "Known security issues"
-msgstr "Problemas conhecidos"
+msgstr "Problemas de segurança conhecidos"
 
 #: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52
 #, sh-format
@@ -229,7 +229,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135
 msgid "Password"
-msgstr "Senha"
+msgstr "Palavra-passe"
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:141
 msgid "Confirm"
@@ -260,17 +260,17 @@ msgstr "Erro"
 
 #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:71
 msgid "Warning: virtual machine detected!"
-msgstr "Atenção: máquina virtual detectada!"
+msgstr "Atenção: detetada máquina virtual!"
 
 #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:73
 msgid ""
 "Both the host operating system and the virtualization software are able to "
 "monitor what you are doing in Tails."
-msgstr "Tanto o sistema operativo hospedeiro como o virtualizador podem 
monitorar o que você está a fazer no Tails."
+msgstr "O sistema operativo hospedeiro e o software de virtualização podem 
monitorizar o que está a fazer no Tails."
 
 #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:76
 msgid "Warning: non-free virtual machine detected!"
-msgstr "Aviso: detetada máquina virual não livre"
+msgstr "Aviso: detetada máquina virtual não livre!"
 
 #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:78
 msgid ""
@@ -278,7 +278,7 @@ msgid ""
 "monitor what you are doing in Tails. Only free software can be considered "
 "trustworthy, for both the host operating system and the virtualization "
 "software."
-msgstr "Tanto o sistema operativo do hospedeiro como o software de 
virtualização podem monitorizar o que está a fazer no Tails. Apenas o 
software livre pode ser considerado como de confiança, para ambos."
+msgstr "O sistema operativo hospedeiro e o software de virtualização podem 
monitorizar o que está a fazer no Tails. Apenas o software livre pode ser 
considerado como de confiança, 

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

2018-04-04 Thread translation
commit c7830916300939b1728c0c090337906a2c37bef6
Author: Translation commit bot 
Date:   Wed Apr 4 15:16:13 2018 +

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

diff --git a/pt/torbirdy.dtd b/pt/torbirdy.dtd
index b59f85135..a6031c7d8 100644
--- a/pt/torbirdy.dtd
+++ b/pt/torbirdy.dtd
@@ -40,21 +40,21 @@
 
 
 
-
+
 
-
+
 
 
 
-
+
 
 
-
+
 
 
-
-
-
-
+
+
+
+
 
-
+

___
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-04-04 Thread translation
commit 832092f9e618c6665b2fd0eed4f8e1bf88165de5
Author: Translation commit bot 
Date:   Wed Apr 4 15:16:06 2018 +

Update translations for torbirdy
---
 pt/torbirdy.dtd | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pt/torbirdy.dtd b/pt/torbirdy.dtd
index b59f85135..a6031c7d8 100644
--- a/pt/torbirdy.dtd
+++ b/pt/torbirdy.dtd
@@ -40,21 +40,21 @@
 
 
 
-
+
 
-
+
 
 
 
-
+
 
 
-
+
 
 
-
-
-
-
+
+
+
+
 
-
+

___
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-04-04 Thread translation
commit e712a27ea451a95d2d72cc574836e92151e887af
Author: Translation commit bot 
Date:   Wed Apr 4 14:48:14 2018 +

Update translations for torbutton-aboutdialogdtd
---
 pt/aboutdialog.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt/aboutdialog.dtd b/pt/aboutdialog.dtd
index 4c8b0435d..86d83a2ec 100644
--- a/pt/aboutdialog.dtd
+++ b/pt/aboutdialog.dtd
@@ -13,7 +13,7 @@
 
 
 
-
+
 
-
+
 

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


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

2018-04-04 Thread translation
commit 3be4b709377e31f0a160bb2157ba8eac4a4cae5f
Author: Translation commit bot 
Date:   Wed Apr 4 14:48:23 2018 +

Update translations for torbutton-abouttorproperties
---
 pt/abouttor.properties | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pt/abouttor.properties b/pt/abouttor.properties
index 3543a542c..8995f0a81 100644
--- a/pt/abouttor.properties
+++ b/pt/abouttor.properties
@@ -8,13 +8,13 @@ 
aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
 
-aboutTor.donationBanner.donate=Faz um donativo agora!
+aboutTor.donationBanner.donate=Doe Agora!
 
-aboutTor.donationBanner.slogan=Tor: Potenciando a resistência digital
-aboutTor.donationBanner.mozilla=Faz uma doação agora e a Mozilla retribuirá 
o mesmo valor
+aboutTor.donationBanner.slogan=Tor: A apoiar a resistência digital
+aboutTor.donationBanner.mozilla=Doe hoje e a Mozilla irá corresponder a sua 
oferta!
 
-aboutTor.donationBanner.tagline1=A proteger jornalistas, delatores e ativistas 
desde 2006
-aboutTor.donationBanner.tagline2=Liberdade global na rede
-aboutTor.donationBanner.tagline3=Liberdade na rede
-aboutTor.donationBanner.tagline4=Promovendo a liberdade de expressão global
+aboutTor.donationBanner.tagline1=A proteger jornalistas, informadores e 
ativistas desde 2006
+aboutTor.donationBanner.tagline2=Liberdade de Rede em Todo o Mundo
+aboutTor.donationBanner.tagline3=Liberdade On-line
+aboutTor.donationBanner.tagline4=A promover a liberdade de expressão em todo 
o mundo
 aboutTor.donationBanner.tagline5=A proteger a liberdade de milhões de pessoas 
diariamente

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


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

2018-04-04 Thread translation
commit f7544e0e4636b6fd449904630d74be4c66cada64
Author: Translation commit bot 
Date:   Wed Apr 4 14:48:28 2018 +

Update translations for torbutton-abouttorproperties_completed
---
 pt/abouttor.properties | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pt/abouttor.properties b/pt/abouttor.properties
index 3543a542c..8995f0a81 100644
--- a/pt/abouttor.properties
+++ b/pt/abouttor.properties
@@ -8,13 +8,13 @@ 
aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
 
-aboutTor.donationBanner.donate=Faz um donativo agora!
+aboutTor.donationBanner.donate=Doe Agora!
 
-aboutTor.donationBanner.slogan=Tor: Potenciando a resistência digital
-aboutTor.donationBanner.mozilla=Faz uma doação agora e a Mozilla retribuirá 
o mesmo valor
+aboutTor.donationBanner.slogan=Tor: A apoiar a resistência digital
+aboutTor.donationBanner.mozilla=Doe hoje e a Mozilla irá corresponder a sua 
oferta!
 
-aboutTor.donationBanner.tagline1=A proteger jornalistas, delatores e ativistas 
desde 2006
-aboutTor.donationBanner.tagline2=Liberdade global na rede
-aboutTor.donationBanner.tagline3=Liberdade na rede
-aboutTor.donationBanner.tagline4=Promovendo a liberdade de expressão global
+aboutTor.donationBanner.tagline1=A proteger jornalistas, informadores e 
ativistas desde 2006
+aboutTor.donationBanner.tagline2=Liberdade de Rede em Todo o Mundo
+aboutTor.donationBanner.tagline3=Liberdade On-line
+aboutTor.donationBanner.tagline4=A promover a liberdade de expressão em todo 
o mundo
 aboutTor.donationBanner.tagline5=A proteger a liberdade de milhões de pessoas 
diariamente

___
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-04-04 Thread translation
commit 4ab4548b6b68684ee7e3f1347670a0e9d11db26e
Author: Translation commit bot 
Date:   Wed Apr 4 14:48:18 2018 +

Update translations for torbutton-aboutdialogdtd_completed
---
 pt/aboutdialog.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt/aboutdialog.dtd b/pt/aboutdialog.dtd
index 4c8b0435d..86d83a2ec 100644
--- a/pt/aboutdialog.dtd
+++ b/pt/aboutdialog.dtd
@@ -13,7 +13,7 @@
 
 
 
-
+
 
-
+
 

___
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-04-04 Thread translation
commit 843288ab741ac6255b9d81f164ab70d38addc302
Author: Translation commit bot 
Date:   Wed Apr 4 14:46:17 2018 +

Update translations for torbirdy_completed
---
 pt/torbirdy.dtd| 18 +-
 pt/torbirdy.properties | 14 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pt/torbirdy.dtd b/pt/torbirdy.dtd
index 0c075accd..b59f85135 100644
--- a/pt/torbirdy.dtd
+++ b/pt/torbirdy.dtd
@@ -14,29 +14,29 @@
 
 
 
-
+
 
 
-
-
-
+
+
+
 
 
 
-
+
 
 
 
 
 
-
+
 
 
-
+
 
-
+
 
-
+
 
 
 
diff --git a/pt/torbirdy.properties b/pt/torbirdy.properties
index d1498a190..9127b393e 100644
--- a/pt/torbirdy.properties
+++ b/pt/torbirdy.properties
@@ -2,17 +2,17 @@ torbirdy.name=TorBirdy
 
 torbirdy.enabled.tor=TorBirdy ativado: Tor
 torbirdy.enabled.jondo=TorBirdy ativado: JonDo
-torbirdy.enabled.custom=TorBirdy ativado: Custom Proxy
-torbirdy.enabled.torification=TorBirdy ativado: Transparent Torification
+torbirdy.enabled.custom=TorBirdy Enabled:Proxy Personalizado
+torbirdy.enabled.torification=TorBirdy Enabled:"Torification" Transparente
 torbirdy.enabled.whonix=TorBirdy ativado: Whonix
-torbirdy.disabled=TorBirdy: desativado!
+torbirdy.disabled=TorBirdy: Desativado!
 torbirdy.enabled=TorBirdy:Ativado
 
-torbirdy.email.prompt=TorBirdy desativou o assistente de auto-configuração 
do Thunderbird's para proteger a sua anonimidade.\n\nAs definições de 
segurança recomendadas para %S foram preenchidas.\n\nPode configurar as outras 
definições da conta manuualmente.
+torbirdy.email.prompt=TorBirdy desativou o assistente de configuração 
automática do Thunderbird's para proteger o seu anonimato.\n\nForam definidas 
as configurações de segurança recomendadas para %S.\n\nPode configurar 
manualmente as outras configurações da conta.
 
-torbirdy.email.advanced=Por favor note que alterar as configurações 
avançadas do TorBirdy NÃO é recomendado.\n\nDeve apenas continuar se tiver a 
certeza do que está a fazer.
+torbirdy.email.advanced=Por favor, note que 'NÃO' é recomendado que altere 
as configurações avançadas do TorBirdy.\n\nDeverá apenas continuar se tiver 
a certeza do que está a fazer.
 torbirdy.email.advanced.nextwarning=Mostrar este aviso na próxima vez
-torbirdy.email.advanced.title=Definições avançadas TorBirdy
+torbirdy.email.advanced.title=Configurações Avançadas do TorBirdy
 
-torbirdy.firstrun=Já está a correr o TorBirdy.\n\nPara ajudar a proteger a 
sua anonimidade, o TorBirdy força as definições do Thunderbird, de modo a 
prevenir que sejam alteradas por si ou um suplemento. Existem algumas 
definiões que podem ser alteradas e que podem ser acedidas pelo diálogo de 
preferências do TorBirdy. Quando o TorBirdy for desinstalado ou desativado, 
todas as definições alteradas são repostas (para o valor inicial anterior à 
instalação).\n\nSe é um utilizador novo, é recomendado que leia as 
instruções do sítio web TorBirdy para compreender o que estamos a tentar 
alcançar com o TorBirdy para os nossos utilizadores.
+torbirdy.firstrun=Já está a executar o TorBirdy.\n\nPara ajudar a proteger o 
seu anonimato, o TorBirdy reforçará as configurações do Thunderbird, 
impedindo que elas sejam alteradas por si ou por qualquer add-on. Existem 
algumas configurações que podem ser alteradas e acedidas através da janela 
das preferências do TorBirdy. Quando o TorBirdy é desinstalado ou desativado, 
todas as configurações alteradas são redefinidas para seus valores 
predefinidos (os valores anteriores à instalação do TorBirdy).\n\nSe é um 
novo utilizador, é recomendado que leia as instruções do site da Web do 
TorBirdy para compreender o que nós estamos a tentar alcançar com o TorBirdy 
para os nossos utilizadores.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

___
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-04-04 Thread translation
commit 81051f5a04c0f6023927bcd0da847605e2b9163d
Author: Translation commit bot 
Date:   Wed Apr 4 14:46:08 2018 +

Update translations for torbirdy
---
 pt/torbirdy.dtd| 18 +-
 pt/torbirdy.properties | 14 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pt/torbirdy.dtd b/pt/torbirdy.dtd
index 0c075accd..b59f85135 100644
--- a/pt/torbirdy.dtd
+++ b/pt/torbirdy.dtd
@@ -14,29 +14,29 @@
 
 
 
-
+
 
 
-
-
-
+
+
+
 
 
 
-
+
 
 
 
 
 
-
+
 
 
-
+
 
-
+
 
-
+
 
 
 
diff --git a/pt/torbirdy.properties b/pt/torbirdy.properties
index d1498a190..9127b393e 100644
--- a/pt/torbirdy.properties
+++ b/pt/torbirdy.properties
@@ -2,17 +2,17 @@ torbirdy.name=TorBirdy
 
 torbirdy.enabled.tor=TorBirdy ativado: Tor
 torbirdy.enabled.jondo=TorBirdy ativado: JonDo
-torbirdy.enabled.custom=TorBirdy ativado: Custom Proxy
-torbirdy.enabled.torification=TorBirdy ativado: Transparent Torification
+torbirdy.enabled.custom=TorBirdy Enabled:Proxy Personalizado
+torbirdy.enabled.torification=TorBirdy Enabled:"Torification" Transparente
 torbirdy.enabled.whonix=TorBirdy ativado: Whonix
-torbirdy.disabled=TorBirdy: desativado!
+torbirdy.disabled=TorBirdy: Desativado!
 torbirdy.enabled=TorBirdy:Ativado
 
-torbirdy.email.prompt=TorBirdy desativou o assistente de auto-configuração 
do Thunderbird's para proteger a sua anonimidade.\n\nAs definições de 
segurança recomendadas para %S foram preenchidas.\n\nPode configurar as outras 
definições da conta manuualmente.
+torbirdy.email.prompt=TorBirdy desativou o assistente de configuração 
automática do Thunderbird's para proteger o seu anonimato.\n\nForam definidas 
as configurações de segurança recomendadas para %S.\n\nPode configurar 
manualmente as outras configurações da conta.
 
-torbirdy.email.advanced=Por favor note que alterar as configurações 
avançadas do TorBirdy NÃO é recomendado.\n\nDeve apenas continuar se tiver a 
certeza do que está a fazer.
+torbirdy.email.advanced=Por favor, note que 'NÃO' é recomendado que altere 
as configurações avançadas do TorBirdy.\n\nDeverá apenas continuar se tiver 
a certeza do que está a fazer.
 torbirdy.email.advanced.nextwarning=Mostrar este aviso na próxima vez
-torbirdy.email.advanced.title=Definições avançadas TorBirdy
+torbirdy.email.advanced.title=Configurações Avançadas do TorBirdy
 
-torbirdy.firstrun=Já está a correr o TorBirdy.\n\nPara ajudar a proteger a 
sua anonimidade, o TorBirdy força as definições do Thunderbird, de modo a 
prevenir que sejam alteradas por si ou um suplemento. Existem algumas 
definiões que podem ser alteradas e que podem ser acedidas pelo diálogo de 
preferências do TorBirdy. Quando o TorBirdy for desinstalado ou desativado, 
todas as definições alteradas são repostas (para o valor inicial anterior à 
instalação).\n\nSe é um utilizador novo, é recomendado que leia as 
instruções do sítio web TorBirdy para compreender o que estamos a tentar 
alcançar com o TorBirdy para os nossos utilizadores.
+torbirdy.firstrun=Já está a executar o TorBirdy.\n\nPara ajudar a proteger o 
seu anonimato, o TorBirdy reforçará as configurações do Thunderbird, 
impedindo que elas sejam alteradas por si ou por qualquer add-on. Existem 
algumas configurações que podem ser alteradas e acedidas através da janela 
das preferências do TorBirdy. Quando o TorBirdy é desinstalado ou desativado, 
todas as configurações alteradas são redefinidas para seus valores 
predefinidos (os valores anteriores à instalação do TorBirdy).\n\nSe é um 
novo utilizador, é recomendado que leia as instruções do site da Web do 
TorBirdy para compreender o que nós estamos a tentar alcançar com o TorBirdy 
para os nossos utilizadores.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

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


[tor-commits] [metrics-web/master] Link directly to CollecTor subdirectories.

2018-04-04 Thread karsten
commit 0af3488050be3a7877d34814e39eb42465afe7ec
Author: Karsten Loesing 
Date:   Wed Apr 4 16:15:40 2018 +0200

Link directly to CollecTor subdirectories.
---
 src/main/resources/web/jsps/collector.jsp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/web/jsps/collector.jsp 
b/src/main/resources/web/jsps/collector.jsp
index 13865ba..3e98785 100644
--- a/src/main/resources/web/jsps/collector.jsp
+++ b/src/main/resources/web/jsps/collector.jsp
@@ -382,7 +382,7 @@ The sanitizing steps are specified in detail on a separate
 Bridge Network Statuses
 @type bridge-network-status 1.2
  
recent
- archive
+ 
archive
 #
 
 
@@ -407,7 +407,7 @@ authority which produced the document, to the header.
 Bridge Server descriptors
 @type bridge-server-descriptor 1.2
  
recent
- archive
+ 
archive
 #
 
 
@@ -441,7 +441,7 @@ ports.
 Bridge Extra-info Descriptors
 @type bridge-extra-info 1.3
  
recent
- archive
+ 
archive
 #
 
 

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


[tor-commits] [metrics-web/master] Use proper call list syntax.

2018-04-04 Thread karsten
commit 41907268f1b86337961b7035984ee084a3bd6bab
Author: iwakeh 
Date:   Tue Apr 3 07:32:38 2018 +

Use proper call list syntax.
---
 src/main/java/org/torproject/metrics/web/RObjectGenerator.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/torproject/metrics/web/RObjectGenerator.java 
b/src/main/java/org/torproject/metrics/web/RObjectGenerator.java
index e3a2419..aea6db7 100644
--- a/src/main/java/org/torproject/metrics/web/RObjectGenerator.java
+++ b/src/main/java/org/torproject/metrics/web/RObjectGenerator.java
@@ -131,7 +131,7 @@ public class RObjectGenerator implements 
ServletContextListener {
 }
 String function = this.availableGraphs.get(requestedGraph)
 .getFunction();
-queryBuilder.append(function).append("(");
+queryBuilder.append(function).append(", ");
 StringBuilder imageFilenameBuilder =
 new StringBuilder(requestedGraph);
 for (Map.Entry parameter
@@ -155,7 +155,7 @@ public class RObjectGenerator implements 
ServletContextListener {
 }
 imageFilenameBuilder.append(".").append(fileType);
 String imageFilename = imageFilenameBuilder.toString();
-queryBuilder.append("path = '%1$s'))), '%1$s')");
+queryBuilder.append("path = '%1$s')), '%1$s')");
 String query = queryBuilder.toString();
 File imageFile = new File(this.cachedGraphsDirectory + "/"
 + imageFilename);

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


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

2018-04-04 Thread translation
commit e28e78b2f8bb04a74cb946cb84fb879053d962fc
Author: Translation commit bot 
Date:   Wed Apr 4 13:45:48 2018 +

Update translations for https_everywhere_completed
---
 fr/https-everywhere.dtd | 2 ++
 ga/https-everywhere.dtd | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd
index ca9118e1f..4952257a3 100644
--- a/fr/https-everywhere.dtd
+++ b/fr/https-everywhere.dtd
@@ -2,6 +2,7 @@
 
 
 
+
 
 
 
@@ -14,6 +15,7 @@
 
 
 
+
 
 
 
diff --git a/ga/https-everywhere.dtd b/ga/https-everywhere.dtd
index 9563e621c..67e37b517 100644
--- a/ga/https-everywhere.dtd
+++ b/ga/https-everywhere.dtd
@@ -2,6 +2,7 @@
 
 
 
+
 
 
 
@@ -14,6 +15,7 @@
 
 
 
+
 
 
 

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


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

2018-04-04 Thread translation
commit 28df1e20545f122050d09e1a221b0717810d7413
Author: Translation commit bot 
Date:   Wed Apr 4 13:45:38 2018 +

Update translations for https_everywhere
---
 fr/https-everywhere.dtd | 4 ++--
 ga/https-everywhere.dtd | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd
index 03ff03eda..4952257a3 100644
--- a/fr/https-everywhere.dtd
+++ b/fr/https-everywhere.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -15,7 +15,7 @@
 
 
 
-
+
 
 
 
diff --git a/ga/https-everywhere.dtd b/ga/https-everywhere.dtd
index e19dac4ab..67e37b517 100644
--- a/ga/https-everywhere.dtd
+++ b/ga/https-everywhere.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -15,7 +15,7 @@
 
 
 
-
+
 
 
 

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


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

2018-04-04 Thread nickm
commit 01037c106d3a00614646db0d45a07a925121a07f
Merge: 753840a8a ec8ee5412
Author: Nick Mathewson 
Date:   Wed Apr 4 08:57:24 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug21394.2 |  7 +++
 src/or/dns.c   | 19 +++
 2 files changed, 18 insertions(+), 8 deletions(-)

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


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

2018-04-04 Thread nickm
commit ec8ee541296f3ca494421cd8c8f9903e848823ec
Merge: 7ccb1c5a8 06484eb5e
Author: Nick Mathewson 
Date:   Wed Apr 4 08:55:37 2018 -0400

Merge branch 'bug21394_029_redux' into maint-0.3.3

 changes/bug21394.2 |  7 +++
 src/or/dns.c   | 19 +++
 2 files changed, 18 insertions(+), 8 deletions(-)




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


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

2018-04-04 Thread nickm
commit 52846f728d92b44cda1a7cab1bfa53b2450a29b9
Merge: 218b1746b ec8ee5412
Author: Nick Mathewson 
Date:   Wed Apr 4 08:57:24 2018 -0400

Merge branch 'maint-0.3.3'

 changes/bug21394.2 |  7 +++
 src/or/dns.c   | 19 +++
 2 files changed, 18 insertions(+), 8 deletions(-)

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


[tor-commits] [tor/master] Merge remote-tracking branch 'fristonio/ticket-25645'

2018-04-04 Thread nickm
commit 218b1746baea65c06551f7e2736d382e6a01a49d
Merge: 21c81348a 2680a8b5b
Author: Nick Mathewson 
Date:   Tue Apr 3 19:19:02 2018 -0400

Merge remote-tracking branch 'fristonio/ticket-25645'

 changes/ticket25645 | 4 
 src/or/channel.c| 4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)




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


[tor-commits] [tor/master] Bug 21394 touchup: Increase DNS attempts to 3

2018-04-04 Thread nickm
commit 06484eb5e19081f478c0c5569e2de6fcfb8d3531
Author: Dhalgren 
Date:   Sun Apr 1 05:01:51 2018 +

Bug 21394 touchup: Increase DNS attempts to 3

Also don't give up on a resolver as quickly if multiple are configured.
---
 changes/bug21394.2 |  7 +++
 src/or/dns.c   | 19 +++
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/changes/bug21394.2 b/changes/bug21394.2
new file mode 100644
index 0..b580d2a78
--- /dev/null
+++ b/changes/bug21394.2
@@ -0,0 +1,7 @@
+  o Minor bugfix (Exit node DNS retries):
+- Re-attempt timed-out DNS queries 3 times before failure, since our
+  timeout is 5 seconds for them, but clients wait 10-15. Also allow
+  slightly more timeouts per resolver before giving up on it in the
+  case where an exit has multiple resolvers configured. Fixes bug 21394;
+  bugfix on 0.3.1.9.
+
diff --git a/src/or/dns.c b/src/or/dns.c
index c1e3c3256..33628373d 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -1428,27 +1428,30 @@ configure_nameservers(int force)
   // If we only have one nameserver, it does not make sense to back off
   // from it for a timeout. Unfortunately, the value for max-timeouts is
   // currently clamped by libevent to 255, but it does not hurt to set
-  // it higher in case libevent gets a patch for this.
-  // Reducing attempts in the case of just one name server too, because
-  // it is very likely to be a local one where a network connectivity
-  // issue should not cause an attempt to fail.
+  // it higher in case libevent gets a patch for this.  Higher-than-
+  // default maximum of 3 with multiple nameservers to avoid spuriously
+  // marking one down on bursts of timeouts resulting from scans/attacks
+  // against non-responding authoritative DNS servers.
   if (evdns_base_count_nameservers(the_evdns_base) == 1) {
 SET("max-timeouts:", "100");
-SET("attempts:", "1");
   } else {
-SET("max-timeouts:", "3");
+SET("max-timeouts:", "10");
   }
 
   // Elongate the queue of maximum inflight dns requests, so if a bunch
-  // time out at the resolver (happens commonly with unbound) we won't
+  // remain pending at the resolver (happens commonly with Unbound) we won't
   // stall every other DNS request. This potentially means some wasted
   // CPU as there's a walk over a linear queue involved, but this is a
   // much better tradeoff compared to just failing DNS requests because
   // of a full queue.
   SET("max-inflight:", "8192");
 
-  // Time out after 5 seconds if no reply.
+  // Two retries at 5 and 10 seconds for bind9/named which relies on
+  // clients to handle retries.  Second retry for retried circuits with
+  // extended 15 second timeout.  Superfluous with local-system Unbound
+  // instance--has its own elaborate retry scheme.
   SET("timeout:", "5");
+  SET("attempts:","3");
 
   if (options->ServerDNSRandomizeCase)
 SET("randomize-case:", "1");



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


[tor-commits] [tor/master] ticket(25645): remove unused variable n_possible from channel_get_for_extend()

2018-04-04 Thread nickm
commit 2680a8b5b108ff1532b1aa59849e3156ce76f52b
Author: Deepesh Pathak 
Date:   Tue Apr 3 09:17:23 2018 +0530

ticket(25645): remove unused variable n_possible from 
channel_get_for_extend()
---
 changes/ticket25645 | 4 
 src/or/channel.c| 4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/changes/ticket25645 b/changes/ticket25645
new file mode 100644
index 0..ab20a5ca4
--- /dev/null
+++ b/changes/ticket25645
@@ -0,0 +1,4 @@
+  o Minor bugfixes (channel_get_for_extend()):
+- Remove the unused variable n_possible from the function
+  Fixes bug 25645; bugfix on 0.2.4.4-alpha
+
diff --git a/src/or/channel.c b/src/or/channel.c
index a9483ee02..af2558e1f 100644
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -2387,7 +2387,7 @@ channel_get_for_extend(const char *rsa_id_digest,
 {
   channel_t *chan, *best = NULL;
   int n_inprogress_goodaddr = 0, n_old = 0;
-  int n_noncanonical = 0, n_possible = 0;
+  int n_noncanonical = 0;
 
   tor_assert(msg_out);
   tor_assert(launch_out);
@@ -2450,8 +2450,6 @@ channel_get_for_extend(const char *rsa_id_digest,
   continue;
 }
 
-++n_possible;
-
 if (!best) {
   best = chan; /* If we have no 'best' so far, this one is good enough. */
   continue;



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


[tor-commits] [tor/release-0.3.3] Bug 21394 touchup: Increase DNS attempts to 3

2018-04-04 Thread nickm
commit 06484eb5e19081f478c0c5569e2de6fcfb8d3531
Author: Dhalgren 
Date:   Sun Apr 1 05:01:51 2018 +

Bug 21394 touchup: Increase DNS attempts to 3

Also don't give up on a resolver as quickly if multiple are configured.
---
 changes/bug21394.2 |  7 +++
 src/or/dns.c   | 19 +++
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/changes/bug21394.2 b/changes/bug21394.2
new file mode 100644
index 0..b580d2a78
--- /dev/null
+++ b/changes/bug21394.2
@@ -0,0 +1,7 @@
+  o Minor bugfix (Exit node DNS retries):
+- Re-attempt timed-out DNS queries 3 times before failure, since our
+  timeout is 5 seconds for them, but clients wait 10-15. Also allow
+  slightly more timeouts per resolver before giving up on it in the
+  case where an exit has multiple resolvers configured. Fixes bug 21394;
+  bugfix on 0.3.1.9.
+
diff --git a/src/or/dns.c b/src/or/dns.c
index c1e3c3256..33628373d 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -1428,27 +1428,30 @@ configure_nameservers(int force)
   // If we only have one nameserver, it does not make sense to back off
   // from it for a timeout. Unfortunately, the value for max-timeouts is
   // currently clamped by libevent to 255, but it does not hurt to set
-  // it higher in case libevent gets a patch for this.
-  // Reducing attempts in the case of just one name server too, because
-  // it is very likely to be a local one where a network connectivity
-  // issue should not cause an attempt to fail.
+  // it higher in case libevent gets a patch for this.  Higher-than-
+  // default maximum of 3 with multiple nameservers to avoid spuriously
+  // marking one down on bursts of timeouts resulting from scans/attacks
+  // against non-responding authoritative DNS servers.
   if (evdns_base_count_nameservers(the_evdns_base) == 1) {
 SET("max-timeouts:", "100");
-SET("attempts:", "1");
   } else {
-SET("max-timeouts:", "3");
+SET("max-timeouts:", "10");
   }
 
   // Elongate the queue of maximum inflight dns requests, so if a bunch
-  // time out at the resolver (happens commonly with unbound) we won't
+  // remain pending at the resolver (happens commonly with Unbound) we won't
   // stall every other DNS request. This potentially means some wasted
   // CPU as there's a walk over a linear queue involved, but this is a
   // much better tradeoff compared to just failing DNS requests because
   // of a full queue.
   SET("max-inflight:", "8192");
 
-  // Time out after 5 seconds if no reply.
+  // Two retries at 5 and 10 seconds for bind9/named which relies on
+  // clients to handle retries.  Second retry for retried circuits with
+  // extended 15 second timeout.  Superfluous with local-system Unbound
+  // instance--has its own elaborate retry scheme.
   SET("timeout:", "5");
+  SET("attempts:","3");
 
   if (options->ServerDNSRandomizeCase)
 SET("randomize-case:", "1");



___
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 'bug21394_029_redux' into maint-0.3.3

2018-04-04 Thread nickm
commit ec8ee541296f3ca494421cd8c8f9903e848823ec
Merge: 7ccb1c5a8 06484eb5e
Author: Nick Mathewson 
Date:   Wed Apr 4 08:55:37 2018 -0400

Merge branch 'bug21394_029_redux' into maint-0.3.3

 changes/bug21394.2 |  7 +++
 src/or/dns.c   | 19 +++
 2 files changed, 18 insertions(+), 8 deletions(-)




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


[tor-commits] [tor/maint-0.3.3] Bug 21394 touchup: Increase DNS attempts to 3

2018-04-04 Thread nickm
commit 06484eb5e19081f478c0c5569e2de6fcfb8d3531
Author: Dhalgren 
Date:   Sun Apr 1 05:01:51 2018 +

Bug 21394 touchup: Increase DNS attempts to 3

Also don't give up on a resolver as quickly if multiple are configured.
---
 changes/bug21394.2 |  7 +++
 src/or/dns.c   | 19 +++
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/changes/bug21394.2 b/changes/bug21394.2
new file mode 100644
index 0..b580d2a78
--- /dev/null
+++ b/changes/bug21394.2
@@ -0,0 +1,7 @@
+  o Minor bugfix (Exit node DNS retries):
+- Re-attempt timed-out DNS queries 3 times before failure, since our
+  timeout is 5 seconds for them, but clients wait 10-15. Also allow
+  slightly more timeouts per resolver before giving up on it in the
+  case where an exit has multiple resolvers configured. Fixes bug 21394;
+  bugfix on 0.3.1.9.
+
diff --git a/src/or/dns.c b/src/or/dns.c
index c1e3c3256..33628373d 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -1428,27 +1428,30 @@ configure_nameservers(int force)
   // If we only have one nameserver, it does not make sense to back off
   // from it for a timeout. Unfortunately, the value for max-timeouts is
   // currently clamped by libevent to 255, but it does not hurt to set
-  // it higher in case libevent gets a patch for this.
-  // Reducing attempts in the case of just one name server too, because
-  // it is very likely to be a local one where a network connectivity
-  // issue should not cause an attempt to fail.
+  // it higher in case libevent gets a patch for this.  Higher-than-
+  // default maximum of 3 with multiple nameservers to avoid spuriously
+  // marking one down on bursts of timeouts resulting from scans/attacks
+  // against non-responding authoritative DNS servers.
   if (evdns_base_count_nameservers(the_evdns_base) == 1) {
 SET("max-timeouts:", "100");
-SET("attempts:", "1");
   } else {
-SET("max-timeouts:", "3");
+SET("max-timeouts:", "10");
   }
 
   // Elongate the queue of maximum inflight dns requests, so if a bunch
-  // time out at the resolver (happens commonly with unbound) we won't
+  // remain pending at the resolver (happens commonly with Unbound) we won't
   // stall every other DNS request. This potentially means some wasted
   // CPU as there's a walk over a linear queue involved, but this is a
   // much better tradeoff compared to just failing DNS requests because
   // of a full queue.
   SET("max-inflight:", "8192");
 
-  // Time out after 5 seconds if no reply.
+  // Two retries at 5 and 10 seconds for bind9/named which relies on
+  // clients to handle retries.  Second retry for retried circuits with
+  // extended 15 second timeout.  Superfluous with local-system Unbound
+  // instance--has its own elaborate retry scheme.
   SET("timeout:", "5");
+  SET("attempts:","3");
 
   if (options->ServerDNSRandomizeCase)
 SET("randomize-case:", "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.3] Merge branch 'bug21394_029_redux' into maint-0.3.3

2018-04-04 Thread nickm
commit ec8ee541296f3ca494421cd8c8f9903e848823ec
Merge: 7ccb1c5a8 06484eb5e
Author: Nick Mathewson 
Date:   Wed Apr 4 08:55:37 2018 -0400

Merge branch 'bug21394_029_redux' into maint-0.3.3

 changes/bug21394.2 |  7 +++
 src/or/dns.c   | 19 +++
 2 files changed, 18 insertions(+), 8 deletions(-)

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


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

2018-04-04 Thread translation
commit 4e81fdc42e3ab9ef29ed77211694fb9c800e3bd6
Author: Translation commit bot 
Date:   Wed Apr 4 10:15:41 2018 +

Update translations for https_everywhere
---
 es/https-everywhere.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd
index a409b3b4e..89fb77528 100644
--- a/es/https-everywhere.dtd
+++ b/es/https-everywhere.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -15,7 +15,7 @@
 
 
 
-
+
 
 
 

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


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

2018-04-04 Thread translation
commit 7f1fce639974d3cc635ec1e2e7edea64363f65e3
Author: Translation commit bot 
Date:   Wed Apr 4 10:15:52 2018 +

Update translations for https_everywhere_completed
---
 es/https-everywhere.dtd | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd
index 9f8223632..89fb77528 100644
--- a/es/https-everywhere.dtd
+++ b/es/https-everywhere.dtd
@@ -2,6 +2,7 @@
 
 
 
+
 
 
 
@@ -14,6 +15,7 @@
 
 
 
+
 
 
 

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


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

2018-04-04 Thread translation
commit 21b7b88223cd637c31e4cd3d423831272941340f
Author: Translation commit bot 
Date:   Wed Apr 4 09:45:38 2018 +

Update translations for https_everywhere
---
 de/https-everywhere.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/de/https-everywhere.dtd b/de/https-everywhere.dtd
index 4afdbf5f3..116675bab 100644
--- a/de/https-everywhere.dtd
+++ b/de/https-everywhere.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -15,7 +15,7 @@
 
 
 
-
+
 
 
 

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


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

2018-04-04 Thread translation
commit 6d1f1b0d185a4c775f76a23fba8756d5b4e2769f
Author: Translation commit bot 
Date:   Wed Apr 4 09:45:47 2018 +

Update translations for https_everywhere_completed
---
 de/https-everywhere.dtd | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/de/https-everywhere.dtd b/de/https-everywhere.dtd
index a7532db45..116675bab 100644
--- a/de/https-everywhere.dtd
+++ b/de/https-everywhere.dtd
@@ -2,6 +2,7 @@
 
 
 
+
 
 
 
@@ -14,6 +15,7 @@
 
 
 
+
 
 
 

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


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

2018-04-04 Thread translation
commit 5cf06067531cc1d442622515bdab5ea0aaf741f8
Author: Translation commit bot 
Date:   Wed Apr 4 06:17:36 2018 +

Update translations for tails-perl5lib
---
 he.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/he.po b/he.po
index 823c5f42d..3c7919e22 100644
--- a/he.po
+++ b/he.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ION, 2017
+# ION, 2017-2018
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2018-03-15 12:15+\n"
-"PO-Revision-Date: 2018-03-31 13:21+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-04-04 06:17+\n"
+"Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,10 +26,10 @@ msgstr "שגיאה"
 msgid ""
 "The device Tails is running from cannot be found. Maybe you used the 'toram'"
 " option?"
-msgstr ""
+msgstr "ההתקן ממנו Tails רץ אינו יכול להימצא. 
אולי השתמשת באפשרות 'toram'?"
 
 #: ../lib/Tails/RunningSystem.pm:192
 msgid ""
 "The drive Tails is running from cannot be found. Maybe you used the 'toram' "
 "option?"
-msgstr ""
+msgstr "הכונן ממנו Tails רץ אינו יכול להימצא. 
אולי השתמשת באפשרות 'toram'?"

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


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

2018-04-04 Thread translation
commit d648e68cf63e2ad8b0b5eb917626aa733274608c
Author: Translation commit bot 
Date:   Wed Apr 4 06:17:41 2018 +

Update translations for tails-perl5lib_completed
---
 he.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/he.po b/he.po
index 0409123a4..3c7919e22 100644
--- a/he.po
+++ b/he.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# ION, 2017
+# ION, 2017-2018
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2017-05-20 10:59+0200\n"
-"PO-Revision-Date: 2017-09-30 16:40+\n"
+"POT-Creation-Date: 2018-03-15 12:15+\n"
+"PO-Revision-Date: 2018-04-04 06:17+\n"
 "Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -24,12 +24,12 @@ msgstr "שגיאה"
 
 #: ../lib/Tails/RunningSystem.pm:161
 msgid ""
-"The device Tails is running from cannot be found. Maybe you used the `toram'"
+"The device Tails is running from cannot be found. Maybe you used the 'toram'"
 " option?"
-msgstr "ההתקן ממנו Tails רץ אינו יכול להימצא. 
אולי השתמשת באפשרות `toram'?"
+msgstr "ההתקן ממנו Tails רץ אינו יכול להימצא. 
אולי השתמשת באפשרות 'toram'?"
 
 #: ../lib/Tails/RunningSystem.pm:192
 msgid ""
-"The drive Tails is running from cannot be found. Maybe you used the `toram' "
+"The drive Tails is running from cannot be found. Maybe you used the 'toram' "
 "option?"
-msgstr "הכונן ממנו Tails רץ אינו יכול להימצא. 
אולי השתמשת באפשרות `toram'?"
+msgstr "הכונן ממנו Tails רץ אינו יכול להימצא. 
אולי השתמשת באפשרות 'toram'?"

___
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-04-04 Thread translation
commit 13a321e5887ad1e555865f39e4de8ae5f50131e6
Author: Translation commit bot 
Date:   Wed Apr 4 06:16:44 2018 +

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

diff --git a/he.po b/he.po
index 2004946cc..3ad852dff 100644
--- a/he.po
+++ b/he.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-12 19:03+0100\n"
-"PO-Revision-Date: 2018-03-19 18:04+\n"
+"PO-Revision-Date: 2018-04-04 06:13+\n"
 "Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -79,7 +79,7 @@ msgstr "הפעלה מחדש"
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:78
 msgid "Lock screen"
-msgstr ""
+msgstr "נעל מסך"
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-hel...@tails.boum.org/extension.js:81
 msgid "Power Off"
@@ -202,7 +202,7 @@ msgstr "זיוף MAC נכשל עבור כרטיס הרשת 
${nic_name} (${nic}).
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109
 msgid "Lock Screen"
-msgstr ""
+msgstr "נעל מסך"
 
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118
 #: config/chroot_local-includes/usr/local/bin/tor-browser:46

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


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

2018-04-04 Thread translation
commit 2a1bc7660968f554ad827353e063e4cecca5eb05
Author: Translation commit bot 
Date:   Wed Apr 4 06:15:31 2018 +

Update translations for https_everywhere
---
 he/https-everywhere.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/he/https-everywhere.dtd b/he/https-everywhere.dtd
index 10fed2a06..ade3f12c9 100644
--- a/he/https-everywhere.dtd
+++ b/he/https-everywhere.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -15,7 +15,7 @@
 
 
 
-
+
 
 
 

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


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

2018-04-04 Thread translation
commit 747f09101bf284b82b727b3f0015d9b5e99cc024
Author: Translation commit bot 
Date:   Wed Apr 4 06:15:39 2018 +

Update translations for https_everywhere_completed
---
 he/https-everywhere.dtd | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/he/https-everywhere.dtd b/he/https-everywhere.dtd
index c9ee862fa..ade3f12c9 100644
--- a/he/https-everywhere.dtd
+++ b/he/https-everywhere.dtd
@@ -2,6 +2,7 @@
 
 
 
+
 
 
 
@@ -14,6 +15,7 @@
 
 
 
+
 
 
 

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