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

2016-07-13 Thread translation 
commit 9bd7fa62c527b64150b05989c364b4118b3369c0
Author: Translation commit bot 
Date:   Thu Jul 14 04:15:57 2016 +

Update translations for torbirdy_completed
---
 id/torbirdy.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/id/torbirdy.properties b/id/torbirdy.properties
index 8a9be64..195bdd6 100644
--- a/id/torbirdy.properties
+++ b/id/torbirdy.properties
@@ -6,6 +6,7 @@ torbirdy.enabled.custom=TorBirdy yang Diijinkan: Custom Proxy
 torbirdy.enabled.torification=TorBirdy yang Diijinkan: Transparent Torification
 torbirdy.enabled.whonix=TorBirdy yang Diijinkan: Whonix
 torbirdy.disabled=TorBirdy: Tidak Diijinkan!
+torbirdy.enabled=TorBirdy: Diijinkan
 
 torbirdy.email.prompt=TorBirdy tidak mengijinkan petunjuk pengaturan otomatis 
Thunderbird demi melindungi kerahasiaan Anda.\n\nPengaturan keamanan yang 
disarankan untuk %S telah ditentukan.\n\nAnda saat ini dapat mengubah 
pengaturan akun lainnya secara manual.
 

___
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

2016-07-13 Thread translation 
commit daa39e089ab0ca6d675dcb8eb6a4da4d11080814
Author: Translation commit bot 
Date:   Thu Jul 14 04:15:51 2016 +

Update translations for torbirdy
---
 id/torbirdy.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id/torbirdy.properties b/id/torbirdy.properties
index 690e970..195bdd6 100644
--- a/id/torbirdy.properties
+++ b/id/torbirdy.properties
@@ -6,7 +6,7 @@ torbirdy.enabled.custom=TorBirdy yang Diijinkan: Custom Proxy
 torbirdy.enabled.torification=TorBirdy yang Diijinkan: Transparent Torification
 torbirdy.enabled.whonix=TorBirdy yang Diijinkan: Whonix
 torbirdy.disabled=TorBirdy: Tidak Diijinkan!
-torbirdy.enabled=TorBirdy:Enabled
+torbirdy.enabled=TorBirdy: Diijinkan
 
 torbirdy.email.prompt=TorBirdy tidak mengijinkan petunjuk pengaturan otomatis 
Thunderbird demi melindungi kerahasiaan Anda.\n\nPengaturan keamanan yang 
disarankan untuk %S telah ditentukan.\n\nAnda saat ini dapat mengubah 
pengaturan akun lainnya secara manual.
 

___
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_completed] Update translations for tor-launcher-network-settings_completed

2016-07-13 Thread translation 
commit 9a7734f831798f0837db6643be914bb08a338c57
Author: Translation commit bot 
Date:   Wed Jul 13 18:16:19 2016 +

Update translations for tor-launcher-network-settings_completed
---
 sk_SK/network-settings.dtd | 75 ++
 1 file changed, 75 insertions(+)

diff --git a/sk_SK/network-settings.dtd b/sk_SK/network-settings.dtd
new file mode 100644
index 000..1831549
--- /dev/null
+++ b/sk_SK/network-settings.dtd
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+https://bridges.torproject.org 
pomocou webového prehliadača">
+
+
+https://www.riseup.net, 
https://mail.google.com, or https://mail.yahoo.com;>
+
+

___
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

2016-07-13 Thread translation 
commit 39da07a05a497f0e8e24a4f649367a1458443bfb
Author: Translation commit bot 
Date:   Wed Jul 13 18:16:16 2016 +

Update translations for tor-launcher-network-settings
---
 sk_SK/network-settings.dtd | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sk_SK/network-settings.dtd b/sk_SK/network-settings.dtd
index 1d74306..1831549 100644
--- a/sk_SK/network-settings.dtd
+++ b/sk_SK/network-settings.dtd
@@ -60,16 +60,16 @@
 
 
 
-
+
 
 
 
 
-
-
+
+
 https://bridges.torproject.org 
pomocou webového prehliadača">
-
-
+
+
 https://www.riseup.net, 
https://mail.google.com, or https://mail.yahoo.com;>
-
+
 

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

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

2016-07-13 Thread translation 
commit bc7e0bb65563fb06c33f3ece9a6364c8f39ab4da
Author: Translation commit bot 
Date:   Wed Jul 13 18:16:12 2016 +

Update translations for tor-launcher-progress_completed
---
 sk_SK/progress.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sk_SK/progress.dtd b/sk_SK/progress.dtd
index cdf3509..272fc72 100644
--- a/sk_SK/progress.dtd
+++ b/sk_SK/progress.dtd
@@ -1,4 +1,4 @@
 
 
 
-
+

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

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

2016-07-13 Thread translation 
commit dc4d0894d3d310fa9902a5b4d60f05de17f0bea6
Author: Translation commit bot 
Date:   Wed Jul 13 18:16:07 2016 +

Update translations for tor-launcher-progress
---
 sk_SK/progress.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sk_SK/progress.dtd b/sk_SK/progress.dtd
index 58926c8..272fc72 100644
--- a/sk_SK/progress.dtd
+++ b/sk_SK/progress.dtd
@@ -1,4 +1,4 @@
 
 
 
-
+

___
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

2016-07-13 Thread translation 
commit 1dc5d209d3a665b47bbc0dd93c2dfe72910362a6
Author: Translation commit bot 
Date:   Wed Jul 13 17:46:12 2016 +

Update translations for tor-launcher-network-settings
---
 sk_SK/network-settings.dtd | 30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/sk_SK/network-settings.dtd b/sk_SK/network-settings.dtd
index 50db4a6..1d74306 100644
--- a/sk_SK/network-settings.dtd
+++ b/sk_SK/network-settings.dtd
@@ -15,34 +15,34 @@
 
 
 
-
+
 
 
 
-
-
+
+
 
-
-
+
+
 
-
+
 
-
-
+
+
 
 
 
 
 
 
-
+
 
-
-
+
+
 
 
 
-
+
 
 
 
@@ -52,15 +52,15 @@
 
 
 
-
+
 
 
 
-
+
 
 
 
-
+
 
 
 

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

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

2016-07-13 Thread translation 
commit 42335a6db91347d2bbb5478a12ac6b94c945312f
Author: Translation commit bot 
Date:   Wed Jul 13 17:16:42 2016 +

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

diff --git a/sk_SK/torbutton.properties b/sk_SK/torbutton.properties
index 0c7a42b..13018fa 100644
--- a/sk_SK/torbutton.properties
+++ b/sk_SK/torbutton.properties
@@ -5,7 +5,7 @@ torbutton.circuit_display.this_browser = Tento prehliadač
 torbutton.circuit_display.relay = prenos
 torbutton.circuit_display.tor_bridge = Most
 torbutton.circuit_display.unknown_country = Neznáma krajina
-torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make 
the width and height of your window less distinctive, and thus reduces the 
ability of people to track you online.
+torbutton.content_sizer.margin_tooltip = Prehliadač Tor pridáva tento okraj, 
aby bola šírka a výška Vášho okna menej rozpoznateľná a tým sa 
znižuje schopnosť ľudí vystopovať Vás online.
 torbutton.panel.tooltip.disabled = Kliknutím aktivujete Tor
 torbutton.panel.tooltip.enabled = Kliknutím deaktivujete Tor
 torbutton.panel.label.disabled = Tor deaktivovaný
@@ -36,10 +36,10 @@ torbutton.popup.confirm_plugins = Prípojné moduly, napr. 
Flash, môžu naruši
 torbutton.popup.never_ask_again = Už sa viac nepýtať
 torbutton.popup.confirm_newnym = Prehliadač Tor zatvorí všetky okná a 
karty. Všetky dáta z prehliadania budú stratené.\n\nReštartovať Tor teraz 
a zmeniť Vašu identitu?\n\n
 
-torbutton.slider_notification = The green onion menu now has a security slider 
which lets you adjust your security level. Check it out!
-torbutton.slider_notification_button = Open security settings
+torbutton.slider_notification = V menu green onion je možnosť nastaviť 
úroveň zabezpečenia. Vyškúšajte to!
+torbutton.slider_notification_button = Otvoriť nastavenia bezpečnosti
 
-torbutton.maximize_warning = Maximizing Tor Browser can allow websites to 
determine your monitor size, which can be used to track you. We recommend that 
you leave Tor Browser windows in their original default size.
+torbutton.maximize_warning = Zväčšenie prehliadača Tor na maximálnu 
veľkosť umožňuje webovým stránkam určiť veľkosť Vášho monitoru, čo 
môže byť použité na Vaše vystopovanie. Odporúčame, aby ste ponechali 
okno prehliadača Tor v jeho pôvodne nastavenej veľkosti.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=Táto webová stránka (%S) sa pokúsila získať dáta z 
obrázkov HTML 5 canvas, ktoré môžu byť použité na identifikovanie 
Vášho počítača.\n\nMá prehliadač Tor povoliť, aby táto stránka 
získala dáta z obrázkov HTML5 canvas?
@@ -55,5 +55,5 @@ canvas.neverAccessKey=e
 profileProblemTitle=Problém s profilom %S
 profileReadOnly=Nemôžete spustiť %S zo súborového systému s oprávnením 
len na čítanie. Prosím skopírujte %S pred použitím na iné miesto.
 profileReadOnlyMac=Nemôžete spustiť %S zo súborového systému s 
oprávnením len na čítanie. Prosím skopírujte %S pred použitím na plochu 
alebo do priečinka s aplikáciami.
-profileAccessDenied=%S does not have permission to access the profile. Please 
adjust your file system permissions and try again.
-profileMigrationFailed=Migration of your existing %S profile failed.\nNew 
settings will be used.
+profileAccessDenied=%S nemá oprávnenie k prístupu do profilu. Prosím 
upravte prístupové oprávnenia do priečinku a skúste znovu.
+profileMigrationFailed=Presun Vášho existujúce profilu %S zlyhala.\nBudú 
použité nové nastavenia.

___
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

2016-07-13 Thread translation 
commit 987e4488cda7e5e65a8d61dfced24fb4e6934c83
Author: Translation commit bot 
Date:   Wed Jul 13 17:16:14 2016 +

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

diff --git a/sk_SK/network-settings.dtd b/sk_SK/network-settings.dtd
index 8de7563..50db4a6 100644
--- a/sk_SK/network-settings.dtd
+++ b/sk_SK/network-settings.dtd
@@ -1,8 +1,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -12,8 +12,8 @@
 
 
 
-
-
+
+
 
 
 

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

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

2016-07-13 Thread translation 
commit bd85c9771cead88d44dddb1c8d6814a01f389b91
Author: Translation commit bot 
Date:   Wed Jul 13 17:15:19 2016 +

Update translations for torcheck_completed
---
 sk_SK/torcheck.po | 21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/sk_SK/torcheck.po b/sk_SK/torcheck.po
index 94e7c3a..57a861a 100644
--- a/sk_SK/torcheck.po
+++ b/sk_SK/torcheck.po
@@ -2,14 +2,15 @@
 # Copyright (C) 2008-2013 The Tor Project, Inc
 # 
 # Translators:
+# Dasa M , 2016
 # once, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2014-10-15 17:11+\n"
-"Last-Translator: once\n"
-"Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/projects/p/torproject/language/sk_SK/)\n"
+"PO-Revision-Date: 2016-07-13 17:12+\n"
+"Last-Translator: Dasa M \n"
+"Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/otf/torproject/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,8 +27,8 @@ msgid ""
 "the Internet anonymously."
 msgstr "Prosím, obráťte sa na https://www.torproject.org/\;>stránku Tor pre viac informácií o 
tom, ako bezpečne používať Tor. Teraz môžete voľne a anonymne surfovať 
po Internete."
 
-msgid "There is a security update available for the Tor Browser Bundle."
-msgstr "Pre Tor Browser Bundle je dostupná bezpečnostná aktualizácia."
+msgid "There is a security update available for Tor Browser."
+msgstr "Je dostupná bezpečnostná aktualizácia pre prehliadač Tor."
 
 msgid ""
 "https://www.torproject.org/download/download-easy.html\;>Click "
@@ -93,5 +94,11 @@ msgstr "JavaScript je zapnutý."
 msgid "JavaScript is disabled."
 msgstr "JavaScript je vypnutý."
 
-msgid "However, it does not appear to be the Tor Browser Bundle."
-msgstr "Bohužiaľ, toto sa nezdá byť Tor Browser Bundle."
+msgid "However, it does not appear to be Tor Browser."
+msgstr "Bohužiaľ, toto sa nezdá byť Tor Browser."
+
+msgid "Run a Relay"
+msgstr "Spustite prenos"
+
+msgid "Stay Anonymous"
+msgstr "Zostaňte v anonymite"

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

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

2016-07-13 Thread translation 
commit 2d9377cd2cead8d6ecd98c7f358fd62d34382d16
Author: Translation commit bot 
Date:   Wed Jul 13 17:15:15 2016 +

Update translations for torcheck
---
 sk_SK/torcheck.po | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/sk_SK/torcheck.po b/sk_SK/torcheck.po
index 412c826..57a861a 100644
--- a/sk_SK/torcheck.po
+++ b/sk_SK/torcheck.po
@@ -2,13 +2,14 @@
 # Copyright (C) 2008-2013 The Tor Project, Inc
 # 
 # Translators:
+# Dasa M , 2016
 # once, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
-"Last-Translator: runasand \n"
+"PO-Revision-Date: 2016-07-13 17:12+\n"
+"Last-Translator: Dasa M \n"
 "Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/otf/torproject/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +28,7 @@ msgid ""
 msgstr "Prosím, obráťte sa na https://www.torproject.org/\;>stránku Tor pre viac informácií o 
tom, ako bezpečne používať Tor. Teraz môžete voľne a anonymne surfovať 
po Internete."
 
 msgid "There is a security update available for Tor Browser."
-msgstr ""
+msgstr "Je dostupná bezpečnostná aktualizácia pre prehliadač Tor."
 
 msgid ""
 "https://www.torproject.org/download/download-easy.html\;>Click "
@@ -94,10 +95,10 @@ msgid "JavaScript is disabled."
 msgstr "JavaScript je vypnutý."
 
 msgid "However, it does not appear to be Tor Browser."
-msgstr ""
+msgstr "Bohužiaľ, toto sa nezdá byť Tor Browser."
 
 msgid "Run a Relay"
-msgstr ""
+msgstr "Spustite prenos"
 
 msgid "Stay Anonymous"
-msgstr ""
+msgstr "Zostaňte v anonymite"

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

[tor-commits] [stem/master] Recognize listeners with IPv6 addresses

2016-07-13 Thread atagar 
commit 0bc8b8c8d76f301de50b71141836fc654348cbe5
Author: Damian Johnson 
Date:   Wed Jul 13 10:01:30 2016 -0700

Recognize listeners with IPv6 addresses

Oops, Stem only recognized IPv4 listener addresses. As a result nyx showed
'Relaying Disabled' even if you had an IPv6 ORPort. Caught by dgoulet.
---
 docs/change_log.rst |  1 +
 stem/control.py | 12 +++-
 stem/util/__init__.py   |  2 +-
 test/unit/control/controller.py |  9 +
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/docs/change_log.rst b/docs/change_log.rst
index 1713360..12764e8 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -56,6 +56,7 @@ The following are only available within Stem's `git repository
   * Added :func:`~stem.control.Controller.is_user_traffic_allowed` to the 
:class:`~stem.control.Controller`
   * Added the replica attribute to the 
:class:`~stem.response.events.HSDescEvent` (:spec:`4989e73`)
   * Added the NoEdConsensus :data:`~stem.Flag` (:spec:`dc99160`)
+  * Recognize listeners with IPv6 addresses in 
:func:`~stem.control.Controller.get_listeners`
   * :func:`~stem.process.launch_tor` could leave a lingering process during an 
unexpected exception (:trac:`17946`)
   * IPv6 addresses could trigger errors in 
:func:`~stem.control.Controller.get_listeners`, 
:class:`~stem.response.events.ORConnEvent`, and quite a few other things 
(:trac:`16174`)
   * Don't obscure stacktraces, most notably :class:`~stem.control.Controller` 
getter methods with default values
diff --git a/stem/control.py b/stem/control.py
index 9101cc1..9b98758 100644
--- a/stem/control.py
+++ b/stem/control.py
@@ -1314,6 +1314,9 @@ class Controller(BaseController):
 
 .. versionadded:: 1.2.0
 
+.. versionchanged:: 1.5.0
+   Recognize listeners with IPv6 addresses.
+
 :param stem.control.Listener listener_type: connection type being handled
   by the listeners we return
 :param object default: response if the query fails
@@ -1347,6 +1350,9 @@ class Controller(BaseController):
 if addr == 'unix':
   continue
 
+if addr.startswith('[') and addr.endswith(']'):
+  addr = addr[1:-1]  # unbracket ipv6 address
+
 proxy_addrs.append((addr, port))
 except stem.InvalidArguments:
   # Tor version is old (pre-tor-0.2.2.26-beta), use get_conf() instead.
@@ -1378,6 +1384,10 @@ class Controller(BaseController):
   for listener in self.get_conf(listener_option, multiple = True):
 if ':' in listener:
   addr, port = listener.rsplit(':', 1)
+
+  if addr.startswith('[') and addr.endswith(']'):
+addr = addr[1:-1]  # unbracket ipv6 address
+
   proxy_addrs.append((addr, port))
 else:
   proxy_addrs.append((listener, port_value))
@@ -1385,7 +1395,7 @@ class Controller(BaseController):
 # validate that address/ports are valid, and convert ports to ints
 
 for addr, port in proxy_addrs:
-  if not stem.util.connection.is_valid_ipv4_address(addr):
+  if not stem.util.connection.is_valid_ipv4_address(addr) and not 
stem.util.connection.is_valid_ipv6_address(addr):
 raise stem.ProtocolError('Invalid address for a %s listener: %s' % 
(listener_type, addr))
   elif not stem.util.connection.is_valid_port(port):
 raise stem.ProtocolError('Invalid port for a %s listener: %s' % 
(listener_type, port))
diff --git a/stem/util/__init__.py b/stem/util/__init__.py
index fd5bfad..de3c0ea 100644
--- a/stem/util/__init__.py
+++ b/stem/util/__init__.py
@@ -58,7 +58,7 @@ def _hash_attr(obj, *attributes, **kwargs):
   :param class parent: parent object to include in the hash value
   """
 
-  my_hash = 0 if kwargs.get('parent') == None else 
kwargs.get('parent').__hash__(obj)
+  my_hash = 0 if kwargs.get('parent') is None else 
kwargs.get('parent').__hash__(obj)
 
   for attr in attributes:
 my_hash *= 1024
diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py
index b9870ae..fedb86a 100644
--- a/test/unit/control/controller.py
+++ b/test/unit/control/controller.py
@@ -180,6 +180,15 @@ class TestControl(unittest.TestCase):
 
 self.assertEqual([1112, 1114], self.controller.get_ports(Listener.CONTROL))
 
+# IPv6 address
+
+get_info_mock.return_value = '"0.0.0.0:9001" 
"[fe80::::0202:b3ff:fe1e:8329]:9001"'
+
+self.assertEqual(
+  [('0.0.0.0', 9001), ('fe80::::0202:b3ff:fe1e:8329', 9001)],
+  self.controller.get_listeners(Listener.CONTROL)
+)
+
 # unix socket file
 
 get_info_mock.return_value = '"unix:/tmp/tor/socket"'

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

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

2016-07-13 Thread translation 
commit b56487a8159a56ce5a9659da9a41316a4d143847
Author: Translation commit bot 
Date:   Wed Jul 13 16:46:39 2016 +

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

diff --git a/sk_SK/torbutton.properties b/sk_SK/torbutton.properties
index 71dd348..0c7a42b 100644
--- a/sk_SK/torbutton.properties
+++ b/sk_SK/torbutton.properties
@@ -1,8 +1,8 @@
 torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = neznáma IP
-torbutton.circuit_display.onion_site = Onion site
+torbutton.circuit_display.onion_site = Onion stránka
 torbutton.circuit_display.this_browser = Tento prehliadač
-torbutton.circuit_display.relay = relay
+torbutton.circuit_display.relay = prenos
 torbutton.circuit_display.tor_bridge = Most
 torbutton.circuit_display.unknown_country = Neznáma krajina
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make 
the width and height of your window less distinctive, and thus reduces the 
ability of people to track you online.
@@ -34,7 +34,7 @@ torbutton.popup.short_torbrowser = Dôležité Torbutton 
informácie!\n\nTorbutt
 
 torbutton.popup.confirm_plugins = Prípojné moduly, napr. Flash, môžu 
narušiť vaše súkromie a anonymitu.\n\nDokážu tiež obísť Tor a odhaliť 
vašu fyzickú polohu a IP adresu.\n\nSkutočne si prajete povoliť prípojné 
moduly?\n
 torbutton.popup.never_ask_again = Už sa viac nepýtať
-torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. 
All website sessions will be lost.\n\nRestart Tor Browser now to reset your 
identity?\n\n
+torbutton.popup.confirm_newnym = Prehliadač Tor zatvorí všetky okná a 
karty. Všetky dáta z prehliadania budú stratené.\n\nReštartovať Tor teraz 
a zmeniť Vašu identitu?\n\n
 
 torbutton.slider_notification = The green onion menu now has a security slider 
which lets you adjust your security level. Check it out!
 torbutton.slider_notification_button = Open security settings
@@ -42,7 +42,7 @@ torbutton.slider_notification_button = Open security settings
 torbutton.maximize_warning = Maximizing Tor Browser can allow websites to 
determine your monitor size, which can be used to track you. We recommend that 
you leave Tor Browser windows in their original default size.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image 
data, which may be used to uniquely identify your computer.\n\nShould Tor 
Browser allow this website to extract HTML5 canvas image data?
+canvas.siteprompt=Táto webová stránka (%S) sa pokúsila získať dáta z 
obrázkov HTML 5 canvas, ktoré môžu byť použité na identifikovanie 
Vášho počítača.\n\nMá prehliadač Tor povoliť, aby táto stránka 
získala dáta z obrázkov HTML5 canvas?
 canvas.notNow=Nie teraz
 canvas.notNowAccessKey=N
 canvas.allow=Povoliť v budúcnosti
@@ -52,8 +52,8 @@ canvas.neverAccessKey=e
 
 # Profile/startup error messages. Strings are kept here for ease of 
translation.
 # LOCALIZATION NOTE: %S is the application name.
-profileProblemTitle=%S Profile Problem
-profileReadOnly=You cannot run %S from a read-only file system.  Please copy 
%S to another location before trying to use it.
-profileReadOnlyMac=You cannot run %S from a read-only file system.  Please 
copy %S to your Desktop or Applications folder before trying to use it.
+profileProblemTitle=Problém s profilom %S
+profileReadOnly=Nemôžete spustiť %S zo súborového systému s oprávnením 
len na čítanie. Prosím skopírujte %S pred použitím na iné miesto.
+profileReadOnlyMac=Nemôžete spustiť %S zo súborového systému s 
oprávnením len na čítanie. Prosím skopírujte %S pred použitím na plochu 
alebo do priečinka s aplikáciami.
 profileAccessDenied=%S does not have permission to access the profile. Please 
adjust your file system permissions and try again.
 profileMigrationFailed=Migration of your existing %S profile failed.\nNew 
settings will be used.

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

[tor-commits] [collector/master] Tests now point at empty temporary 'in' directory. This prevents lengthy import operations that appear as a hanging test.

2016-07-13 Thread karsten 
commit 4b79249fefa73a89dfeda3ed5793905ddc6d7a8a
Author: iwakeh 
Date:   Wed Jul 13 16:18:07 2016 +0200

Tests now point at empty temporary 'in' directory.  This prevents lengthy 
import operations that appear as a hanging test.
---
 src/test/java/org/torproject/collector/MainTest.java | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/torproject/collector/MainTest.java 
b/src/test/java/org/torproject/collector/MainTest.java
index 55b0569..a948070 100644
--- a/src/test/java/org/torproject/collector/MainTest.java
+++ b/src/test/java/org/torproject/collector/MainTest.java
@@ -57,12 +57,17 @@ public class MainTest {
   private void changeLockFilePath(File f, File l) throws Exception {
 List lines = Files.readAllLines(f.toPath());
 BufferedWriter bw = Files.newBufferedWriter(f.toPath());
+File in = tmpf.newFolder();
 File out = tmpf.newFolder();
+String inStr = "in/";
+String outStr = "out/";
 for(String line : lines) {
   if (line.contains(Key.LockFilePath.name())) {
 line = Key.LockFilePath.name() + " = " + l.toString();
-  } else if (line.contains("out")) {
-line = line.replace("out", out.toString() + "out");
+  } else if (line.contains(inStr)) {
+line = line.replace(inStr, in.toString() + inStr);
+  } else if (line.contains(outStr)) {
+line = line.replace(outStr, out.toString() + outStr);
   }
   bw.write(line);
   bw.newLine();

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

[tor-commits] [webwml/master] make torproject.org/PT shortlink for PT page

2016-07-13 Thread sebastian 
commit d313e03608f86a0a37dc2dea599a09f8f6280250
Author: Nima Fatemi 
Date:   Wed Jul 6 16:34:48 2016 +

make torproject.org/PT shortlink for PT page
---
 .htaccess | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.htaccess b/.htaccess
index bf6a3dc..b85f8ee 100644
--- a/.htaccess
+++ b/.htaccess
@@ -30,6 +30,9 @@ RewriteRule ^press/index.html(.*) /press/press.html$1 
[R=301,L]
 # Projects
 RewriteRule ^projects/$ /projects/projects [R=301,L]
 
+#Pluggable Transports
+RewriteRule ^PT/$ /docs/pluggable-transports [R=301,L]
+
 # GetInvolved
 RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L]
 RewriteRule ^volunteer(.*) /getinvolved/volunteer$1 [R=301,L]



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

[tor-commits] [webwml/master] add breaks after h3 titles

2016-07-13 Thread sebastian 
commit 0a66410984ea6b81b4895610bb19b674dc57176e
Author: Nima Fatemi 
Date:   Wed Jul 6 21:58:41 2016 +

add breaks after h3 titles
---
 docs/en/pluggable-transports.wml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml
index d3eb16c..8c55572 100644
--- a/docs/en/pluggable-transports.wml
+++ b/docs/en/pluggable-transports.wml
@@ -91,7 +91,7 @@ transport API, to make it easier to build interoperable 
programs.
   
 
   Deprecated PTs; Removed from Tor Browser
-
+  
   
 
 Obfsproxy is a 
Python framework for implementing new
@@ -119,6 +119,7 @@ transport API, to make it easier to build interoperable 
programs.
   
 
   Undeployed PTs
+  
   
   
 

___
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

2016-07-13 Thread translation 
commit 3187e08b430a1aac6e8c9c673b953082bee1d113
Author: Translation commit bot 
Date:   Wed Jul 13 14:46:43 2016 +

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

diff --git a/sk_SK/torbutton.dtd b/sk_SK/torbutton.dtd
index 4f47519..83bc681 100644
--- a/sk_SK/torbutton.dtd
+++ b/sk_SK/torbutton.dtd
@@ -73,11 +73,11 @@
 
 
 
-
-
+
+
 
 
 
 
-
+
 

___
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

2016-07-13 Thread translation 
commit b28633f4495b3f78a1148923aa5e35c7e32a40b4
Author: Translation commit bot 
Date:   Wed Jul 13 14:16:54 2016 +

Update translations for torbutton-torbuttondtd
---
 sk_SK/torbutton.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sk_SK/torbutton.dtd b/sk_SK/torbutton.dtd
index d10be32..4f47519 100644
--- a/sk_SK/torbutton.dtd
+++ b/sk_SK/torbutton.dtd
@@ -69,7 +69,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.2.8] Merge remote-tracking branch 'Jigsaw52/seccomp-fix-18397' into maint-0.2.8

2016-07-13 Thread nickm 
commit bb731ca665672c97aec7451921688381a2c8e9cb
Merge: a931d15 20e89453
Author: Nick Mathewson 
Date:   Wed Jul 13 09:16:59 2016 -0400

Merge remote-tracking branch 'Jigsaw52/seccomp-fix-18397' into maint-0.2.8

 src/common/sandbox.c | 20 
 1 file changed, 20 insertions(+)

diff --cc src/common/sandbox.c
index 70c5bbd,b194c24..c0b994b
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@@ -207,11 -207,10 +207,15 @@@ static int filter_nopar_gen[] = 
  // getaddrinfo uses this..
  SCMP_SYS(stat64),
  #endif
 +
 +#ifdef __NR_getrandom
 +SCMP_SYS(getrandom),
 +#endif
 +
+ #ifdef __NR_sysinfo
+ // qsort uses this..
+ SCMP_SYS(sysinfo),
+ #endif
  /*
   * These socket syscalls are not required on x86_64 and not supported with
   * some libseccomp versions (eg: 1.0.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.2.8] Adds missing syscalls to seccomp filter.

2016-07-13 Thread nickm 
commit 20e89453fde13ef154b69674255b905dc2b85fd7
Author: Daniel Pinto 
Date:   Sat Jul 9 00:36:37 2016 +0100

Adds missing syscalls to seccomp filter.

Fixes #18397 which prevented tor starting with Sandbox 1.
---
 src/common/sandbox.c | 21 -
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index bcbb3ce..b194c24 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -207,7 +207,10 @@ static int filter_nopar_gen[] = {
 // getaddrinfo uses this..
 SCMP_SYS(stat64),
 #endif
-
+#ifdef __NR_sysinfo
+// qsort uses this..
+SCMP_SYS(sysinfo),
+#endif
 /*
  * These socket syscalls are not required on x86_64 and not supported with
  * some libseccomp versions (eg: 1.0.1)
@@ -646,6 +649,14 @@ sb_setsockopt(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
   if (rc)
 return rc;
 
+#ifdef HAVE_SYSTEMD
+  rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(setsockopt),
+  SCMP_CMP(1, SCMP_CMP_EQ, SOL_SOCKET),
+  SCMP_CMP(2, SCMP_CMP_EQ, SO_SNDBUFFORCE));
+  if (rc)
+return rc;
+#endif
+
 #ifdef IP_TRANSPARENT
   rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(setsockopt),
   SCMP_CMP(1, SCMP_CMP_EQ, SOL_IP),
@@ -679,6 +690,14 @@ sb_getsockopt(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
   if (rc)
 return rc;
 
+#ifdef HAVE_SYSTEMD
+  rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getsockopt),
+  SCMP_CMP(1, SCMP_CMP_EQ, SOL_SOCKET),
+  SCMP_CMP(2, SCMP_CMP_EQ, SO_SNDBUF));
+  if (rc)
+return rc;
+#endif
+
 #ifdef HAVE_LINUX_NETFILTER_IPV4_H
   rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getsockopt),
   SCMP_CMP(1, SCMP_CMP_EQ, SOL_IP),



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

[tor-commits] [tor/release-0.2.8] changes file for bug18397

2016-07-13 Thread nickm 
commit c1bfa65211257e5efb89c5ebc534339d52fa77c4
Author: Nick Mathewson 
Date:   Wed Jul 13 09:19:23 2016 -0400

changes file for bug18397
---
 changes/bug18397 | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/changes/bug18397 b/changes/bug18397
new file mode 100644
index 000..53993da
--- /dev/null
+++ b/changes/bug18397
@@ -0,0 +1,7 @@
+  o Minor bugfixes (Linux seccomp2 sandbox):
+- Add a few missing syscalls to the seccomp2 sandbox: sysinfo,
+  getsockopt(SO_SNDBUF), and setsockopt(SO_SNDBUFFORCE). On
+  some systems, these are required for Tor to start with
+  "Sandbox 1" enabled.
+  Fixes bug 18397; bugfix on 0.2.5.1-alpha. Patch from
+  Daniel Pinto.



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

[tor-commits] [tor/master] changes file for bug18397

2016-07-13 Thread nickm 
commit c1bfa65211257e5efb89c5ebc534339d52fa77c4
Author: Nick Mathewson 
Date:   Wed Jul 13 09:19:23 2016 -0400

changes file for bug18397
---
 changes/bug18397 | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/changes/bug18397 b/changes/bug18397
new file mode 100644
index 000..53993da
--- /dev/null
+++ b/changes/bug18397
@@ -0,0 +1,7 @@
+  o Minor bugfixes (Linux seccomp2 sandbox):
+- Add a few missing syscalls to the seccomp2 sandbox: sysinfo,
+  getsockopt(SO_SNDBUF), and setsockopt(SO_SNDBUFFORCE). On
+  some systems, these are required for Tor to start with
+  "Sandbox 1" enabled.
+  Fixes bug 18397; bugfix on 0.2.5.1-alpha. Patch from
+  Daniel Pinto.



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

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

2016-07-13 Thread nickm 
commit 449c61f452db7a0736a0654ce3290ce0ea76cd40
Merge: 35a5a1b c1bfa65
Author: Nick Mathewson 
Date:   Wed Jul 13 09:19:29 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug18397 |  7 +++
 src/common/sandbox.c | 20 
 2 files changed, 27 insertions(+)

___
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 'Jigsaw52/seccomp-fix-18397' into maint-0.2.8

2016-07-13 Thread nickm 
commit bb731ca665672c97aec7451921688381a2c8e9cb
Merge: a931d15 20e89453
Author: Nick Mathewson 
Date:   Wed Jul 13 09:16:59 2016 -0400

Merge remote-tracking branch 'Jigsaw52/seccomp-fix-18397' into maint-0.2.8

 src/common/sandbox.c | 20 
 1 file changed, 20 insertions(+)

diff --cc src/common/sandbox.c
index 70c5bbd,b194c24..c0b994b
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@@ -207,11 -207,10 +207,15 @@@ static int filter_nopar_gen[] = 
  // getaddrinfo uses this..
  SCMP_SYS(stat64),
  #endif
 +
 +#ifdef __NR_getrandom
 +SCMP_SYS(getrandom),
 +#endif
 +
+ #ifdef __NR_sysinfo
+ // qsort uses this..
+ SCMP_SYS(sysinfo),
+ #endif
  /*
   * These socket syscalls are not required on x86_64 and not supported with
   * some libseccomp versions (eg: 1.0.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 'maint-0.2.8'

2016-07-13 Thread nickm 
commit 9932544297e02dc4f79d70317f214bcbb2dd8e9a
Merge: 3ac4341 c1bfa65
Author: Nick Mathewson 
Date:   Wed Jul 13 09:19:35 2016 -0400

Merge branch 'maint-0.2.8'

 changes/bug18397 |  7 +++
 src/common/sandbox.c | 20 
 2 files changed, 27 insertions(+)

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

[tor-commits] [tor/maint-0.2.8] Adds missing syscalls to seccomp filter.

2016-07-13 Thread nickm 
commit 20e89453fde13ef154b69674255b905dc2b85fd7
Author: Daniel Pinto 
Date:   Sat Jul 9 00:36:37 2016 +0100

Adds missing syscalls to seccomp filter.

Fixes #18397 which prevented tor starting with Sandbox 1.
---
 src/common/sandbox.c | 21 -
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index bcbb3ce..b194c24 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -207,7 +207,10 @@ static int filter_nopar_gen[] = {
 // getaddrinfo uses this..
 SCMP_SYS(stat64),
 #endif
-
+#ifdef __NR_sysinfo
+// qsort uses this..
+SCMP_SYS(sysinfo),
+#endif
 /*
  * These socket syscalls are not required on x86_64 and not supported with
  * some libseccomp versions (eg: 1.0.1)
@@ -646,6 +649,14 @@ sb_setsockopt(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
   if (rc)
 return rc;
 
+#ifdef HAVE_SYSTEMD
+  rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(setsockopt),
+  SCMP_CMP(1, SCMP_CMP_EQ, SOL_SOCKET),
+  SCMP_CMP(2, SCMP_CMP_EQ, SO_SNDBUFFORCE));
+  if (rc)
+return rc;
+#endif
+
 #ifdef IP_TRANSPARENT
   rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(setsockopt),
   SCMP_CMP(1, SCMP_CMP_EQ, SOL_IP),
@@ -679,6 +690,14 @@ sb_getsockopt(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
   if (rc)
 return rc;
 
+#ifdef HAVE_SYSTEMD
+  rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getsockopt),
+  SCMP_CMP(1, SCMP_CMP_EQ, SOL_SOCKET),
+  SCMP_CMP(2, SCMP_CMP_EQ, SO_SNDBUF));
+  if (rc)
+return rc;
+#endif
+
 #ifdef HAVE_LINUX_NETFILTER_IPV4_H
   rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getsockopt),
   SCMP_CMP(1, SCMP_CMP_EQ, SOL_IP),



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

[tor-commits] [tor/master] Adds missing syscalls to seccomp filter.

2016-07-13 Thread nickm 
commit 20e89453fde13ef154b69674255b905dc2b85fd7
Author: Daniel Pinto 
Date:   Sat Jul 9 00:36:37 2016 +0100

Adds missing syscalls to seccomp filter.

Fixes #18397 which prevented tor starting with Sandbox 1.
---
 src/common/sandbox.c | 21 -
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index bcbb3ce..b194c24 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -207,7 +207,10 @@ static int filter_nopar_gen[] = {
 // getaddrinfo uses this..
 SCMP_SYS(stat64),
 #endif
-
+#ifdef __NR_sysinfo
+// qsort uses this..
+SCMP_SYS(sysinfo),
+#endif
 /*
  * These socket syscalls are not required on x86_64 and not supported with
  * some libseccomp versions (eg: 1.0.1)
@@ -646,6 +649,14 @@ sb_setsockopt(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
   if (rc)
 return rc;
 
+#ifdef HAVE_SYSTEMD
+  rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(setsockopt),
+  SCMP_CMP(1, SCMP_CMP_EQ, SOL_SOCKET),
+  SCMP_CMP(2, SCMP_CMP_EQ, SO_SNDBUFFORCE));
+  if (rc)
+return rc;
+#endif
+
 #ifdef IP_TRANSPARENT
   rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(setsockopt),
   SCMP_CMP(1, SCMP_CMP_EQ, SOL_IP),
@@ -679,6 +690,14 @@ sb_getsockopt(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
   if (rc)
 return rc;
 
+#ifdef HAVE_SYSTEMD
+  rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getsockopt),
+  SCMP_CMP(1, SCMP_CMP_EQ, SOL_SOCKET),
+  SCMP_CMP(2, SCMP_CMP_EQ, SO_SNDBUF));
+  if (rc)
+return rc;
+#endif
+
 #ifdef HAVE_LINUX_NETFILTER_IPV4_H
   rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getsockopt),
   SCMP_CMP(1, SCMP_CMP_EQ, SOL_IP),



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

[tor-commits] [tor/maint-0.2.8] Merge remote-tracking branch 'Jigsaw52/seccomp-fix-18397' into maint-0.2.8

2016-07-13 Thread nickm 
commit bb731ca665672c97aec7451921688381a2c8e9cb
Merge: a931d15 20e89453
Author: Nick Mathewson 
Date:   Wed Jul 13 09:16:59 2016 -0400

Merge remote-tracking branch 'Jigsaw52/seccomp-fix-18397' into maint-0.2.8

 src/common/sandbox.c | 20 
 1 file changed, 20 insertions(+)

diff --cc src/common/sandbox.c
index 70c5bbd,b194c24..c0b994b
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@@ -207,11 -207,10 +207,15 @@@ static int filter_nopar_gen[] = 
  // getaddrinfo uses this..
  SCMP_SYS(stat64),
  #endif
 +
 +#ifdef __NR_getrandom
 +SCMP_SYS(getrandom),
 +#endif
 +
+ #ifdef __NR_sysinfo
+ // qsort uses this..
+ SCMP_SYS(sysinfo),
+ #endif
  /*
   * These socket syscalls are not required on x86_64 and not supported with
   * some libseccomp versions (eg: 1.0.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.2.8] changes file for bug18397

2016-07-13 Thread nickm 
commit c1bfa65211257e5efb89c5ebc534339d52fa77c4
Author: Nick Mathewson 
Date:   Wed Jul 13 09:19:23 2016 -0400

changes file for bug18397
---
 changes/bug18397 | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/changes/bug18397 b/changes/bug18397
new file mode 100644
index 000..53993da
--- /dev/null
+++ b/changes/bug18397
@@ -0,0 +1,7 @@
+  o Minor bugfixes (Linux seccomp2 sandbox):
+- Add a few missing syscalls to the seccomp2 sandbox: sysinfo,
+  getsockopt(SO_SNDBUF), and setsockopt(SO_SNDBUFFORCE). On
+  some systems, these are required for Tor to start with
+  "Sandbox 1" enabled.
+  Fixes bug 18397; bugfix on 0.2.5.1-alpha. Patch from
+  Daniel Pinto.

___
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

2016-07-13 Thread translation 
commit 6662f50b2ba35caf6b354b83e6ef462368ca143f
Author: Translation commit bot 
Date:   Wed Jul 13 12:46:42 2016 +

Update translations for torbutton-torbuttondtd
---
 sk_SK/torbutton.dtd | 24 
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/sk_SK/torbutton.dtd b/sk_SK/torbutton.dtd
index d468f07..d10be32 100644
--- a/sk_SK/torbutton.dtd
+++ b/sk_SK/torbutton.dtd
@@ -52,23 +52,23 @@
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 
-
-
+
+
 
 
-
-
+
+
 
-
+
 
-
+
 
 
 

___
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

2016-07-13 Thread translation 
commit 8fa266d6f50bd073965317f4ca6e18c984dd5f7d
Author: Translation commit bot 
Date:   Wed Jul 13 12:16:41 2016 +

Update translations for torbutton-torbuttondtd
---
 sk_SK/torbutton.dtd | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sk_SK/torbutton.dtd b/sk_SK/torbutton.dtd
index c1e63e9..d468f07 100644
--- a/sk_SK/torbutton.dtd
+++ b/sk_SK/torbutton.dtd
@@ -16,16 +16,16 @@
 
 
 
-
+
 
-
+
 
-
+
 
-
+
 
 
-
+
 
 
 
@@ -49,9 +49,9 @@
 
 
 
-
-
-
+
+
+
 
 
 

___
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

2016-07-13 Thread translation 
commit 796edf9905ca915586e8137600522b3563659159
Author: Translation commit bot 
Date:   Wed Jul 13 11:47:14 2016 +

Update translations for torbutton-abouttorproperties
---
 sk_SK/abouttor.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sk_SK/abouttor.properties b/sk_SK/abouttor.properties
index 1cf7d6c..d3a1f75 100644
--- a/sk_SK/abouttor.properties
+++ b/sk_SK/abouttor.properties
@@ -8,13 +8,13 @@ 
aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchSP.search.link=https://startpage.com/
 
-aboutTor.searchDDG.privacy=Search securely with DuckDuckGo.
+aboutTor.searchDDG.privacy=Vyhľadávanie bezpečne s DuckDuckGo.
 # The following string is a link which replaces %1$S above.
 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.searchDC.privacy=Search securely with Disconnect.me.
+aboutTor.searchDC.privacy=Vyhľadávanie bezpečne s Disconnect.me.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
 # The following string is a link which replaces %2$S above.

___
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

2016-07-13 Thread translation 
commit 75e80c6d8db76e62b2ef9abe6db2dba2e5634a0d
Author: Translation commit bot 
Date:   Wed Jul 13 11:47:17 2016 +

Update translations for torbutton-abouttorproperties_completed
---
 sk_SK/abouttor.properties | 21 +
 1 file changed, 21 insertions(+)

diff --git a/sk_SK/abouttor.properties b/sk_SK/abouttor.properties
new file mode 100644
index 000..d3a1f75
--- /dev/null
+++ b/sk_SK/abouttor.properties
@@ -0,0 +1,21 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Vyhľadávanie bezpečne s Úvodná stránka.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Vyhľadávanie bezpečne s DuckDuckGo.
+# The following string is a link which replaces %1$S above.
+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.searchDC.privacy=Vyhľadávanie bezpečne s Disconnect.me.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/

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

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

2016-07-13 Thread translation 
commit 23de86bb66319513a30088a373a4a5fdfe9e3284
Author: Translation commit bot 
Date:   Wed Jul 13 11:46:38 2016 +

Update translations for torbutton-branddtd_completed
---
 sk_SK/brand.dtd | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/sk_SK/brand.dtd b/sk_SK/brand.dtd
index f7c5318..b4a97c5 100644
--- a/sk_SK/brand.dtd
+++ b/sk_SK/brand.dtd
@@ -2,7 +2,14 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
+
 
 
 
 
+
+
+
+
+
+

___
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

2016-07-13 Thread translation 
commit 1a9e30bddab2eeaded95e83cfed18c2d107b1692
Author: Translation commit bot 
Date:   Wed Jul 13 11:46:45 2016 +

Update translations for torbutton-torbuttondtd
---
 sk_SK/torbutton.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sk_SK/torbutton.dtd b/sk_SK/torbutton.dtd
index 4428d6a..c1e63e9 100644
--- a/sk_SK/torbutton.dtd
+++ b/sk_SK/torbutton.dtd
@@ -14,7 +14,7 @@
 
 
 
-
+
 
 
 

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

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

2016-07-13 Thread translation 
commit c54e6ea25e1180e24e46365f99d66151a97ac71d
Author: Translation commit bot 
Date:   Wed Jul 13 11:46:32 2016 +

Update translations for torbutton-branddtd
---
 sk_SK/brand.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sk_SK/brand.dtd b/sk_SK/brand.dtd
index abf851f..b4a97c5 100644
--- a/sk_SK/brand.dtd
+++ b/sk_SK/brand.dtd
@@ -9,7 +9,7 @@
 
 
 
-
-
-
-
+
+
+
+

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

[tor-commits] [tor-launcher/master] Bug 19568: Set CurProcD for Thunderbird/Instantbird

2016-07-13 Thread gk 
commit 44c1cc246e8736e88906c74058f2c582aa6178ed
Author: Sukhbir Singh 
Date:   Mon Jul 4 11:59:34 2016 -0400

Bug 19568: Set CurProcD for Thunderbird/Instantbird

For Thunderbird/Instantbird, the CurProcD (topDir) is not browser/,
so we need to iterate one level less than Firefox.
---
 src/components/tl-process.js | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/src/components/tl-process.js b/src/components/tl-process.js
index 4f9928a..8e42feb 100644
--- a/src/components/tl-process.js
+++ b/src/components/tl-process.js
@@ -31,6 +31,8 @@ TorProcessService.prototype =
 {
   kContractID : "@torproject.org/torlauncher-process-service;1",
   kServiceName : "Tor Launcher Process Service",
+  kThunderbirdID: "{3550f703-e582-4d05-9a08-453d09bdfdc6}",
+  kInstantbirdID: "{33cb9019-c295-46dd-be21-8c4936574bee}",
   kClassID: Components.ID("{FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1}"),
   kTorLauncherExtPath: "tor-launc...@torproject.org", // This could vary.
 
@@ -873,6 +875,14 @@ TorProcessService.prototype =
   // Because topDir points to Contents/Resources/browser on Mac OS,
   // we need to go up 3 levels.
   let tbbBrowserDepth = (TorLauncherUtil.isMac) ? 3 : 1;
+  if ((appInfo.ID == this.kThunderbirdID) ||
+  (appInfo.ID == this.kInstantbirdID))
+  {
+// On Thunderbird/Instantbird, the topDir is the root dir and not
+// browser/, so we need to iterate one level less than Firefox.
+--tbbBrowserDepth;
+  }
+
   while (tbbBrowserDepth > 0)
   {
 let didRemove = (topDir.leafName != ".");

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

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

2016-07-13 Thread translation 
commit d945b2854a2fee5bbf583268a9ee65cef6484f88
Author: Translation commit bot 
Date:   Wed Jul 13 11:18:45 2016 +

Update translations for torbutton-abouttbupdatedtd
---
 sk_SK/abouttbupdate.dtd | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sk_SK/abouttbupdate.dtd b/sk_SK/abouttbupdate.dtd
index 37567bd..ee5dd22 100644
--- a/sk_SK/abouttbupdate.dtd
+++ b/sk_SK/abouttbupdate.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-abouttbupdatedtd_completed] Update translations for torbutton-abouttbupdatedtd_completed

2016-07-13 Thread translation 
commit 87013270bbc93e1080a7ec069e013b540640e78f
Author: Translation commit bot 
Date:   Wed Jul 13 11:18:49 2016 +

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

diff --git a/sk_SK/abouttbupdate.dtd b/sk_SK/abouttbupdate.dtd
new file mode 100644
index 000..ee5dd22
--- /dev/null
+++ b/sk_SK/abouttbupdate.dtd
@@ -0,0 +1,6 @@
+
+
+
+
+
+

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

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

2016-07-13 Thread translation 
commit ff5ce1cbfc2899ae0058dba6a9f5742b21119275
Author: Translation commit bot 
Date:   Wed Jul 13 11:16:28 2016 +

Update translations for abouttor-homepage
---
 sk_SK/aboutTor.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sk_SK/aboutTor.dtd b/sk_SK/aboutTor.dtd
index f08b78a..91673ef 100644
--- a/sk_SK/aboutTor.dtd
+++ b/sk_SK/aboutTor.dtd
@@ -6,14 +6,14 @@
 
 
 
-
+
 
-
+
 
 
 
-
-
+
+
 
 
 

___
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

2016-07-13 Thread translation 
commit 59cedf8c6dc451748b118a61aafac6c12013aed6
Author: Translation commit bot 
Date:   Wed Jul 13 11:17:17 2016 +

Update translations for torbutton-abouttorproperties
---
 sk_SK/abouttor.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sk_SK/abouttor.properties b/sk_SK/abouttor.properties
index d607324..1cf7d6c 100644
--- a/sk_SK/abouttor.properties
+++ b/sk_SK/abouttor.properties
@@ -2,7 +2,7 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Search securely with Startpage.
+aboutTor.searchSP.privacy=Vyhľadávanie bezpečne s Úvodná stránka.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
 # The following string is a link which replaces %2$S above.

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

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

2016-07-13 Thread translation 
commit 5e1fb0ee1ca1d703ea12e35ed04631df3aa6cf2e
Author: Translation commit bot 
Date:   Wed Jul 13 11:16:32 2016 +

Update translations for abouttor-homepage_completed
---
 sk_SK/aboutTor.dtd | 49 +
 1 file changed, 49 insertions(+)

diff --git a/sk_SK/aboutTor.dtd b/sk_SK/aboutTor.dtd
new file mode 100644
index 000..91673ef
--- /dev/null
+++ b/sk_SK/aboutTor.dtd
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+https://startpage.com/rth/search;>
+https://duckduckgo.com/html/;>
+https://search.disconnect.me/searchTerms/search?ses=Googlelocation_option=USsource=tor;>
+
+
+
+
+
+
+
+
+https://www.torproject.org/download/download.html.en#warning;>
+
+
+
+https://www.torproject.org/docs/tor-doc-relay.html.en;>
+
+https://www.torproject.org/getinvolved/volunteer.html.en;>
+
+https://www.torproject.org/donate/donate.html.en;>
+
+
+
+https://www.torproject.org/about/overview.html.en;>

___
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

2016-07-13 Thread translation 
commit d944c2694e634d1b5d43eb6e24588e6194a651b0
Author: Translation commit bot 
Date:   Wed Jul 13 11:15:58 2016 +

Update translations for torbirdy_completed
---
 sk_SK/torbirdy.dtd| 58 +++
 sk_SK/torbirdy.properties |  1 +
 2 files changed, 59 insertions(+)

diff --git a/sk_SK/torbirdy.dtd b/sk_SK/torbirdy.dtd
new file mode 100644
index 000..f2a791e
--- /dev/null
+++ b/sk_SK/torbirdy.dtd
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sk_SK/torbirdy.properties b/sk_SK/torbirdy.properties
index 18feaaa..370e91a 100644
--- a/sk_SK/torbirdy.properties
+++ b/sk_SK/torbirdy.properties
@@ -6,6 +6,7 @@ torbirdy.enabled.custom=TorBirdy zapnuté: Vlastná Proxy
 torbirdy.enabled.torification=TorBirdy zapnuté: Priehľadná torifikácia
 torbirdy.enabled.whonix=TorBirdy zapnuté: Whonix
 torbirdy.disabled=TorBirdy: Zakázané!
+torbirdy.enabled=TorBirdy: zapnuté
 
 torbirdy.email.prompt=TorBirdy zakázal sprievodcu auto-konfigurácie 
Thunderbird, aby ochránil vašu anonymitu.\n\nBoli zadané odporúčané 
bezpečnostné nastavenia pre %S.\n\nTeraz môžete manuálne nastaviť 
ostatné účty. 
 

___
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

2016-07-13 Thread translation 
commit 32b997bb1781d5bdf0c61c384a3a28e73ce2123d
Author: Translation commit bot 
Date:   Wed Jul 13 11:15:53 2016 +

Update translations for torbirdy
---
 sk_SK/torbirdy.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sk_SK/torbirdy.properties b/sk_SK/torbirdy.properties
index b80b44c..370e91a 100644
--- a/sk_SK/torbirdy.properties
+++ b/sk_SK/torbirdy.properties
@@ -6,7 +6,7 @@ torbirdy.enabled.custom=TorBirdy zapnuté: Vlastná Proxy
 torbirdy.enabled.torification=TorBirdy zapnuté: Priehľadná torifikácia
 torbirdy.enabled.whonix=TorBirdy zapnuté: Whonix
 torbirdy.disabled=TorBirdy: Zakázané!
-torbirdy.enabled=TorBirdy:Enabled
+torbirdy.enabled=TorBirdy: zapnuté
 
 torbirdy.email.prompt=TorBirdy zakázal sprievodcu auto-konfigurácie 
Thunderbird, aby ochránil vašu anonymitu.\n\nBoli zadané odporúčané 
bezpečnostné nastavenia pre %S.\n\nTeraz môžete manuálne nastaviť 
ostatné účty. 
 

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

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

2016-07-13 Thread translation 
commit eb19e04526f21a4d1f237d0968b949d4ee0c80d0
Author: Translation commit bot 
Date:   Wed Jul 13 10:45:39 2016 +

Update translations for tails-persistence-setup
---
 sk_SK/sk_SK.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po
index f381f5b..62e3d6c 100644
--- a/sk_SK/sk_SK.po
+++ b/sk_SK/sk_SK.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-05-25 02:27+0200\n"
-"PO-Revision-Date: 2016-07-13 10:15+\n"
+"PO-Revision-Date: 2016-07-13 10:17+\n"
 "Last-Translator: Dasa M \n"
 "Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/otf/torproject/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -301,17 +301,17 @@ msgstr "Ukladanie konfigurácií trvalého oddielu..."
 
 #: ../lib/Tails/Persistence/Step/Delete.pm:41
 msgid "Persistence wizard - Persistent volume deletion"
-msgstr ""
+msgstr "Sprievodca tvorbou trvalého oddielu - odstránenie trvalého oddielu"
 
 #: ../lib/Tails/Persistence/Step/Delete.pm:44
 msgid "Your persistent data will be deleted."
-msgstr ""
+msgstr "Vaše dáta na trvalom oddiely budú vymazané."
 
 #: ../lib/Tails/Persistence/Step/Delete.pm:48
 #, perl-format
 msgid ""
 "The persistent volume %s (%s), on the %s %s device, will be deleted."
-msgstr ""
+msgstr "Trvalý oddiel %s (%s), na zariadení %s %s bude vymazaný."
 
 #: ../lib/Tails/Persistence/Step/Delete.pm:54
 msgid "Delete"
@@ -323,4 +323,4 @@ msgstr "Vymazávanie..."
 
 #: ../lib/Tails/Persistence/Step/Delete.pm:114
 msgid "Deleting the persistent volume..."
-msgstr ""
+msgstr "Vymazávanie trvalého oddielu..."

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

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

2016-07-13 Thread translation 
commit 6a2dfd4446b3a3cdd1f768de703b1b103609b854
Author: Translation commit bot 
Date:   Wed Jul 13 10:45:43 2016 +

Update translations for tails-persistence-setup_completed
---
 sk_SK/sk_SK.po | 326 +
 1 file changed, 326 insertions(+)

diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po
new file mode 100644
index 000..62e3d6c
--- /dev/null
+++ b/sk_SK/sk_SK.po
@@ -0,0 +1,326 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Tails developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Dasa M , 2016
+# Marián Mižik , 2015
+# once, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: Tails developers \n"
+"POT-Creation-Date: 2016-05-25 02:27+0200\n"
+"PO-Revision-Date: 2016-07-13 10:17+\n"
+"Last-Translator: Dasa M \n"
+"Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/otf/torproject/language/sk_SK/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:48
+msgid "Personal Data"
+msgstr "Osobné údaje"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:50
+msgid "Keep files stored in the `Persistent' directory"
+msgstr "Ponechať súbory uložené v 'Perzistentnom' priečinku"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:58
+msgid "GnuPG"
+msgstr "GnuPG"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:60
+msgid "GnuPG keyrings and configuration"
+msgstr "GnuPG kľúčenky a nastavenia"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:68
+msgid "SSH Client"
+msgstr "SSH klient"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:70
+msgid "SSH keys, configuration and known hosts"
+msgstr "SSH kľúče, nastavenia a známi hostitelia"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:78
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:80
+msgid "Pidgin profiles and OTR keyring"
+msgstr "Pidgin profily a OTR kľúčenka"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:88
+msgid "Icedove"
+msgstr "Icedove"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:90
+msgid "Icedove profiles and locally stored email"
+msgstr "Profily Icedove a lokálne uložené emaily"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:98
+msgid "GNOME Keyring"
+msgstr "GNOME kľúčenka"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:100
+msgid "Secrets stored by GNOME Keyring"
+msgstr "Tajomstvá uložené GNOME kľúčenkou"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:108
+msgid "Network Connections"
+msgstr "Sieťové pripojenia"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:110
+msgid "Configuration of network devices and connections"
+msgstr "Konfigurácia sieťových zariadení a pripojení"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:118
+msgid "Browser bookmarks"
+msgstr "Záložky prehliadača"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:120
+msgid "Bookmarks saved in the Tor Browser"
+msgstr "Záložky uložené v prehliadači Tor"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:128
+msgid "Printers"
+msgstr "Tlačiarne"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:130
+msgid "Printers configuration"
+msgstr "Nastavenia tlačiarní"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:138
+msgid "Bitcoin client"
+msgstr "Bitcoin klient"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:140
+msgid "Electrum's bitcoin wallet and configuration"
+msgstr "Electrum bitcoin peňaženka a konfigurácia"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:148
+msgid "APT Packages"
+msgstr "Balíčky APT"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:150
+msgid "Packages downloaded by APT"
+msgstr "Balíčky prevzaté cez APT"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:158
+msgid "APT Lists"
+msgstr "APT zoznamy"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:160
+msgid "Lists downloaded by APT"
+msgstr "Zoznamy prevzaté cez APT"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:168
+msgid "Dotfiles"
+msgstr "Dotfiles"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:170
+msgid ""
+"Symlink into $HOME every file or directory found in the `dotfiles' directory"
+msgstr "Všetky súbory alebo priečinky, ktoré boli nájdené v priečinku 
`dotfiles', symbolicky prepojiť s $HOME."
+
+#: ../lib/Tails/Persistence/Setup.pm:230
+msgid "Setup Tails persistent volume"
+msgstr "Nastavenie trvalého oddielu pre Tails"
+
+#: ../lib/Tails/Persistence/Setup.pm:312 ../lib/Tails/Persistence/Setup.pm:459
+msgid "Error"
+msgstr "Chyba"
+
+#:

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

2016-07-13 Thread translation 
commit 424bc8bf72638de29c8dc3f02d42001d6b2a08cb
Author: Translation commit bot 
Date:   Wed Jul 13 10:15:39 2016 +

Update translations for tails-persistence-setup
---
 sk_SK/sk_SK.po | 46 +++---
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po
index 63237b9..f381f5b 100644
--- a/sk_SK/sk_SK.po
+++ b/sk_SK/sk_SK.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-05-25 02:27+0200\n"
-"PO-Revision-Date: 2016-07-13 09:38+\n"
+"PO-Revision-Date: 2016-07-13 10:15+\n"
 "Last-Translator: Dasa M \n"
 "Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/otf/torproject/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -164,7 +164,7 @@ msgstr "Trvalý oddiel nie je pripojený."
 
 #: ../lib/Tails/Persistence/Setup.pm:395
 msgid "Persistence volume is not readable. Permissions or ownership problems?"
-msgstr "Trvalý oddiel nie je čitateľný. Problém s povolením alebo 
vlasníckymi právami?"
+msgstr "Trvalý oddiel nie je čitateľný. Problém s oprávnením alebo 
vlasníckymi právami?"
 
 #: ../lib/Tails/Persistence/Setup.pm:400
 msgid "Persistence volume is not writable. Maybe it was mounted read-only?"
@@ -198,11 +198,11 @@ msgstr "Akékoľvek vykonané zmeny nadobudnú 
účinnosť až po reštartovaní
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:54
 msgid "Persistence wizard - Persistent volume creation"
-msgstr ""
+msgstr "Sprievodca tvorbou trvalého oddielu - Tvorba trvalého oddielu"
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:57
 msgid "Choose a passphrase to protect the persistent volume"
-msgstr ""
+msgstr "Zvoľte prístupové heslo kvôli ochrane trvalého oddielu."
 
 #. TRANSLATORS: size, device vendor, device model
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:61
@@ -210,11 +210,11 @@ msgstr ""
 msgid ""
 "A %s persistent volume will be created on the %s %s device. Data on "
 "this volume will be stored in an encrypted form protected by a passphrase."
-msgstr ""
+msgstr "Trvalý oddiel %s bude vytvorený na zariadení %s %s . Dáta 
na tomto oddiely budú uložené v šifrovanéj podobe chránenej prístupovým 
heslom."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:66
 msgid "Create"
-msgstr ""
+msgstr "Vytvoriť"
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:110
 msgid ""
@@ -222,7 +222,7 @@ msgid ""
 "understood. Tails can't help you if you use it wrong! See Tails"
 " documentation about persistence to learn more."
-msgstr ""
+msgstr "Pozor! Používanie trvalého oddielu má následky, ktorým 
musíte rozumieť. Tails Vám nemôže pomôcť, pokiaľ ho používate 
nesprávne! Pozri Dokumentácia
 Tails ku trvalému oddielu , ktorá Vám vysvetlí viac."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:144
 msgid "Passphrase:"
@@ -230,54 +230,54 @@ msgstr "Prístupové heslo:"
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:154
 msgid "Verify Passphrase:"
-msgstr ""
+msgstr "Overiť prístupové heslo:"
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:167
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:231
 msgid "Passphrase can't be empty"
-msgstr ""
+msgstr "Prístupové heslo nemôže byť prázdne"
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:222
 msgid "Passphrases do not match"
-msgstr ""
+msgstr "Prístupové heslá sa nezhodujú"
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:274
 #: ../lib/Tails/Persistence/Step/Configure.pm:129
 #: ../lib/Tails/Persistence/Step/Delete.pm:95
 msgid "Failed"
-msgstr ""
+msgstr "Zlyhanie"
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:283
 msgid "Mounting Tails persistence partition."
-msgstr ""
+msgstr "Pripájanie trvalého oddielu Tails."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:286
 msgid "The Tails persistence partition will be mounted."
-msgstr ""
+msgstr "Trvalý oddiel Tails bude pripojený."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:295
 msgid "Correcting permissions of the persistent volume."
-msgstr ""
+msgstr "Upravte oprávnenia na trvalom oddiely."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:298
 msgid "The permissions of the persistent volume will be corrected."
-msgstr ""
+msgstr "Oprávnenie na trvalom oddiely bude opravené."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:320
 msgid "Creating..."
-msgstr ""
+msgstr "Vytváranie..."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:323
 msgid "Creating the persistent volume..."
-msgstr ""
+msgstr "Bude vytvorený trvalý oddiel..."
 
 #: ../lib/Tails/Persistence/Step/Configure.pm:61
 msgid "Persistence wizard - Persistent volume configuration"
-msgstr ""
+msgstr "Sprievodca tvorbou trvalého oddielu - konfigurácia trvalého oddielu"
 
 #: ../lib/Tails/Persistence/Step/Configure.pm:64
 msgid "Specify the files that will be saved in the persistent volume"
-msgstr ""
+msgstr

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

2016-07-13 Thread translation 
commit 6d65292f8fcb9c38fcf212203f7245b9f20ce47f
Author: Translation commit bot 
Date:   Wed Jul 13 09:45:40 2016 +

Update translations for tails-persistence-setup
---
 sk_SK/sk_SK.po | 30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po
index b544d85..63237b9 100644
--- a/sk_SK/sk_SK.po
+++ b/sk_SK/sk_SK.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-05-25 02:27+0200\n"
-"PO-Revision-Date: 2016-07-12 20:57+\n"
+"PO-Revision-Date: 2016-07-13 09:38+\n"
 "Last-Translator: Dasa M \n"
 "Language-Team: Slovak (Slovakia) 
(http://www.transifex.com/otf/torproject/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -127,7 +127,7 @@ msgstr "Všetky súbory alebo priečinky, ktoré boli 
nájdené v priečinku `do
 
 #: ../lib/Tails/Persistence/Setup.pm:230
 msgid "Setup Tails persistent volume"
-msgstr ""
+msgstr "Nastavenie trvalého oddielu pre Tails"
 
 #: ../lib/Tails/Persistence/Setup.pm:312 ../lib/Tails/Persistence/Setup.pm:459
 msgid "Error"
@@ -136,65 +136,65 @@ msgstr "Chyba"
 #: ../lib/Tails/Persistence/Setup.pm:344
 #, perl-format
 msgid "Device %s already has a persistent volume."
-msgstr ""
+msgstr "Zariadenie %s už má trvalý oddiel."
 
 #: ../lib/Tails/Persistence/Setup.pm:352
 #, perl-format
 msgid "Device %s has not enough unallocated space."
-msgstr ""
+msgstr "Zariadenie %s nemá dostatok voľného miesta."
 
 #: ../lib/Tails/Persistence/Setup.pm:360 ../lib/Tails/Persistence/Setup.pm:374
 #, perl-format
 msgid "Device %s has no persistent volume."
-msgstr ""
+msgstr "Zariadenie %s nemá trvalý oddiel."
 
 #: ../lib/Tails/Persistence/Setup.pm:366
 msgid ""
 "Cannot delete the persistent volume while in use. You should restart Tails "
 "without persistence."
-msgstr ""
+msgstr "Nie je možné zmazať trvalý oddiel, kým sa používa. Mali by ste 
reštartovať Tails bez trvalého oddielu."
 
 #: ../lib/Tails/Persistence/Setup.pm:385
 msgid "Persistence volume is not unlocked."
-msgstr ""
+msgstr "Trvalý oddiele nie je odomknutý."
 
 #: ../lib/Tails/Persistence/Setup.pm:390
 msgid "Persistence volume is not mounted."
-msgstr ""
+msgstr "Trvalý oddiel nie je pripojený."
 
 #: ../lib/Tails/Persistence/Setup.pm:395
 msgid "Persistence volume is not readable. Permissions or ownership problems?"
-msgstr ""
+msgstr "Trvalý oddiel nie je čitateľný. Problém s povolením alebo 
vlasníckymi právami?"
 
 #: ../lib/Tails/Persistence/Setup.pm:400
 msgid "Persistence volume is not writable. Maybe it was mounted read-only?"
-msgstr ""
+msgstr "Na trvalý oddiel nie je možné zapisovať. Možno je pripojený len 
na čítanie?"
 
 #: ../lib/Tails/Persistence/Setup.pm:409
 #, perl-format
 msgid "Tails is running from non-USB / non-SDIO device %s."
-msgstr ""
+msgstr "Tail je spustený z iného ako USB / SDIO zariadenia %s."
 
 #: ../lib/Tails/Persistence/Setup.pm:415
 #, perl-format
 msgid "Device %s is optical."
-msgstr ""
+msgstr "Zariadenie %s je optické."
 
 #: ../lib/Tails/Persistence/Setup.pm:422
 #, perl-format
 msgid "Device %s was not created using Tails Installer."
-msgstr ""
+msgstr "Zariadenie %s nebolo vytvorené inštalátorom Tails."
 
 #: ../lib/Tails/Persistence/Setup.pm:668
 msgid "Persistence wizard - Finished"
-msgstr ""
+msgstr "Sprievodca tvorbou trvalého oddielu - ukončený."
 
 #: ../lib/Tails/Persistence/Setup.pm:671
 msgid ""
 "Any changes you have made will only take effect after restarting Tails.\n"
 "\n"
 "You may now close this application."
-msgstr ""
+msgstr "Akékoľvek vykonané zmeny nadobudnú účinnosť až po 
reštartovaní Tails.\n\nTeraz môžete zavrieť túto aplikáciu."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:54
 msgid "Persistence wizard - Persistent volume creation"

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

[tor-commits] [collector/master] Made directories configurable; added copyright, description, and path checks.

2016-07-13 Thread karsten 
commit c94d483ad292631756d1355075f4f22a1aa73982
Author: iwakeh 
Date:   Tue Jul 12 13:11:41 2016 +0200

Made directories configurable; added copyright, description, and path 
checks.
---
 src/main/resources/create-tarballs.sh | 75 +--
 1 file changed, 54 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/create-tarballs.sh 
b/src/main/resources/create-tarballs.sh
old mode 100644
new mode 100755
index f3f55a2..6b3785d
--- a/src/main/resources/create-tarballs.sh
+++ b/src/main/resources/create-tarballs.sh
@@ -1,10 +1,42 @@
 #!/bin/bash
+#
+# Copyright 2016 The Tor Project
+# See LICENSE for licensing information.
+#
+# Script for creating descriptor tarballs on a CollecTor instance.
+#
+
+# Configuration section:
+# The following path should be adjusted, if the CollecTor server layout 
differs.
+# OUTDIR and TARBALLTARGETDIR have to be given absolute or relative to WORKDIR.
+WORKDIR="tarballs"
+OUTDIR="../out"
+TARBALLTARGETDIR="../data"
+### end of configuration section.
+#
+### script start
 echo `date` "Starting"
 YEARONE=`date +%Y`
 MONTHONE=`date +%m`
 YEARTWO=`date --date='7 days ago' +%Y`
 MONTHTWO=`date --date='7 days ago' +%m`
-cd tarballs/
+CURRENTPATH=`pwd`
+
+if ! test -d $WORKDIR
+  then mkdir $WORKDIR
+fi
+
+cd $WORKDIR
+
+if ! test -d $OUTDIR
+  then echo "$OUTDIR doesn't exist.  Exiting."
+  exit 1
+fi
+
+if ! test -d $TARBALLTARGETDIR
+  then echo "$TARBALLTARGETDIR doesn't exist.  Exiting."
+  exit 1
+fi
 
 TARBALLS=(
   exit-list-$YEARONE-$MONTHONE
@@ -28,23 +60,23 @@ TARBALLS=(
 TARBALLS=($(printf "%s\n" "${TARBALLS[@]}" | uniq))
 
 DIRECTORIES=(
-  ../out/exit-lists/$YEARONE/$MONTHONE/
-  ../out/exit-lists/$YEARTWO/$MONTHTWO/
-  ../out/torperf/$YEARONE/$MONTHONE/
-  ../out/torperf/$YEARTWO/$MONTHTWO/
-  ../out/relay-descriptors/certs/
-  ../out/relay-descriptors/microdesc/$YEARONE/$MONTHONE
-  ../out/relay-descriptors/microdesc/$YEARTWO/$MONTHTWO
-  ../out/relay-descriptors/consensus/$YEARONE/$MONTHONE
-  ../out/relay-descriptors/consensus/$YEARTWO/$MONTHTWO
-  ../out/relay-descriptors/vote/$YEARONE/$MONTHONE/
-  ../out/relay-descriptors/vote/$YEARTWO/$MONTHTWO/
-  ../out/relay-descriptors/server-descriptor/$YEARONE/$MONTHONE/
-  ../out/relay-descriptors/server-descriptor/$YEARTWO/$MONTHTWO/
-  ../out/relay-descriptors/extra-info/$YEARONE/$MONTHONE/
-  ../out/relay-descriptors/extra-info/$YEARTWO/$MONTHTWO/
-  ../out/bridge-descriptors/$YEARONE/$MONTHONE/
-  ../out/bridge-descriptors/$YEARTWO/$MONTHTWO/
+  $OUTDIR/exit-lists/$YEARONE/$MONTHONE/
+  $OUTDIR/exit-lists/$YEARTWO/$MONTHTWO/
+  $OUTDIR/torperf/$YEARONE/$MONTHONE/
+  $OUTDIR/torperf/$YEARTWO/$MONTHTWO/
+  $OUTDIR/relay-descriptors/certs/
+  $OUTDIR/relay-descriptors/microdesc/$YEARONE/$MONTHONE
+  $OUTDIR/relay-descriptors/microdesc/$YEARTWO/$MONTHTWO
+  $OUTDIR/relay-descriptors/consensus/$YEARONE/$MONTHONE
+  $OUTDIR/relay-descriptors/consensus/$YEARTWO/$MONTHTWO
+  $OUTDIR/relay-descriptors/vote/$YEARONE/$MONTHONE/
+  $OUTDIR/relay-descriptors/vote/$YEARTWO/$MONTHTWO/
+  $OUTDIR/relay-descriptors/server-descriptor/$YEARONE/$MONTHONE/
+  $OUTDIR/relay-descriptors/server-descriptor/$YEARTWO/$MONTHTWO/
+  $OUTDIR/relay-descriptors/extra-info/$YEARONE/$MONTHONE/
+  $OUTDIR/relay-descriptors/extra-info/$YEARTWO/$MONTHTWO/
+  $OUTDIR/bridge-descriptors/$YEARONE/$MONTHONE/
+  $OUTDIR/bridge-descriptors/$YEARTWO/$MONTHTWO/
 )
 DIRECTORIES=($(printf "%s\n" "${DIRECTORIES[@]}" | uniq))
 
@@ -69,7 +101,8 @@ for (( i = 0 ; i < ${#TARBALLS[@]} ; i++ )); do
 done
 
 echo `date` "Moving tarballs into place"
-mv *.tar.xz ../data/
+mv *.tar.xz $TARBALLTARGETDIR
+
+cd $CURRENTPATH
+echo `date` "Finished."
 
-cd ..
-echo `date` "Finishing"

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

[tor-commits] [collector/master] Add create-tarball script from main CollecTor instance to resources.

2016-07-13 Thread karsten 
commit 7aa2fb51dda480e2e2bdf0a384824d1351c860f5
Author: iwakeh 
Date:   Tue Jul 12 13:07:40 2016 +0200

Add create-tarball script from main CollecTor instance to resources.
Initial check-in.
---
 src/main/resources/create-tarballs.sh | 75 +++
 1 file changed, 75 insertions(+)

diff --git a/src/main/resources/create-tarballs.sh 
b/src/main/resources/create-tarballs.sh
new file mode 100644
index 000..f3f55a2
--- /dev/null
+++ b/src/main/resources/create-tarballs.sh
@@ -0,0 +1,75 @@
+#!/bin/bash
+echo `date` "Starting"
+YEARONE=`date +%Y`
+MONTHONE=`date +%m`
+YEARTWO=`date --date='7 days ago' +%Y`
+MONTHTWO=`date --date='7 days ago' +%m`
+cd tarballs/
+
+TARBALLS=(
+  exit-list-$YEARONE-$MONTHONE
+  exit-list-$YEARTWO-$MONTHTWO
+  torperf-$YEARONE-$MONTHONE
+  torperf-$YEARTWO-$MONTHTWO
+  certs
+  microdescs-$YEARONE-$MONTHONE
+  microdescs-$YEARTWO-$MONTHTWO
+  consensuses-$YEARONE-$MONTHONE
+  consensuses-$YEARTWO-$MONTHTWO
+  votes-$YEARONE-$MONTHONE
+  votes-$YEARTWO-$MONTHTWO
+  server-descriptors-$YEARONE-$MONTHONE
+  server-descriptors-$YEARTWO-$MONTHTWO
+  extra-infos-$YEARONE-$MONTHONE
+  extra-infos-$YEARTWO-$MONTHTWO
+  bridge-descriptors-$YEARONE-$MONTHONE
+  bridge-descriptors-$YEARTWO-$MONTHTWO
+)
+TARBALLS=($(printf "%s\n" "${TARBALLS[@]}" | uniq))
+
+DIRECTORIES=(
+  ../out/exit-lists/$YEARONE/$MONTHONE/
+  ../out/exit-lists/$YEARTWO/$MONTHTWO/
+  ../out/torperf/$YEARONE/$MONTHONE/
+  ../out/torperf/$YEARTWO/$MONTHTWO/
+  ../out/relay-descriptors/certs/
+  ../out/relay-descriptors/microdesc/$YEARONE/$MONTHONE
+  ../out/relay-descriptors/microdesc/$YEARTWO/$MONTHTWO
+  ../out/relay-descriptors/consensus/$YEARONE/$MONTHONE
+  ../out/relay-descriptors/consensus/$YEARTWO/$MONTHTWO
+  ../out/relay-descriptors/vote/$YEARONE/$MONTHONE/
+  ../out/relay-descriptors/vote/$YEARTWO/$MONTHTWO/
+  ../out/relay-descriptors/server-descriptor/$YEARONE/$MONTHONE/
+  ../out/relay-descriptors/server-descriptor/$YEARTWO/$MONTHTWO/
+  ../out/relay-descriptors/extra-info/$YEARONE/$MONTHONE/
+  ../out/relay-descriptors/extra-info/$YEARTWO/$MONTHTWO/
+  ../out/bridge-descriptors/$YEARONE/$MONTHONE/
+  ../out/bridge-descriptors/$YEARTWO/$MONTHTWO/
+)
+DIRECTORIES=($(printf "%s\n" "${DIRECTORIES[@]}" | uniq))
+
+for (( i = 0 ; i < ${#TARBALLS[@]} ; i++ )); do
+  if [ ! -d ${TARBALLS[$i]} ]; then
+echo `date` "Creating symlink for" ${TARBALLS[$i]} 
+ln -s ${DIRECTORIES[$i]} ${TARBALLS[$i]}
+  else
+# This is a workaround for the "tar u" bug in GNU tar 1.20
+echo `date` "Touching symlink and directories for" ${TARBALLS[$i]} 
+find -L ${TARBALLS[$i]} -type d | xargs touch
+  fi
+done
+
+for (( i = 0 ; i < ${#TARBALLS[@]} ; i++ )); do
+  echo `date` "Creating" ${TARBALLS[$i]}'.tar'
+  tar chf ${TARBALLS[$i]}.tar ${TARBALLS[$i]}
+  if [ ! -f ${TARBALLS[$i]}.tar.xz ]; then
+echo `date` "Compressing" ${TARBALLS[$i]}'.tar'
+xz -9e ${TARBALLS[$i]}.tar
+  fi
+done
+
+echo `date` "Moving tarballs into place"
+mv *.tar.xz ../data/
+
+cd ..
+echo `date` "Finishing"



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