date:20170413

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

2017-04-13 Thread translation

commit c93cb278d82dc943ed42ba5647350695be441b56
Author: Translation commit bot 
Date:   Fri Apr 14 02:49:08 2017 +

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

diff --git a/sv/sv.po b/sv/sv.po
index 74a09cf..b3cb059 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -28,12 +28,12 @@ msgstr "Lista med Ã¶versÃ¤ttare"
 #: about-tor-browser.page:7
 msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
-"Ta reda pÃ¥ vad Tor Browser kan gÃ¶ra fÃ¶r att skydda din integritet och "
+"Ta reda pÃ¥ vad Tor-webblÃ¤saren kan gÃ¶ra fÃ¶r att skydda din integritet och 
"
 "anonymitet"
 
 #: about-tor-browser.page:10
 msgid "About Tor Browser"
-msgstr "Om Tor Browser"
+msgstr "Om Tor-webblÃ¤sare"
 
 #: about-tor-browser.page:12
 msgid ""
@@ -70,7 +70,7 @@ msgid ""
 "In addition, Tor Browser is designed to prevent websites from "
 "âfingerprintingâ or identifying you based on your browser configuration."
 msgstr ""
-"Dessutom Ã¤r Tor Browser utformad fÃ¶r att fÃ¶rhindra webbsidor frÃ¥n "
+"Dessutom Ã¤r Tor-webblÃ¤sare utformad fÃ¶r att fÃ¶rhindra webbsidor frÃ¥n "
 "\"fingeravtryck\" eller identifiera dig baserat pÃ¥ din "
 "webblÃ¤sarkonfiguration."
 

___
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

2017-04-13 Thread translation

commit 9cbf995e2f229dca53dc803a5702abc2bcf1189d
Author: Translation commit bot 
Date:   Fri Apr 14 02:47:55 2017 +

Update translations for torbutton-abouttbupdatedtd
---
 sv/abouttbupdate.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv/abouttbupdate.dtd b/sv/abouttbupdate.dtd
index c502721..a57f256 100644
--- a/sv/abouttbupdate.dtd
+++ b/sv/abouttbupdate.dtd
@@ -1,5 +1,5 @@
-
-
+
+
 
 
 

___
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

2017-04-13 Thread translation

commit 2e1866860016450bf678dfa35114d25527f3415f
Author: Translation commit bot 
Date:   Fri Apr 14 02:47:59 2017 +

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

diff --git a/sv/abouttbupdate.dtd b/sv/abouttbupdate.dtd
index c502721..a57f256 100644
--- a/sv/abouttbupdate.dtd
+++ b/sv/abouttbupdate.dtd
@@ -1,5 +1,5 @@
-
-
+
+
 
 
 

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

[tor-commits] [translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed

2017-04-13 Thread translation

commit 079074f1071ac59624ee597e96065dd70d7d7cbb
Author: Translation commit bot 
Date:   Fri Apr 14 02:47:51 2017 +

Update translations for tails-openpgp-applet_completed
---
 sv/openpgp-applet.pot | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv/openpgp-applet.pot b/sv/openpgp-applet.pot
index e38be59..0cc2cd7 100644
--- a/sv/openpgp-applet.pot
+++ b/sv/openpgp-applet.pot
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2015-08-10 15:55+0200\n"
-"PO-Revision-Date: 2017-04-14 02:14+\n"
+"PO-Revision-Date: 2017-04-14 02:19+\n"
 "Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@ msgstr "Kryptera urklipp med _lÃ¶senordsfras"
 
 #: bin/openpgp-applet:238
 msgid "Sign/Encrypt Clipboard with Public _Keys"
-msgstr "Signera/kryptera urklipp med _publik nyckel"
+msgstr "Signera/kryptera urklipp med publik_nycklar"
 
 #: bin/openpgp-applet:243
 msgid "_Decrypt/Verify Clipboard"

___
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

2017-04-13 Thread translation

commit 662b284527230d398f5d7efc8c2c3d0d9b209fdd
Author: Translation commit bot 
Date:   Fri Apr 14 02:47:28 2017 +

Update translations for tor_animation
---
 sv.srt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sv.srt b/sv.srt
index a10c047..e5ce72d 100644
--- a/sv.srt
+++ b/sv.srt
@@ -21,7 +21,8 @@ LÃ¥t mig fÃ¶rklara lite utfÃ¶rligare.
 
 6
 00:00:14,920 --> 00:00:17,740
-Just nu, om nÃ¥gon fÃ¶rsÃ¶ker kolla dig
+Just i detta Ã¶gonblick,
+ om nÃ¥gon fÃ¶rsÃ¶ker att leta upp dig,
 
 7
 00:00:18,060 --> 00:00:22,480

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

[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet

2017-04-13 Thread translation

commit e1e8534cfb60170777991b98949eaba0a711ac81
Author: Translation commit bot 
Date:   Fri Apr 14 02:47:47 2017 +

Update translations for tails-openpgp-applet
---
 sv/openpgp-applet.pot | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv/openpgp-applet.pot b/sv/openpgp-applet.pot
index e38be59..0cc2cd7 100644
--- a/sv/openpgp-applet.pot
+++ b/sv/openpgp-applet.pot
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2015-08-10 15:55+0200\n"
-"PO-Revision-Date: 2017-04-14 02:14+\n"
+"PO-Revision-Date: 2017-04-14 02:19+\n"
 "Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@ msgstr "Kryptera urklipp med _lÃ¶senordsfras"
 
 #: bin/openpgp-applet:238
 msgid "Sign/Encrypt Clipboard with Public _Keys"
-msgstr "Signera/kryptera urklipp med _publik nyckel"
+msgstr "Signera/kryptera urklipp med publik_nycklar"
 
 #: bin/openpgp-applet:243
 msgid "_Decrypt/Verify Clipboard"

___
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

2017-04-13 Thread translation

commit d5b9d9d832d5a43311fb8ac3f01427374a5d492b
Author: Translation commit bot 
Date:   Fri Apr 14 02:47:31 2017 +

Update translations for tor_animation_completed
---
 sv.srt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sv.srt b/sv.srt
index a10c047..e5ce72d 100644
--- a/sv.srt
+++ b/sv.srt
@@ -21,7 +21,8 @@ LÃ¥t mig fÃ¶rklara lite utfÃ¶rligare.
 
 6
 00:00:14,920 --> 00:00:17,740
-Just nu, om nÃ¥gon fÃ¶rsÃ¶ker kolla dig
+Just i detta Ã¶gonblick,
+ om nÃ¥gon fÃ¶rsÃ¶ker att leta upp dig,
 
 7
 00:00:18,060 --> 00:00:22,480

___
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

2017-04-13 Thread translation

commit 559c08558e0d15cda477e9f4739e74f529eb9015
Author: Translation commit bot 
Date:   Fri Apr 14 02:47:07 2017 +

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

diff --git a/sv/torbutton.dtd b/sv/torbutton.dtd
index 4841f68..4b38279 100644
--- a/sv/torbutton.dtd
+++ b/sv/torbutton.dtd
@@ -4,7 +4,7 @@
 
 
 
-
+
 
 
 

___
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

2017-04-13 Thread translation

commit 70ae6115c715fe833da88b6065cea0071655f3f1
Author: Translation commit bot 
Date:   Fri Apr 14 02:46:42 2017 +

Update translations for abouttor-homepage
---
 sv/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv/aboutTor.dtd b/sv/aboutTor.dtd
index 446f198..1e4b30f 100644
--- a/sv/aboutTor.dtd
+++ b/sv/aboutTor.dtd
@@ -12,7 +12,7 @@
 
 
 
-
+
 
 
 

___
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

2017-04-13 Thread translation

commit c5157241a65abd388351af0ae759005269210a37
Author: Translation commit bot 
Date:   Fri Apr 14 02:46:35 2017 +

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

diff --git a/sv.po b/sv.po
index 1a07918..701f7b5 100644
--- a/sv.po
+++ b/sv.po
@@ -22,7 +22,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-06 21:07+0200\n"
-"PO-Revision-Date: 2017-04-14 02:14+\n"
+"PO-Revision-Date: 2017-04-14 02:23+\n"
 "Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"

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

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

2017-04-13 Thread translation

commit f5f6dbf8f8723260fa1adb9beadd8384ebf2689d
Author: Translation commit bot 
Date:   Fri Apr 14 02:47:00 2017 +

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

diff --git a/sv/brand.dtd b/sv/brand.dtd
index 4c1fb69..43a95e1 100644
--- a/sv/brand.dtd
+++ b/sv/brand.dtd
@@ -2,9 +2,9 @@
- 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/tails-misc_completed] Update translations for tails-misc_completed

2017-04-13 Thread translation

commit 8e0cd422791836fdc344fb4810c842884e510d45
Author: Translation commit bot 
Date:   Fri Apr 14 02:46:38 2017 +

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

diff --git a/sv.po b/sv.po
index 1a07918..701f7b5 100644
--- a/sv.po
+++ b/sv.po
@@ -22,7 +22,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-06 21:07+0200\n"
-"PO-Revision-Date: 2017-04-14 02:14+\n"
+"PO-Revision-Date: 2017-04-14 02:23+\n"
 "Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"

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

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

2017-04-13 Thread translation

commit 1ee5f916de01c1958c14f446d209d4d33f578018
Author: Translation commit bot 
Date:   Fri Apr 14 02:46:46 2017 +

Update translations for abouttor-homepage_completed
---
 sv/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv/aboutTor.dtd b/sv/aboutTor.dtd
index 446f198..1e4b30f 100644
--- a/sv/aboutTor.dtd
+++ b/sv/aboutTor.dtd
@@ -12,7 +12,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

2017-04-13 Thread translation

commit 44ccc1c0235ede41a491ee4b982874ac65cdb820
Author: Translation commit bot 
Date:   Fri Apr 14 02:46:56 2017 +

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

diff --git a/sv/brand.dtd b/sv/brand.dtd
index 4c1fb69..43a95e1 100644
--- a/sv/brand.dtd
+++ b/sv/brand.dtd
@@ -2,9 +2,9 @@
- 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/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2017-04-13 Thread translation

commit 48e5436edcb701e87cdb319167d474207c5cf379
Author: Translation commit bot 
Date:   Fri Apr 14 02:45:53 2017 +

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

diff --git a/sv/sv.po b/sv/sv.po
index 1f5b20d..9939621 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -17,7 +17,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: 2017-04-14 02:12+\n"
+"PO-Revision-Date: 2017-04-14 02:25+\n"
 "Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -48,7 +48,7 @@ msgstr "SSH-klient"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:70
 msgid "SSH keys, configuration and known hosts"
-msgstr "Nycklar, konfiguration och kÃ¤nda vÃ¤rdar fÃ¶r SSH"
+msgstr "SSH-nycklar, konfiguration och kÃ¤nda vÃ¤rdar"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:78
 msgid "Pidgin"
@@ -56,7 +56,7 @@ msgstr "Pidgin"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:80
 msgid "Pidgin profiles and OTR keyring"
-msgstr "Pidgin profiler och OTR nyckelring"
+msgstr "Pidgin-profiler och OTR-nyckelring"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
 msgid "Icedove"

___
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

2017-04-13 Thread translation

commit 357d7bbced34c0c980d27838013522a352bebce1
Author: Translation commit bot 
Date:   Fri Apr 14 02:45:49 2017 +

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

diff --git a/sv/sv.po b/sv/sv.po
index 1f5b20d..9939621 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -17,7 +17,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: 2017-04-14 02:12+\n"
+"PO-Revision-Date: 2017-04-14 02:25+\n"
 "Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -48,7 +48,7 @@ msgstr "SSH-klient"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:70
 msgid "SSH keys, configuration and known hosts"
-msgstr "Nycklar, konfiguration och kÃ¤nda vÃ¤rdar fÃ¶r SSH"
+msgstr "SSH-nycklar, konfiguration och kÃ¤nda vÃ¤rdar"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:78
 msgid "Pidgin"
@@ -56,7 +56,7 @@ msgstr "Pidgin"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:80
 msgid "Pidgin profiles and OTR keyring"
-msgstr "Pidgin profiler och OTR nyckelring"
+msgstr "Pidgin-profiler och OTR-nyckelring"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
 msgid "Icedove"

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

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

2017-04-13 Thread translation

commit f33edc9d3620f321265c3b9533f51768ff541bf6
Author: Translation commit bot 
Date:   Fri Apr 14 02:45:40 2017 +

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

diff --git a/sv/sv.po b/sv/sv.po
index b06cf8f..c3f5ebd 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2017-04-14 02:09+\n"
+"PO-Revision-Date: 2017-04-14 02:23+\n"
 "Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
 
 #: ../liveusb/gui.py:451
 msgid "\"Clone & Install\""
-msgstr "\"Klona & Installera\""
+msgstr "\"Klona & installera\""
 
 #: ../liveusb/gui.py:453
 msgid "\"Install from ISO\""
@@ -37,7 +37,7 @@ msgstr "\"Installera frÃ¥n ISO\""
 #: ../liveusb/dialog.py:157 ../liveusb/launcher_ui.py:153
 #, python-format
 msgid "%(distribution)s Installer"
-msgstr "%(distribution)s Installerare"
+msgstr "%(distribution)s installerare"
 
 #: ../liveusb/gui.py:804
 #, python-format

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

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

2017-04-13 Thread translation

commit b950e14f8fd127cd4c9960f43923047d1d953a59
Author: Translation commit bot 
Date:   Fri Apr 14 02:45:45 2017 +

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

diff --git a/sv/sv.po b/sv/sv.po
index b06cf8f..c3f5ebd 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2017-04-14 02:09+\n"
+"PO-Revision-Date: 2017-04-14 02:23+\n"
 "Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr ""
 
 #: ../liveusb/gui.py:451
 msgid "\"Clone & Install\""
-msgstr "\"Klona & Installera\""
+msgstr "\"Klona & installera\""
 
 #: ../liveusb/gui.py:453
 msgid "\"Install from ISO\""
@@ -37,7 +37,7 @@ msgstr "\"Installera frÃ¥n ISO\""
 #: ../liveusb/dialog.py:157 ../liveusb/launcher_ui.py:153
 #, python-format
 msgid "%(distribution)s Installer"
-msgstr "%(distribution)s Installerare"
+msgstr "%(distribution)s installerare"
 
 #: ../liveusb/gui.py:804
 #, python-format

___
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

2017-04-13 Thread translation

commit 6718f0b9f5952e150155ab6364ed10a7d3ddafb7
Author: Translation commit bot 
Date:   Fri Apr 14 02:45:20 2017 +

Update translations for torcheck_completed
---
 sv/torcheck.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sv/torcheck.po b/sv/torcheck.po
index 4467c9d..e6a1804 100644
--- a/sv/torcheck.po
+++ b/sv/torcheck.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2017-04-14 01:55+\n"
+"PO-Revision-Date: 2017-04-14 02:23+\n"
 "Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@ msgid ""
 msgstr "BesÃ¶k https://www.torproject.org/\;>Tor webbplatsen 
fÃ¶r mer information om hur du anvÃ¤nder Tor sÃ¤kert.  Du kan nu surfa pÃ¥ 
nÃ¤tet anonymt."
 
 msgid "There is a security update available for Tor Browser."
-msgstr "Det finns en tillgÃ¤nglig uppdatering fÃ¶r Tor webblÃ¤sare."
+msgstr "Det finns en tillgÃ¤nglig uppdatering fÃ¶r Tor-webblÃ¤sare."
 
 msgid ""
 "https://www.torproject.org/download/download-easy.html\;>Click "
@@ -50,7 +50,7 @@ msgid ""
 "href=\"https://www.torproject.org/\;>Tor website and specifically the instructions for "
 "configuring your Tor client."
-msgstr "Om du fÃ¶rsÃ¶ker anvÃ¤nda en Tor-klient, vÃ¤nligen se vidare 
information pÃ¥ https://www.torproject.org/\;>webbplatsen fÃ¶r 
Tor och mer specifikt https://www.torproject.org/docs/faq#DoesntWork\;>instruktioner fÃ¶r att 
konfigurera din Tor-klient."
+msgstr "Om du fÃ¶rsÃ¶ker anvÃ¤nda en Tor-klient, vÃ¤nligen se vidare 
information pÃ¥ https://www.torproject.org/\;>Tor-webbplatsen och 
mer specifikt https://www.torproject.org/docs/faq#DoesntWork\;>instruktioner fÃ¶r att 
konfigurera din Tor-klient."
 
 msgid "Sorry, your query failed or an unexpected response was received."
 msgstr "TyvÃ¤rr, antingen misslyckades din fÃ¶rfrÃ¥gan eller sÃ¥ inkom ett 
ovÃ¤ntat svar."

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

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

2017-04-13 Thread translation

commit 7316657c1743ef945af683e61e16fa41c76f53a8
Author: Translation commit bot 
Date:   Fri Apr 14 02:45:24 2017 +

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

diff --git a/sv/sv.po b/sv/sv.po
index 86e986b..e65e9a8 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-20 12:09+\n"
-"PO-Revision-Date: 2017-04-14 01:59+\n"
+"PO-Revision-Date: 2017-04-14 02:20+\n"
 "Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -45,11 +45,11 @@ msgstr "Variablen %s kunde inte hittas i nÃ¥gon av 
konfigurationsfilerna /etc/wh
 
 #: ../whisperBack/gui.py:110
 msgid "Name of the affected software"
-msgstr ""
+msgstr "Namn pÃ¥ den drabbade programvaran"
 
 #: ../whisperBack/gui.py:112
 msgid "Exact steps to reproduce the error"
-msgstr ""
+msgstr "Exakta steg fÃ¶r att Ã¥terskapa felet"
 
 #: ../whisperBack/gui.py:114
 msgid "Actual result and description of the error"

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

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

2017-04-13 Thread translation

commit 1630a3e5786c8c1320d67ba3a590a7f9d5c75fe8
Author: Translation commit bot 
Date:   Fri Apr 14 02:45:16 2017 +

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

diff --git a/sv/torcheck.po b/sv/torcheck.po
index 4467c9d..e6a1804 100644
--- a/sv/torcheck.po
+++ b/sv/torcheck.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2017-04-14 01:55+\n"
+"PO-Revision-Date: 2017-04-14 02:23+\n"
 "Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@ msgid ""
 msgstr "BesÃ¶k https://www.torproject.org/\;>Tor webbplatsen 
fÃ¶r mer information om hur du anvÃ¤nder Tor sÃ¤kert.  Du kan nu surfa pÃ¥ 
nÃ¤tet anonymt."
 
 msgid "There is a security update available for Tor Browser."
-msgstr "Det finns en tillgÃ¤nglig uppdatering fÃ¶r Tor webblÃ¤sare."
+msgstr "Det finns en tillgÃ¤nglig uppdatering fÃ¶r Tor-webblÃ¤sare."
 
 msgid ""
 "https://www.torproject.org/download/download-easy.html\;>Click "
@@ -50,7 +50,7 @@ msgid ""
 "href=\"https://www.torproject.org/\;>Tor website and specifically the instructions for "
 "configuring your Tor client."
-msgstr "Om du fÃ¶rsÃ¶ker anvÃ¤nda en Tor-klient, vÃ¤nligen se vidare 
information pÃ¥ https://www.torproject.org/\;>webbplatsen fÃ¶r 
Tor och mer specifikt https://www.torproject.org/docs/faq#DoesntWork\;>instruktioner fÃ¶r att 
konfigurera din Tor-klient."
+msgstr "Om du fÃ¶rsÃ¶ker anvÃ¤nda en Tor-klient, vÃ¤nligen se vidare 
information pÃ¥ https://www.torproject.org/\;>Tor-webbplatsen och 
mer specifikt https://www.torproject.org/docs/faq#DoesntWork\;>instruktioner fÃ¶r att 
konfigurera din Tor-klient."
 
 msgid "Sorry, your query failed or an unexpected response was received."
 msgstr "TyvÃ¤rr, antingen misslyckades din fÃ¶rfrÃ¥gan eller sÃ¥ inkom ett 
ovÃ¤ntat svar."

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

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

2017-04-13 Thread translation

commit 6ec95a0cf20ad36d6231eea08c6b16a3a36fdff4
Author: Translation commit bot 
Date:   Fri Apr 14 02:45:04 2017 +

Update translations for bridgedb
---
 sv/LC_MESSAGES/bridgedb.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index a715119..8946d7c 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -18,7 +18,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2017-04-14 01:57+\n"
+"PO-Revision-Date: 2017-04-14 02:17+\n"
 "Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -61,7 +61,7 @@ msgstr "Kontakt"
 
 #: bridgedb/https/templates/bridges.html:35
 msgid "Select All"
-msgstr "Markera Allt"
+msgstr "Markera allt"
 
 #: bridgedb/https/templates/bridges.html:40
 msgid "Show QRCode"

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

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

2017-04-13 Thread translation

commit c216b6f0558efc4a354a08a7fffa94e67bc5ab62
Author: Translation commit bot 
Date:   Fri Apr 14 02:45:11 2017 +

Update translations for bridgedb_completed
---
 sv/LC_MESSAGES/bridgedb.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index a715119..8946d7c 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -18,7 +18,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2017-04-14 01:57+\n"
+"PO-Revision-Date: 2017-04-14 02:17+\n"
 "Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -61,7 +61,7 @@ msgstr "Kontakt"
 
 #: bridgedb/https/templates/bridges.html:35
 msgid "Select All"
-msgstr "Markera Allt"
+msgstr "Markera allt"
 
 #: bridgedb/https/templates/bridges.html:40
 msgid "Show QRCode"

___
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

2017-04-13 Thread translation

commit 75b5bd9262fec26397a3bcd8678d822dcea4b780
Author: Translation commit bot 
Date:   Fri Apr 14 02:19:38 2017 +

Update translations for tor-browser-manual
---
 sv/sv.po | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index d08b52e..74a09cf 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -4,7 +4,6 @@
 # WinterFairy , 2016
 # Jonatan Nyberg , 2016
 # Daniel SjÃ¶berg , 2016
-# Peter Michanek , 2016
 # Yoga Andersson , 2016
 # Nikolai Stenfors , 2016
 # Bo Serrander , 2017
@@ -788,7 +787,7 @@ msgstr ""
 
 #: managing-identities.page:123
 msgid "New Tor Circuit for this Site"
-msgstr "Ny Tor-krets fÃ¶r den hÃ¤r webbsidan"
+msgstr "Ny Tor-krets fÃ¶r den hÃ¤r webbplatsen"
 
 #: managing-identities.page:124
 msgid ""

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

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

2017-04-13 Thread translation

commit 89c3890429639bf3194a689f28459ba396105c65
Author: Translation commit bot 
Date:   Fri Apr 14 02:19:24 2017 +

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

diff --git a/sv/sv.po b/sv/sv.po
index 091ebd4..0e9f4b4 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -29,11 +29,11 @@ msgid ""
 "security."
 msgstr ""
 "Ange ett administratÃ¶rslÃ¶senord ifall du behÃ¶ver utfÃ¶ra administrativa 
uppgifter.\n"
-"I annat fall kommer administratÃ¶rsÃ¥tkomst inaktiveras."
+"I annat fall kommer administratÃ¶rsÃ¥tkomst inaktiveras fÃ¶r bÃ¤ttre 
sÃ¤kerhet."
 
 #: ../data/greeter.ui.h:3
 msgid "Enter an administration password"
-msgstr "Ange ett administration lÃ¶senord"
+msgstr "Ange ett administrationslÃ¶senord"
 
 #: ../data/greeter.ui.h:4
 msgid "Confirm"
@@ -41,7 +41,7 @@ msgstr "BekrÃ¤fta"
 
 #: ../data/greeter.ui.h:5
 msgid "Confirm your administration password"
-msgstr "BekrÃ¤fta ditt administration lÃ¶senord"
+msgstr "BekrÃ¤fta ditt administrationslÃ¶senord"
 
 #: ../data/greeter.ui.h:6
 msgid "Disable"

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

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

2017-04-13 Thread translation

commit b015a7c63ad39a773f634056f31b121aeb70e128
Author: Translation commit bot 
Date:   Fri Apr 14 02:18:31 2017 +

Update translations for tails-onioncircuits_completed
---
 sv/onioncircuits.pot | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sv/onioncircuits.pot b/sv/onioncircuits.pot
index 644e3d8..5ba192b 100644
--- a/sv/onioncircuits.pot
+++ b/sv/onioncircuits.pot
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # Anders Nilsson , 2016
-# Dan Berg , 2016
-# Jonatan Nyberg , 2016
+# Daniel SjÃ¶berg , 2016
+# Jonatan Nyberg , 2016-2017
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-31 14:42+0200\n"
-"PO-Revision-Date: 2016-06-10 18:34+\n"
+"PO-Revision-Date: 2017-04-14 02:15+\n"
 "Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"

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

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

2017-04-13 Thread translation

commit 147da0302dbb70b9aa7078304f5c4a0363c42280
Author: Translation commit bot 
Date:   Fri Apr 14 02:18:26 2017 +

Update translations for tails-onioncircuits
---
 sv/onioncircuits.pot | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sv/onioncircuits.pot b/sv/onioncircuits.pot
index 644e3d8..5ba192b 100644
--- a/sv/onioncircuits.pot
+++ b/sv/onioncircuits.pot
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # Anders Nilsson , 2016
-# Dan Berg , 2016
-# Jonatan Nyberg , 2016
+# Daniel SjÃ¶berg , 2016
+# Jonatan Nyberg , 2016-2017
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-31 14:42+0200\n"
-"PO-Revision-Date: 2016-06-10 18:34+\n"
+"PO-Revision-Date: 2017-04-14 02:15+\n"
 "Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"

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

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

2017-04-13 Thread translation

commit dac1a8eda7aa2a8d8720fdca4779fc14b7a63fe5
Author: Translation commit bot 
Date:   Fri Apr 14 02:18:00 2017 +

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

diff --git a/sv/aboutdialog.dtd b/sv/aboutdialog.dtd
index 5f5f68c..4da13cc 100644
--- a/sv/aboutdialog.dtd
+++ b/sv/aboutdialog.dtd
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed

2017-04-13 Thread translation

commit 497388b04e67fcc20eaa64fafc6e39846b708ec7
Author: Translation commit bot 
Date:   Fri Apr 14 02:18:16 2017 +

Update translations for tails-openpgp-applet_completed
---
 sv/openpgp-applet.pot | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sv/openpgp-applet.pot b/sv/openpgp-applet.pot
index efeea8c..e38be59 100644
--- a/sv/openpgp-applet.pot
+++ b/sv/openpgp-applet.pot
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Anders Nilsson , 2015
+# Anders Nilsson , 2015
+# Jonatan Nyberg , 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2015-08-10 15:55+0200\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
-"Last-Translator: Anders Nilsson \n"
+"PO-Revision-Date: 2017-04-14 02:14+\n"
+"Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +37,7 @@ msgstr "Om"
 
 #: bin/openpgp-applet:235
 msgid "Encrypt Clipboard with _Passphrase"
-msgstr "Kryptera urklipp med _lÃ¶senord"
+msgstr "Kryptera urklipp med _lÃ¶senordsfras"
 
 #: bin/openpgp-applet:238
 msgid "Sign/Encrypt Clipboard with Public _Keys"

___
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

2017-04-13 Thread translation

commit f7cddb27eab7445f295a080beab58a95bcb1552b
Author: Translation commit bot 
Date:   Fri Apr 14 02:17:56 2017 +

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

diff --git a/sv/aboutdialog.dtd b/sv/aboutdialog.dtd
index 5f5f68c..4da13cc 100644
--- a/sv/aboutdialog.dtd
+++ b/sv/aboutdialog.dtd
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet

2017-04-13 Thread translation

commit 5d41963e26bbc74da1d321ca7efb1aa3e63ae5cb
Author: Translation commit bot 
Date:   Fri Apr 14 02:18:11 2017 +

Update translations for tails-openpgp-applet
---
 sv/openpgp-applet.pot | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sv/openpgp-applet.pot b/sv/openpgp-applet.pot
index efeea8c..e38be59 100644
--- a/sv/openpgp-applet.pot
+++ b/sv/openpgp-applet.pot
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Anders Nilsson , 2015
+# Anders Nilsson , 2015
+# Jonatan Nyberg , 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2015-08-10 15:55+0200\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
-"Last-Translator: Anders Nilsson \n"
+"PO-Revision-Date: 2017-04-14 02:14+\n"
+"Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +37,7 @@ msgstr "Om"
 
 #: bin/openpgp-applet:235
 msgid "Encrypt Clipboard with _Passphrase"
-msgstr "Kryptera urklipp med _lÃ¶senord"
+msgstr "Kryptera urklipp med _lÃ¶senordsfras"
 
 #: bin/openpgp-applet:238
 msgid "Sign/Encrypt Clipboard with Public _Keys"

___
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

2017-04-13 Thread translation

commit 219891d5ef3237bd539f7f4f51b03a31411320b5
Author: Translation commit bot 
Date:   Fri Apr 14 02:17:52 2017 +

Update translations for tor_animation_completed
---
 sv.srt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv.srt b/sv.srt
index 60a506f..a10c047 100644
--- a/sv.srt
+++ b/sv.srt
@@ -9,7 +9,7 @@ om oss sjÃ¤lva och vÃ¥ra privatliv.
 
 3
 00:00:08,000 --> 00:00:09,960
-Vilken mat vi Ã¤ter, vilka vi trÃ¤ffar,
+mat vi Ã¤ter, personer vi trÃ¤ffar.
 
 4
 00:00:10,180 --> 00:00:12,480

___
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

2017-04-13 Thread translation

commit f7e504134c598bfe216ab487454ad2774a56f3fd
Author: Translation commit bot 
Date:   Fri Apr 14 02:17:48 2017 +

Update translations for tor_animation
---
 sv.srt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv.srt b/sv.srt
index 60a506f..a10c047 100644
--- a/sv.srt
+++ b/sv.srt
@@ -9,7 +9,7 @@ om oss sjÃ¤lva och vÃ¥ra privatliv.
 
 3
 00:00:08,000 --> 00:00:09,960
-Vilken mat vi Ã¤ter, vilka vi trÃ¤ffar,
+mat vi Ã¤ter, personer vi trÃ¤ffar.
 
 4
 00:00:10,180 --> 00:00:12,480

___
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

2017-04-13 Thread translation

commit 550df30d3e823373cabf95b3624a67fa4dc3b442
Author: Translation commit bot 
Date:   Fri Apr 14 02:17:19 2017 +

Update translations for torbutton-torbuttonproperties
---
 sv/torbutton.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv/torbutton.properties b/sv/torbutton.properties
index e04426e..8102e83 100644
--- a/sv/torbutton.properties
+++ b/sv/torbutton.properties
@@ -34,7 +34,7 @@ torbutton.slider_notification_button = Ãppna 
sÃ¤kerhetsinstÃ¤llningar
 torbutton.maximize_warning = Att maximera Tor Browser kan ge webbsajter 
mÃ¶jlighet att upptÃ¤cka din monitors storlek, vilket kan anvÃ¤ndas fÃ¶r att 
spÃ¥ra dig. Vi rekommenderar att du lÃ¤mnar Tor Browser fÃ¶nstret i dess 
ursprungliga storlek.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Denna webbsida (%S) fÃ¶rsÃ¶kte komma Ã¥t HTML5-bilddata pÃ¥ 
ett kanvas, som skulle kunna anvÃ¤ndas fÃ¶r att identifiera just din 
dator.\n\nSka Tor Browser tillÃ¥ta den hÃ¤r webbsidan att anvÃ¤nda 
HTML5-bilddata pÃ¥ kanvas?
+canvas.siteprompt=Denna webbplats (%S) fÃ¶rsÃ¶kte komma Ã¥t HTML5-bilddata pÃ¥ 
ett kanvas, som skulle kunna anvÃ¤ndas fÃ¶r att identifiera just din 
dator.\n\nSka Tor Browser tillÃ¥ta den hÃ¤r webbplatsen att anvÃ¤nda 
HTML5-bilddata pÃ¥ kanvas?
 canvas.notNow=Inte just nu
 canvas.notNowAccessKey=N
 canvas.allow=Ja, tillÃ¥t alltid

___
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

2017-04-13 Thread translation

commit f8bb9150a76d37ad7650baabf5742dadd8cefb57
Author: Translation commit bot 
Date:   Fri Apr 14 02:17:14 2017 +

Update translations for torbutton-branddtd_completed
---
 sv/brand.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sv/brand.dtd b/sv/brand.dtd
index c04310a..4c1fb69 100644
--- a/sv/brand.dtd
+++ b/sv/brand.dtd
@@ -4,9 +4,9 @@
 
 
 
-
+
 
-
+
 
 
 

___
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

2017-04-13 Thread translation

commit 790c627789816f3b2fd91d62644841a248b8c715
Author: Translation commit bot 
Date:   Fri Apr 14 02:17:23 2017 +

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

diff --git a/sv/torbutton.dtd b/sv/torbutton.dtd
index 4560ccc..4841f68 100644
--- a/sv/torbutton.dtd
+++ b/sv/torbutton.dtd
@@ -1,6 +1,6 @@
 
 
-
+
 
 
 
@@ -58,4 +58,4 @@
 
 
 
-
+

___
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

2017-04-13 Thread translation

commit 0eed1c9cc2a3b6bb52c168ce607ce2a9c7770f1f
Author: Translation commit bot 
Date:   Fri Apr 14 02:17:38 2017 +

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

diff --git a/sv.po b/sv.po
index b721d2e..72843e3 100644
--- a/sv.po
+++ b/sv.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Anders Nilsson , 2016
+# Anders Nilsson , 2016
+# Jonatan Nyberg , 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2016-01-25 16:59+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
-"Last-Translator: Anders Nilsson \n"
+"POT-Creation-Date: 2016-09-20 15:58+0200\n"
+"PO-Revision-Date: 2017-04-14 02:06+\n"
+"Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,10 +27,10 @@ msgstr "Fel"
 msgid ""
 "The device Tails is running from cannot be found. Maybe you used the `toram'"
 " option?"
-msgstr "Kunde inte hitta den enhet Tails kÃ¶rs ifrÃ¥n. Kanske du startade med 
`toram'?"
+msgstr "Enheten Tails kÃ¶rs ifrÃ¥n kan inte hittas. Kanske du startade med 
`toram' alternativet?"
 
 #: ../lib/Tails/RunningSystem.pm:192
 msgid ""
 "The drive Tails is running from cannot be found. Maybe you used the `toram' "
 "option?"
-msgstr "Kunde inte hitta den enhet Tails kÃ¶rs ifrÃ¥n. Kanske du startade med 
`toram'?"
+msgstr "Kunde inte hitta den enhet Tails kÃ¶rs ifrÃ¥n. Kanske du startade med 
`toram' alternativet?"

___
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

2017-04-13 Thread translation

commit 76bd6cd0d205497be40bfee9baf33c9a47f132eb
Author: Translation commit bot 
Date:   Fri Apr 14 02:17:34 2017 +

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

diff --git a/sv.po b/sv.po
index b721d2e..72843e3 100644
--- a/sv.po
+++ b/sv.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Anders Nilsson , 2016
+# Anders Nilsson , 2016
+# Jonatan Nyberg , 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2016-01-25 16:59+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
-"Last-Translator: Anders Nilsson \n"
+"POT-Creation-Date: 2016-09-20 15:58+0200\n"
+"PO-Revision-Date: 2017-04-14 02:06+\n"
+"Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,10 +27,10 @@ msgstr "Fel"
 msgid ""
 "The device Tails is running from cannot be found. Maybe you used the `toram'"
 " option?"
-msgstr "Kunde inte hitta den enhet Tails kÃ¶rs ifrÃ¥n. Kanske du startade med 
`toram'?"
+msgstr "Enheten Tails kÃ¶rs ifrÃ¥n kan inte hittas. Kanske du startade med 
`toram' alternativet?"
 
 #: ../lib/Tails/RunningSystem.pm:192
 msgid ""
 "The drive Tails is running from cannot be found. Maybe you used the `toram' "
 "option?"
-msgstr "Kunde inte hitta den enhet Tails kÃ¶rs ifrÃ¥n. Kanske du startade med 
`toram'?"
+msgstr "Kunde inte hitta den enhet Tails kÃ¶rs ifrÃ¥n. Kanske du startade med 
`toram' alternativet?"

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

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

2017-04-13 Thread translation

commit 62a3c9bab0573ee5388248a60b43b3c48b1ba888
Author: Translation commit bot 
Date:   Fri Apr 14 02:17:31 2017 +

Update translations for tails-iuk_completed
---
 sv.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sv.po b/sv.po
index b743df7..7cc0d67 100644
--- a/sv.po
+++ b/sv.po
@@ -5,14 +5,15 @@
 # Translators:
 # Anders Nilsson , 2016
 # Anders Nilsson , 2015
+# Jonatan Nyberg , 2017
 # WinterFairy , 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-05-25 16:55+0200\n"
-"PO-Revision-Date: 2016-05-26 11:40+\n"
-"Last-Translator: Anders Nilsson \n"
+"PO-Revision-Date: 2017-04-14 02:13+\n"
+"Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,7 +47,7 @@ msgstr "ingen automatisk uppgradering finns tillgÃ¤nglig 
frÃ¥n vÃ¥r hemsida fÃ¶r
 
 #: ../lib/Tails/IUK/Frontend.pm:241
 msgid "your device was not created using Tails Installer"
-msgstr "din enhet Ã¤r inte skapad med Tails installerare"
+msgstr "din enhet Ã¤r skapades inte med Tails installerare"
 
 #: ../lib/Tails/IUK/Frontend.pm:246
 msgid "Tails was started from a DVD or a read-only device"

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

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

2017-04-13 Thread translation

commit d03237dcbdb131b770b13c88c476f8790466b26b
Author: Translation commit bot 
Date:   Fri Apr 14 02:17:27 2017 +

Update translations for tails-iuk
---
 sv.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sv.po b/sv.po
index b743df7..7cc0d67 100644
--- a/sv.po
+++ b/sv.po
@@ -5,14 +5,15 @@
 # Translators:
 # Anders Nilsson , 2016
 # Anders Nilsson , 2015
+# Jonatan Nyberg , 2017
 # WinterFairy , 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-05-25 16:55+0200\n"
-"PO-Revision-Date: 2016-05-26 11:40+\n"
-"Last-Translator: Anders Nilsson \n"
+"PO-Revision-Date: 2017-04-14 02:13+\n"
+"Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,7 +47,7 @@ msgstr "ingen automatisk uppgradering finns tillgÃ¤nglig 
frÃ¥n vÃ¥r hemsida fÃ¶r
 
 #: ../lib/Tails/IUK/Frontend.pm:241
 msgid "your device was not created using Tails Installer"
-msgstr "din enhet Ã¤r inte skapad med Tails installerare"
+msgstr "din enhet Ã¤r skapades inte med Tails installerare"
 
 #: ../lib/Tails/IUK/Frontend.pm:246
 msgid "Tails was started from a DVD or a read-only device"

___
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

2017-04-13 Thread translation

commit 7fbc7de7c22e59bfcf5185796759ea3c76a2a67a
Author: Translation commit bot 
Date:   Fri Apr 14 02:17:10 2017 +

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

diff --git a/sv/brand.dtd b/sv/brand.dtd
index c04310a..4c1fb69 100644
--- a/sv/brand.dtd
+++ b/sv/brand.dtd
@@ -4,9 +4,9 @@
 
 
 
-
+
 
-
+
 
 
 

___
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

2017-04-13 Thread translation

commit 772db0507edfcf8fc258547c9e6da8677cd1e0aa
Author: Translation commit bot 
Date:   Fri Apr 14 02:16:53 2017 +

Update translations for tails-misc_completed
---
 sv.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sv.po b/sv.po
index ed8a560..1a07918 100644
--- a/sv.po
+++ b/sv.po
@@ -22,8 +22,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-06 21:07+0200\n"
-"PO-Revision-Date: 2017-04-07 10:06+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2017-04-14 02:14+\n"
+"Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +37,7 @@ msgstr "Tor Ã¤r redo"
 
 #: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40
 msgid "You can now access the Internet."
-msgstr "Du kan nu nÃ¥ Internet."
+msgstr "Du har nu tillgÃ¥ng till internet."
 
 #: config/chroot_local-includes/etc/whisperback/config.py:65
 #, python-format
@@ -54,18 +54,18 @@ msgid ""
 "an opportunity for eavesdroppers, like your email or Internet provider, to\n"
 "confirm that you are using Tails.\n"
 "\n"
-msgstr "HjÃ¤lp oss att fixa din bugg!\nLÃ¤s vÃ¥ra 
instruktioner fÃ¶r att rapportera buggar.\nInkludera inte 
mer personlig information Ã¤n nÃ¶dvÃ¤ndigt!\nOm att ge oss din 
e-postadress\n\nAtt ge oss din e-postadress gÃ¶r det mÃ¶jligt fÃ¶r oss 
att komma i kontakt med dig fÃ¶r att reda ut problemet. Det hÃ¤r Ã¤r 
nÃ¶dvÃ¤ndigt fÃ¶r den stora majoriteten av rapporterna vi tar emot eftersom att 
de flesta rapporter utan kontaktinformation Ã¤r oanvÃ¤ndbara. Ã andra sidan 
ger det ocksÃ¥ en mÃ¶jlighet fÃ¶r obehÃ¶riga, som din e-post- eller 
InternetleverantÃ¶r, att bekrÃ¤fta att du anvÃ¤nder Tails.\n\n"
+msgstr "HjÃ¤lp oss att fixa ditt fel!\nLÃ¤s vÃ¥ra 
instruktioner fÃ¶r att rapportera fel.\nInkludera inte mer 
personlig information Ã¤n nÃ¶dvÃ¤ndigt!\nOm att ge oss din 
e-postadress\n\nAtt ge oss din e-postadress gÃ¶r det mÃ¶jligt fÃ¶r oss 
att komma i kontakt med dig fÃ¶r att reda ut problemet. Det hÃ¤r Ã¤r 
nÃ¶dvÃ¤ndigt fÃ¶r den stora majoriteten av rapporterna vi tar emot eftersom att 
de flesta rapporter utan kontaktinformation Ã¤r oanvÃ¤ndbara. Ã andra sidan 
ger det ocksÃ¥ en mÃ¶jlighet fÃ¶r obehÃ¶riga, som din e-post- eller 
InternetleverantÃ¶r, att bekrÃ¤fta att du anvÃ¤nder Tails.\n\n"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:17
 msgid "Persistence is disabled for Electrum"
-msgstr "\"UthÃ¥llighet\" Ã¤r innaktiverat fÃ¶r bitcoin klienten Electrum"
+msgstr "\"UthÃ¥llighet\" Ã¤r avaktiverat fÃ¶r bitcoin-klienten Electrum"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:19
 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 "NÃ¤r du startar om Tails, fÃ¶rloras all data tillhÃ¶rande Electrum , 
inklusive Bitcoin plÃ¥nboken. Det rekommenderas starkt att bara kÃ¶ra Electrum 
nÃ¤r dess uthÃ¥llighet-funktion Ã¤r aktiverad."
+msgstr "NÃ¤r du startar om Tails, fÃ¶rloras all data tillhÃ¶rande Electrum , 
inklusive Bitcoin-plÃ¥nboken. Det rekommenderas starkt att bara kÃ¶ra Electrum 
nÃ¤r dess uthÃ¥llighetsfunktion Ã¤r aktiverad."
 
 #: config/chroot_local-includes/usr/local/bin/electrum:21
 msgid "Do you want to start Electrum anyway?"

___
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

2017-04-13 Thread translation

commit 2f0129fe73c5ca63df5a027ecb6ea4af824907d6
Author: Translation commit bot 
Date:   Fri Apr 14 02:16:49 2017 +

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

diff --git a/sv.po b/sv.po
index ed8a560..1a07918 100644
--- a/sv.po
+++ b/sv.po
@@ -22,8 +22,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-06 21:07+0200\n"
-"PO-Revision-Date: 2017-04-07 10:06+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2017-04-14 02:14+\n"
+"Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +37,7 @@ msgstr "Tor Ã¤r redo"
 
 #: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40
 msgid "You can now access the Internet."
-msgstr "Du kan nu nÃ¥ Internet."
+msgstr "Du har nu tillgÃ¥ng till internet."
 
 #: config/chroot_local-includes/etc/whisperback/config.py:65
 #, python-format
@@ -54,18 +54,18 @@ msgid ""
 "an opportunity for eavesdroppers, like your email or Internet provider, to\n"
 "confirm that you are using Tails.\n"
 "\n"
-msgstr "HjÃ¤lp oss att fixa din bugg!\nLÃ¤s vÃ¥ra 
instruktioner fÃ¶r att rapportera buggar.\nInkludera inte 
mer personlig information Ã¤n nÃ¶dvÃ¤ndigt!\nOm att ge oss din 
e-postadress\n\nAtt ge oss din e-postadress gÃ¶r det mÃ¶jligt fÃ¶r oss 
att komma i kontakt med dig fÃ¶r att reda ut problemet. Det hÃ¤r Ã¤r 
nÃ¶dvÃ¤ndigt fÃ¶r den stora majoriteten av rapporterna vi tar emot eftersom att 
de flesta rapporter utan kontaktinformation Ã¤r oanvÃ¤ndbara. Ã andra sidan 
ger det ocksÃ¥ en mÃ¶jlighet fÃ¶r obehÃ¶riga, som din e-post- eller 
InternetleverantÃ¶r, att bekrÃ¤fta att du anvÃ¤nder Tails.\n\n"
+msgstr "HjÃ¤lp oss att fixa ditt fel!\nLÃ¤s vÃ¥ra 
instruktioner fÃ¶r att rapportera fel.\nInkludera inte mer 
personlig information Ã¤n nÃ¶dvÃ¤ndigt!\nOm att ge oss din 
e-postadress\n\nAtt ge oss din e-postadress gÃ¶r det mÃ¶jligt fÃ¶r oss 
att komma i kontakt med dig fÃ¶r att reda ut problemet. Det hÃ¤r Ã¤r 
nÃ¶dvÃ¤ndigt fÃ¶r den stora majoriteten av rapporterna vi tar emot eftersom att 
de flesta rapporter utan kontaktinformation Ã¤r oanvÃ¤ndbara. Ã andra sidan 
ger det ocksÃ¥ en mÃ¶jlighet fÃ¶r obehÃ¶riga, som din e-post- eller 
InternetleverantÃ¶r, att bekrÃ¤fta att du anvÃ¤nder Tails.\n\n"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:17
 msgid "Persistence is disabled for Electrum"
-msgstr "\"UthÃ¥llighet\" Ã¤r innaktiverat fÃ¶r bitcoin klienten Electrum"
+msgstr "\"UthÃ¥llighet\" Ã¤r avaktiverat fÃ¶r bitcoin-klienten Electrum"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:19
 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 "NÃ¤r du startar om Tails, fÃ¶rloras all data tillhÃ¶rande Electrum , 
inklusive Bitcoin plÃ¥nboken. Det rekommenderas starkt att bara kÃ¶ra Electrum 
nÃ¤r dess uthÃ¥llighet-funktion Ã¤r aktiverad."
+msgstr "NÃ¤r du startar om Tails, fÃ¶rloras all data tillhÃ¶rande Electrum , 
inklusive Bitcoin-plÃ¥nboken. Det rekommenderas starkt att bara kÃ¶ra Electrum 
nÃ¤r dess uthÃ¥llighetsfunktion Ã¤r aktiverad."
 
 #: config/chroot_local-includes/usr/local/bin/electrum:21
 msgid "Do you want to start Electrum anyway?"

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

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

2017-04-13 Thread translation

commit cd031d1f4aebb8023335229419db3d1b7117ad00
Author: Translation commit bot 
Date:   Fri Apr 14 02:16:08 2017 +

Update translations for tails-greeter_completed
---
 sv/sv.po | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index 4fa4215..9529ea3 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -3,18 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Anders Nilsson , 2015
+# Anders Nilsson , 2015
 # Gabor Sebastiani, 2014
-# leveebreaks, 2014
+# Jonatan Nyberg , 2017
+# Isis, 2014
 # WinterFairy , 2013
 # WinterFairy , 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2017-01-12 13:32+0100\n"
+"PO-Revision-Date: 2017-04-14 02:08+\n"
+"Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +37,7 @@ msgstr "VÃ¤lkommen till Tails"
 
 #: ../glade/persistencewindow.glade.h:4
 msgid "Use persistence?"
-msgstr "AnvÃ¤nd bestÃ¥ende lagring?"
+msgstr "AnvÃ¤nd bestÃ¥ende?"
 
 #: ../glade/persistencewindow.glade.h:5
 msgid "Documentation"
@@ -150,7 +151,7 @@ msgstr "Inaktivera alla nÃ¤tverk"
 msgid " "
 msgstr " "
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
+#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
 msgid "Language"
 msgstr "SprÃ¥k"
 
@@ -185,7 +186,7 @@ msgid ""
 "%(stderr)s"
 msgstr "live-persist misslyckades med felkod 
%(returncode)s:\n%(stdout)s\n%(stderr)s"
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
+#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
+#: ../tailsgreeter/langpanel.py:202
 msgid "Other..."
 msgstr "Annat..."

___
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

2017-04-13 Thread translation

commit d2189af944f5137e8d342adfdc08134c4e186915
Author: Translation commit bot 
Date:   Fri Apr 14 02:16:45 2017 +

Update translations for tor-launcher-network-settings_completed
---
 sv/network-settings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv/network-settings.dtd b/sv/network-settings.dtd
index 5975310..0648ead 100644
--- a/sv/network-settings.dtd
+++ b/sv/network-settings.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [translation/mat-gui_completed] Update translations for mat-gui_completed

2017-04-13 Thread translation

commit d694b20a8cb9041b71b1912c1ca252e0f33c091e
Author: Translation commit bot 
Date:   Fri Apr 14 02:16:23 2017 +

Update translations for mat-gui_completed
---
 sv.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sv.po b/sv.po
index 0d84da1..088f0fb 100644
--- a/sv.po
+++ b/sv.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Anders Nilsson , 2015
-# Dan Berg , 2013
+# Daniel SjÃ¶berg , 2013
 # Foo Bar, 2014
 # Henry Blom , 2015
 # Jimmy JÃ¤gerstrÃ¶m, 2013
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-10 23:06+0100\n"
-"PO-Revision-Date: 2016-06-10 07:19+\n"
-"Last-Translator: T \n"
+"PO-Revision-Date: 2017-04-14 02:04+\n"
+"Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,7 +64,7 @@ msgstr "Ta bort dina metadata, behÃ¥ll dina data"
 
 #: mat-gui:192
 msgid "Website"
-msgstr "Webbsida"
+msgstr "Webbplats"
 
 #: mat-gui:219
 msgid "Preferences"

___
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

2017-04-13 Thread translation

commit 5f73004c0fbd1286199e6dd09b013dd9d74e6bb1
Author: Translation commit bot 
Date:   Fri Apr 14 02:16:41 2017 +

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

diff --git a/sv/network-settings.dtd b/sv/network-settings.dtd
index 5975310..0648ead 100644
--- a/sv/network-settings.dtd
+++ b/sv/network-settings.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [translation/mat-gui] Update translations for mat-gui

2017-04-13 Thread translation

commit b751691dd1cdf26bfc3c9c3c2a826fc2398e66fe
Author: Translation commit bot 
Date:   Fri Apr 14 02:16:20 2017 +

Update translations for mat-gui
---
 sv.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sv.po b/sv.po
index 0d84da1..088f0fb 100644
--- a/sv.po
+++ b/sv.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Anders Nilsson , 2015
-# Dan Berg , 2013
+# Daniel SjÃ¶berg , 2013
 # Foo Bar, 2014
 # Henry Blom , 2015
 # Jimmy JÃ¤gerstrÃ¶m, 2013
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-10 23:06+0100\n"
-"PO-Revision-Date: 2016-06-10 07:19+\n"
-"Last-Translator: T \n"
+"PO-Revision-Date: 2017-04-14 02:04+\n"
+"Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,7 +64,7 @@ msgstr "Ta bort dina metadata, behÃ¥ll dina data"
 
 #: mat-gui:192
 msgid "Website"
-msgstr "Webbsida"
+msgstr "Webbplats"
 
 #: mat-gui:219
 msgid "Preferences"

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

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

2017-04-13 Thread translation

commit d284ea14f5977b46cce45e62824f42a35b65913f
Author: Translation commit bot 
Date:   Fri Apr 14 02:16:03 2017 +

Update translations for tails-greeter
---
 sv/sv.po | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index 4fa4215..9529ea3 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -3,18 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Anders Nilsson , 2015
+# Anders Nilsson , 2015
 # Gabor Sebastiani, 2014
-# leveebreaks, 2014
+# Jonatan Nyberg , 2017
+# Isis, 2014
 # WinterFairy , 2013
 # WinterFairy , 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2017-01-12 13:32+0100\n"
+"PO-Revision-Date: 2017-04-14 02:08+\n"
+"Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +37,7 @@ msgstr "VÃ¤lkommen till Tails"
 
 #: ../glade/persistencewindow.glade.h:4
 msgid "Use persistence?"
-msgstr "AnvÃ¤nd bestÃ¥ende lagring?"
+msgstr "AnvÃ¤nd bestÃ¥ende?"
 
 #: ../glade/persistencewindow.glade.h:5
 msgid "Documentation"
@@ -150,7 +151,7 @@ msgstr "Inaktivera alla nÃ¤tverk"
 msgid " "
 msgstr " "
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
+#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
 msgid "Language"
 msgstr "SprÃ¥k"
 
@@ -185,7 +186,7 @@ msgid ""
 "%(stderr)s"
 msgstr "live-persist misslyckades med felkod 
%(returncode)s:\n%(stdout)s\n%(stderr)s"
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
+#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
+#: ../tailsgreeter/langpanel.py:202
 msgid "Other..."
 msgstr "Annat..."

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

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

2017-04-13 Thread translation

commit 32bb40a3da7148e5432dfd23ed0362a47df49cc3
Author: Translation commit bot 
Date:   Fri Apr 14 02:15:50 2017 +

Update translations for liveusb-creator_completed
---
 sv/sv.po | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index b78bd77..b06cf8f 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -3,21 +3,22 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Anders Nilsson , 2015
+# Anders Nilsson , 2015
 # cryptohead , 2013
 # Foorack , 2015
 # Gabor Sebastiani, 2014
 # GÃ¶ran Uddeborg , 2010
+# Jonatan Nyberg , 2017
 # Mikael Hiort af OrnÃ¤s , 2013
-# leveebreaks, 2014
+# Isis, 2014
 # WinterFairy , 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2016-03-21 16:31+\n"
-"Last-Translator: Anders Nilsson \n"
+"PO-Revision-Date: 2017-04-14 02:09+\n"
+"Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,7 +42,7 @@ msgstr "%(distribution)s Installerare"
 #: ../liveusb/gui.py:804
 #, python-format
 msgid "%(filename)s selected"
-msgstr "%(filename)s vald"
+msgstr "%(filename)s valda"
 
 #: ../liveusb/gui.py:424
 #, python-format

___
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

2017-04-13 Thread translation

commit 81d0990c963fe46f6dc55f1944049566c3ce3c9a
Author: Translation commit bot 
Date:   Fri Apr 14 02:15:55 2017 +

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

diff --git a/sv/sv.po b/sv/sv.po
index 2240e2c..1f5b20d 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -6,9 +6,10 @@
 # Anders Nilsson , 2016
 # Anders Nilsson , 2015
 # Filip Nyquist , 2015
-# Michael CavÃ©n, 2014
-# phst , 2014
-# leveebreaks, 2014
+# Jonatan Nyberg , 2017
+# miccav, 2014
+# phst, 2014
+# Isis, 2014
 # WinterFairy , 2013
 # WinterFairy , 2013
 msgid ""
@@ -16,8 +17,8 @@ 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-06-06 08:15+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2017-04-14 02:12+\n"
+"Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,11 +40,11 @@ msgstr "GnuPG"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:60
 msgid "GnuPG keyrings and configuration"
-msgstr "Nyckelringar och konfiguration fÃ¶r GnuPG"
+msgstr "GnuPG nyckelringar och konfiguration"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:68
 msgid "SSH Client"
-msgstr "SSH klient"
+msgstr "SSH-klient"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:70
 msgid "SSH keys, configuration and known hosts"

___
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

2017-04-13 Thread translation

commit 175919666ee1826c3c3bd18d54adfd8a76fb0ec8
Author: Translation commit bot 
Date:   Fri Apr 14 02:15:59 2017 +

Update translations for tails-persistence-setup_completed
---
 sv/sv.po | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index 2240e2c..1f5b20d 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -6,9 +6,10 @@
 # Anders Nilsson , 2016
 # Anders Nilsson , 2015
 # Filip Nyquist , 2015
-# Michael CavÃ©n, 2014
-# phst , 2014
-# leveebreaks, 2014
+# Jonatan Nyberg , 2017
+# miccav, 2014
+# phst, 2014
+# Isis, 2014
 # WinterFairy , 2013
 # WinterFairy , 2013
 msgid ""
@@ -16,8 +17,8 @@ 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-06-06 08:15+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2017-04-14 02:12+\n"
+"Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,11 +40,11 @@ msgstr "GnuPG"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:60
 msgid "GnuPG keyrings and configuration"
-msgstr "Nyckelringar och konfiguration fÃ¶r GnuPG"
+msgstr "GnuPG nyckelringar och konfiguration"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:68
 msgid "SSH Client"
-msgstr "SSH klient"
+msgstr "SSH-klient"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:70
 msgid "SSH keys, configuration and known hosts"

___
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

2017-04-13 Thread translation

commit 06ced3251eabe60852974cf1213988b03f12f7a1
Author: Translation commit bot 
Date:   Fri Apr 14 02:15:41 2017 +

Update translations for https_everywhere_completed
---
 sv/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd
index 6797ded..295bb35 100644
--- a/sv/https-everywhere.dtd
+++ b/sv/https-everywhere.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 

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

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

2017-04-13 Thread translation

commit 629306c549623262d2ea58742e71fd730611fa71
Author: Translation commit bot 
Date:   Fri Apr 14 02:15:46 2017 +

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

diff --git a/sv/sv.po b/sv/sv.po
index b78bd77..b06cf8f 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -3,21 +3,22 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Anders Nilsson , 2015
+# Anders Nilsson , 2015
 # cryptohead , 2013
 # Foorack , 2015
 # Gabor Sebastiani, 2014
 # GÃ¶ran Uddeborg , 2010
+# Jonatan Nyberg , 2017
 # Mikael Hiort af OrnÃ¤s , 2013
-# leveebreaks, 2014
+# Isis, 2014
 # WinterFairy , 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2016-03-21 16:31+\n"
-"Last-Translator: Anders Nilsson \n"
+"PO-Revision-Date: 2017-04-14 02:09+\n"
+"Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,7 +42,7 @@ msgstr "%(distribution)s Installerare"
 #: ../liveusb/gui.py:804
 #, python-format
 msgid "%(filename)s selected"
-msgstr "%(filename)s vald"
+msgstr "%(filename)s valda"
 
 #: ../liveusb/gui.py:424
 #, python-format

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

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

2017-04-13 Thread translation

commit 109b7ed058d466aeee7082ba0dbac1120fb87e50
Author: Translation commit bot 
Date:   Fri Apr 14 02:15:12 2017 +

Update translations for bridgedb_completed
---
 sv/LC_MESSAGES/bridgedb.po | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index 9fb91cb..a715119 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -6,19 +6,20 @@
 # Anders Jensen-Urstad , 2014
 # Emil Johansson , 2015
 # Gabor Sebastiani, 2014
+# Jonatan Nyberg , 2017
 # Peter Michanek , 2015
 # Petomatick , 2011
 # ph AA, 2015
-# phst , 2014
-# leveebreaks, 2014
+# phst, 2014
+# Isis, 2014
 # WinterFairy , 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
-"Last-Translator: Emil Johansson \n"
+"PO-Revision-Date: 2017-04-14 01:57+\n"
+"Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,7 +45,7 @@ msgstr "NÃ¥got gick tyvÃ¤rr fel med din fÃ¶rfrÃ¥gan."
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"
-msgstr "Rapportera en bugg"
+msgstr "Rapportera ett fel"
 
 #: bridgedb/https/templates/base.html:82
 msgid "Source Code"

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

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

2017-04-13 Thread translation

commit 934c8d144c513b1107b310be4f924bfbf60fe499
Author: Translation commit bot 
Date:   Fri Apr 14 02:15:04 2017 +

Update translations for bridgedb
---
 sv/LC_MESSAGES/bridgedb.po | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index 9fb91cb..a715119 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -6,19 +6,20 @@
 # Anders Jensen-Urstad , 2014
 # Emil Johansson , 2015
 # Gabor Sebastiani, 2014
+# Jonatan Nyberg , 2017
 # Peter Michanek , 2015
 # Petomatick , 2011
 # ph AA, 2015
-# phst , 2014
-# leveebreaks, 2014
+# phst, 2014
+# Isis, 2014
 # WinterFairy , 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
-"Last-Translator: Emil Johansson \n"
+"PO-Revision-Date: 2017-04-14 01:57+\n"
+"Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,7 +45,7 @@ msgstr "NÃ¥got gick tyvÃ¤rr fel med din fÃ¶rfrÃ¥gan."
 
 #: bridgedb/https/templates/base.html:79
 msgid "Report a Bug"
-msgstr "Rapportera en bugg"
+msgstr "Rapportera ett fel"
 
 #: bridgedb/https/templates/base.html:82
 msgid "Source Code"

___
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

2017-04-13 Thread translation

commit 2d55c3f4b6fe67d45e58929fd1d4b44c5281e421
Author: Translation commit bot 
Date:   Fri Apr 14 02:15:35 2017 +

Update translations for https_everywhere
---
 sv/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd
index 6797ded..295bb35 100644
--- a/sv/https-everywhere.dtd
+++ b/sv/https-everywhere.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 

___
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

2017-04-13 Thread translation

commit fd7ec6558f1b89046b6caaea9f56227214b753cf
Author: Translation commit bot 
Date:   Fri Apr 14 02:15:21 2017 +

Update translations for torcheck_completed
---
 sv/torcheck.po | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sv/torcheck.po b/sv/torcheck.po
index 0c1b2a5..4467c9d 100644
--- a/sv/torcheck.po
+++ b/sv/torcheck.po
@@ -3,19 +3,20 @@
 # 
 # Translators:
 # Emil Johansson , 2015
+# Jonatan Nyberg , 2017
 # mathiasfriman4896b3d1564846bb , 2012
 # Petomatick , 2011
 # ph AA, 2015
-# phst , 2014-2015
-# leveebreaks, 2014
+# phst, 2014-2015
+# Isis, 2014
 # WinterFairy , 2013
 # WinterFairy , 2013-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: phst \n"
+"PO-Revision-Date: 2017-04-14 01:55+\n"
+"Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +32,7 @@ msgid ""
 "Please refer to the https://www.torproject.org/\;>Tor website "
 "for further information about using Tor safely.  You are now free to browse "
 "the Internet anonymously."
-msgstr "BesÃ¶k https://www.torproject.org/\;>webbplatsen fÃ¶r 
Tor fÃ¶r mer information om hur du anvÃ¤nder Tor sÃ¤kert.  Du kan nu surfa 
pÃ¥ nÃ¤tet anonymt."
+msgstr "BesÃ¶k https://www.torproject.org/\;>Tor webbplatsen 
fÃ¶r mer information om hur du anvÃ¤nder Tor sÃ¤kert.  Du kan nu surfa pÃ¥ 
nÃ¤tet anonymt."
 
 msgid "There is a security update available for Tor Browser."
 msgstr "Det finns en tillgÃ¤nglig uppdatering fÃ¶r Tor webblÃ¤sare."

___
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

2017-04-13 Thread translation

commit 1f2cb60b172bee58974585a21b8d34475807c4ba
Author: Translation commit bot 
Date:   Fri Apr 14 02:15:17 2017 +

Update translations for torcheck
---
 sv/torcheck.po | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sv/torcheck.po b/sv/torcheck.po
index 0c1b2a5..4467c9d 100644
--- a/sv/torcheck.po
+++ b/sv/torcheck.po
@@ -3,19 +3,20 @@
 # 
 # Translators:
 # Emil Johansson , 2015
+# Jonatan Nyberg , 2017
 # mathiasfriman4896b3d1564846bb , 2012
 # Petomatick , 2011
 # ph AA, 2015
-# phst , 2014-2015
-# leveebreaks, 2014
+# phst, 2014-2015
+# Isis, 2014
 # WinterFairy , 2013
 # WinterFairy , 2013-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: phst \n"
+"PO-Revision-Date: 2017-04-14 01:55+\n"
+"Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +32,7 @@ msgid ""
 "Please refer to the https://www.torproject.org/\;>Tor website "
 "for further information about using Tor safely.  You are now free to browse "
 "the Internet anonymously."
-msgstr "BesÃ¶k https://www.torproject.org/\;>webbplatsen fÃ¶r 
Tor fÃ¶r mer information om hur du anvÃ¤nder Tor sÃ¤kert.  Du kan nu surfa 
pÃ¥ nÃ¤tet anonymt."
+msgstr "BesÃ¶k https://www.torproject.org/\;>Tor webbplatsen 
fÃ¶r mer information om hur du anvÃ¤nder Tor sÃ¤kert.  Du kan nu surfa pÃ¥ 
nÃ¤tet anonymt."
 
 msgid "There is a security update available for Tor Browser."
 msgstr "Det finns en tillgÃ¤nglig uppdatering fÃ¶r Tor webblÃ¤sare."

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

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

2017-04-13 Thread translation

commit 86a7d4327be650cc96412ca086b8b3ba6e96d517
Author: Translation commit bot 
Date:   Fri Apr 14 02:15:26 2017 +

Update translations for whisperback
---
 sv/sv.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sv/sv.po b/sv/sv.po
index 35a1150..86e986b 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # cryptohead , 2013
+# Jonatan Nyberg , 2017
 # Isis, 2014
 # WinterFairy , 2013
 msgid ""
@@ -11,8 +12,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-20 12:09+\n"
-"PO-Revision-Date: 2017-03-21 08:24+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2017-04-14 01:59+\n"
+"Last-Translator: Jonatan Nyberg \n"
 "Language-Team: Swedish 
(http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,7 +34,7 @@ msgstr "Ogiltig OpenPGP-nyckel: %s"
 
 #: ../whisperBack/whisperback.py:75
 msgid "Invalid contact OpenPGP public key block"
-msgstr "Ogiltigt OpenPGP publikt nyckel-block"
+msgstr "Ogiltig OpenPGP publikt nyckel block"
 
 #: ../whisperBack/exceptions.py:41
 #, python-format

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

[tor-commits] [tor/master] hs: Make the service list pruning function public

2017-04-13 Thread nickm

commit 0565f5a3bb19cf1027de2093ba2fbaf7b937e2fb
Author: David Goulet 
Date:   Thu Jan 12 10:46:15 2017 -0500

hs: Make the service list pruning function public

The reason for making the temporary list public is to keep it encapsulated 
in
the rendservice subsystem so the prop224 code does not have direct access to
it and can only affect it through the rendservice pruning function.

It also has been modified to not take list as arguments but rather use the
global lists (main and temporary ones) because prop224 code will call it to
actually prune the rendservice's lists. The function does the needed 
rotation
of pointers between those lists and then prune if needed.

In order to make the unit test work and not completely horrible, there is a
"impl_" version of the function that doesn't free memory, it simply moves
pointers around. It is directly used in the unit test and two setter 
functions
for those lists' pointer have been added only for unit test.

Signed-off-by: David Goulet 
---
 src/or/rendservice.c | 122 +++
 src/or/rendservice.h |  12 +++--
 src/test/test_hs.c   |  20 ++---
 3 files changed, 107 insertions(+), 47 deletions(-)

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 9d4dc5b..3c4b677 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -106,9 +106,12 @@ static const char *hostname_fname = "hostname";
 static const char *client_keys_fname = "client_keys";
 static const char *sos_poison_fname = "onion_service_non_anonymous";
 
-/** A list of rend_service_t's for services run on this OP.
- */
+/** A list of rend_service_t's for services run on this OP. */
 static smartlist_t *rend_service_list = NULL;
+/** A list of rend_service_t's for services run on this OP which is used as a
+ * staging area before they are put in the main list in order to prune dying
+ * service on config reload. */
+static smartlist_t *rend_service_staging_list = NULL;
 
 /* Like rend_get_service_list_mutable, but returns a read-only list. */
 static const smartlist_t*
@@ -520,18 +523,34 @@ rend_service_check_dir_and_add(smartlist_t *service_list,
   return rend_add_service(s_list, service);
 }
 
-/* If this is a reload and there were hidden services configured before,
- * keep the introduction points that are still needed and close the
- * other ones. */
+/* Helper: Actual implementation of the pruning on reload which we've
+ * decoupled in order to make the unit test workeable without ugly hacks.
+ * Furthermore, this function does NOT free any memory but will nullify the
+ * temporary list pointer whatever happens. */
 STATIC void
-prune_services_on_reload(smartlist_t *old_service_list,
- smartlist_t *new_service_list)
+rend_service_prune_list_impl_(void)
 {
   origin_circuit_t *ocirc = NULL;
-  smartlist_t *surviving_services = NULL;
+  smartlist_t *surviving_services, *old_service_list, *new_service_list;
+
+  /* When pruning our current service list, we must have a staging list that
+   * contains what we want to check else it's a code flow error. */
+  tor_assert(rend_service_staging_list);
 
-  tor_assert(old_service_list);
-  tor_assert(new_service_list);
+  /* We are about to prune the current list of its dead service so set the
+   * semantic for that list to be the "old" one. */
+  old_service_list = rend_service_list;
+  /* The staging list is now the "new" list so set this semantic. */
+  new_service_list = rend_service_staging_list;
+  /* After this, whatever happens, we'll use our new list. */
+  rend_service_list = new_service_list;
+  /* Finally, nullify the staging list pointer as we don't need it anymore
+   * and it needs to be NULL before the next reload. */
+  rend_service_staging_list = NULL;
+  /* Nothing to prune if we have no service list so stop right away. */
+  if (!old_service_list) {
+return;
+  }
 
   /* This contains all _existing_ services that survives the relaod that is
* that haven't been removed from the configuration. The difference between
@@ -609,6 +628,27 @@ prune_services_on_reload(smartlist_t *old_service_list,
   smartlist_free(surviving_services);
 }
 
+/* Try to prune our main service list using the temporary one that we just
+ * loaded and parsed successfully. The pruning process decides which onion
+ * services to keep and which to discard after a reload. */
+void
+rend_service_prune_list(void)
+{
+  smartlist_t *old_service_list = rend_service_list;
+  /* Don't try to prune anything if we have no staging list. */
+  if (!rend_service_staging_list) {
+return;
+  }
+  rend_service_prune_list_impl_();
+  if (old_service_list) {
+/* Every remaining service in the old list have been removed from the
+ * configuration so clean them up safely. */
+SMARTLIST_FOREACH(old_service_list, rend_service_t *, s,
+

[tor-commits] [tor/master] hs: Remove redundant define of ed25519 auth key type

2017-04-13 Thread nickm

commit c71670262506cfe75bb439928ce2da2b1ebd30c4
Author: David Goulet 
Date:   Thu Dec 22 16:59:18 2016 -0500

hs: Remove redundant define of ed25519 auth key type

Signed-off-by: David Goulet 
---
 src/or/hs_common.h | 3 ---
 src/or/hs_intropoint.c | 4 ++--
 src/or/hs_service.c| 4 +++-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/or/hs_common.h b/src/or/hs_common.h
index 890797c..400345c 100644
--- a/src/or/hs_common.h
+++ b/src/or/hs_common.h
@@ -17,9 +17,6 @@
 /* Version 3 of the protocol (prop224). */
 #define HS_VERSION_THREE 3
 
-/* Denotes ed25519 authentication key on ESTABLISH_INTRO cell. */
-#define AUTH_KEY_ED25519 0x02
-
 /* String prefix for the signature of ESTABLISH_INTRO */
 #define ESTABLISH_INTRO_SIG_PREFIX "Tor establish-intro cell v1"
 
diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c
index a7282ab..168a89b 100644
--- a/src/or/hs_intropoint.c
+++ b/src/or/hs_intropoint.c
@@ -73,9 +73,9 @@ verify_establish_intro_cell(const hs_cell_establish_intro_t 
*cell,
 size_t circuit_key_material_len)
 {
   /* We only reach this function if the first byte of the cell is 0x02 which
-   * means that auth_key_type is AUTH_KEY_ED25519, hence this check should
+   * means that auth_key_type is of ed25519 type, hence this check should
* always pass. See hs_intro_received_establish_intro().  */
-  if (BUG(cell->auth_key_type != AUTH_KEY_ED25519)) {
+  if (BUG(cell->auth_key_type != HS_INTRO_AUTH_KEY_TYPE_ED25519)) {
 return -1;
   }
 
diff --git a/src/or/hs_service.c b/src/or/hs_service.c
index 52de2bf..5d69a1d 100644
--- a/src/or/hs_service.c
+++ b/src/or/hs_service.c
@@ -12,6 +12,7 @@
 #include "circuitlist.h"
 #include "circpathbias.h"
 
+#include "hs_intropoint.h"
 #include "hs_service.h"
 #include "hs_common.h"
 
@@ -75,7 +76,8 @@ generate_establish_intro_cell(const uint8_t 
*circuit_key_material,
   cell = hs_cell_establish_intro_new();
 
   /* Set AUTH_KEY_TYPE: 2 means ed25519 */
-  hs_cell_establish_intro_set_auth_key_type(cell, AUTH_KEY_ED25519);
+  hs_cell_establish_intro_set_auth_key_type(cell,
+HS_INTRO_AUTH_KEY_TYPE_ED25519);
 
   /* Set AUTH_KEY_LEN field */
   /* Must also set byte-length of AUTH_KEY to match */



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

[tor-commits] [tor/master] hs: Move service check private dir to hs_common.c

2017-04-13 Thread nickm

commit 419c0c07881c71050546c1049173a7eadf936799
Author: David Goulet 
Date:   Thu Dec 22 16:40:21 2016 -0500

hs: Move service check private dir to hs_common.c

Another building blocks for prop224 service work. This also makes the 
function
takes specific argument instead of the or_option_t object.

Signed-off-by: David Goulet 
---
 src/or/hs_common.c   | 34 ++
 src/or/hs_common.h   |  4 
 src/or/rendservice.c | 35 ---
 3 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/src/or/hs_common.c b/src/or/hs_common.c
index 7e0b6ca..4af3081 100644
--- a/src/or/hs_common.c
+++ b/src/or/hs_common.c
@@ -16,6 +16,40 @@
 #include "hs_common.h"
 #include "rendcommon.h"
 
+/* Make sure that the directory for service is private, using the config
+ * username.
+ * If create is true:
+ *  - if the directory exists, change permissions if needed,
+ *  - if the directory does not exist, create it with the correct permissions.
+ * If create is false:
+ *  - if the directory exists, check permissions,
+ *  - if the directory does not exist, check if we think we can create it.
+ * Return 0 on success, -1 on failure. */
+int
+hs_check_service_private_dir(const char *username, const char *path,
+ unsigned int dir_group_readable,
+ unsigned int create)
+{
+  cpd_check_t check_opts = CPD_NONE;
+
+  tor_assert(path);
+
+  if (create) {
+check_opts |= CPD_CREATE;
+  } else {
+check_opts |= CPD_CHECK_MODE_ONLY;
+check_opts |= CPD_CHECK;
+  }
+  if (dir_group_readable) {
+check_opts |= CPD_GROUP_READ;
+  }
+  /* Check/create directory */
+  if (check_private_dir(path, check_opts, username) < 0) {
+return -1;
+  }
+  return 0;
+}
+
 /* Create a new rend_data_t for a specific given version.
  * Return a pointer to the newly allocated data structure. */
 static rend_data_t *
diff --git a/src/or/hs_common.h b/src/or/hs_common.h
index 7ac2a15..890797c 100644
--- a/src/or/hs_common.h
+++ b/src/or/hs_common.h
@@ -23,6 +23,10 @@
 /* String prefix for the signature of ESTABLISH_INTRO */
 #define ESTABLISH_INTRO_SIG_PREFIX "Tor establish-intro cell v1"
 
+int hs_check_service_private_dir(const char *username, const char *path,
+ unsigned int dir_group_readable,
+ unsigned int create);
+
 void rend_data_free(rend_data_t *data);
 rend_data_t *rend_data_dup(const rend_data_t *data);
 rend_data_t *rend_data_client_create(const char *onion_address,
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index ac231c2..6b40ed9 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -76,9 +76,6 @@ static ssize_t rend_service_parse_intro_for_v3(
 static int rend_service_check_private_dir(const or_options_t *options,
   const rend_service_t *s,
   int create);
-static int rend_service_check_private_dir_impl(const or_options_t *options,
-   const rend_service_t *s,
-   int create);
 static const smartlist_t* rend_get_service_list(
   const smartlist_t* substitute_service_list);
 static smartlist_t* rend_get_service_list_mutable(
@@ -1294,7 +1291,8 @@ poison_new_single_onion_hidden_service_dir_impl(const 
rend_service_t *service,
   }
 
   /* Make sure the directory was created before calling this function. */
-  if (BUG(rend_service_check_private_dir_impl(options, service, 0) < 0))
+  if (BUG(hs_check_service_private_dir(options->User, service->directory,
+   service->dir_group_readable, 0) < 0))
 return -1;
 
   poison_fname = rend_service_sos_poison_path(service);
@@ -1444,32 +1442,6 @@ rend_service_derive_key_digests(struct rend_service_t *s)
   return 0;
 }
 
-/* Implements the directory check from rend_service_check_private_dir,
- * without doing the single onion poison checks. */
-static int
-rend_service_check_private_dir_impl(const or_options_t *options,
-const rend_service_t *s,
-int create)
-{
-  cpd_check_t  check_opts = CPD_NONE;
-  if (create) {
-check_opts |= CPD_CREATE;
-  } else {
-check_opts |= CPD_CHECK_MODE_ONLY;
-check_opts |= CPD_CHECK;
-  }
-  if (s->dir_group_readable) {
-check_opts |= CPD_GROUP_READ;
-  }
-  /* Check/create directory */
-  if (check_private_dir(s->directory, check_opts, options->User) < 0) {
-log_warn(LD_REND, "Checking service directory %s failed.", s->directory);
-return -1;
-  }
-
-  return 0;
-}
-
 /** Make sure that the directory for s is private, using the config in
  * options.
  * If create is true:
@@ -1490,7 +1462,8 @@ rend_service_check_private_dir(const or_options_t 
*options,

[tor-commits] [tor/master] hs: Move common defines to hs_common.h

2017-04-13 Thread nickm

commit e7b7e99cc72e1db14bad471fef69729bdc5eea94
Author: David Goulet 
Date:   Thu Dec 22 17:01:07 2016 -0500

hs: Move common defines to hs_common.h

Some of those defines will be used by the v3 HS protocol so move them to a
common header out of rendservice.c. This is also ground work for prop224
service implementation.

Signed-off-by: David Goulet 
---
 src/or/hs_common.h   | 20 
 src/or/rendservice.c | 17 -
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/or/hs_common.h b/src/or/hs_common.h
index 400345c..d7d4228 100644
--- a/src/or/hs_common.h
+++ b/src/or/hs_common.h
@@ -17,6 +17,26 @@
 /* Version 3 of the protocol (prop224). */
 #define HS_VERSION_THREE 3
 
+/** Try to maintain this many intro points per service by default. */
+#define NUM_INTRO_POINTS_DEFAULT 3
+/** Maximum number of intro points per service. */
+#define NUM_INTRO_POINTS_MAX 10
+/** Number of extra intro points we launch if our set of intro nodes is empty.
+ * See proposal 155, section 4. */
+#define NUM_INTRO_POINTS_EXTRA 2
+
+/** If we can't build our intro circuits, don't retry for this long. */
+#define INTRO_CIRC_RETRY_PERIOD (60*5)
+/** Don't try to build more than this many circuits before giving up for a
+ * while.*/
+#define MAX_INTRO_CIRCS_PER_PERIOD 10
+/** How many times will a hidden service operator attempt to connect to a
+ * requested rendezvous point before giving up? */
+#define MAX_REND_FAILURES 1
+/** How many seconds should we spend trying to connect to a requested
+ * rendezvous point before giving up? */
+#define MAX_REND_TIMEOUT 30
+
 /* String prefix for the signature of ESTABLISH_INTRO */
 #define ESTABLISH_INTRO_SIG_PREFIX "Tor establish-intro cell v1"
 
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 6b40ed9..9d4dc5b 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -98,23 +98,6 @@ struct rend_service_port_config_s {
   char unix_addr[FLEXIBLE_ARRAY_MEMBER];
 };
 
-/** Try to maintain this many intro points per service by default. */
-#define NUM_INTRO_POINTS_DEFAULT 3
-/** Maximum number of intro points per service. */
-#define NUM_INTRO_POINTS_MAX 10
-/** Number of extra intro points we launch if our set of intro nodes is
- * empty. See proposal 155, section 4. */
-#define NUM_INTRO_POINTS_EXTRA 2
-
-/** If we can't build our intro circuits, don't retry for this long. */
-#define INTRO_CIRC_RETRY_PERIOD (60*5)
-/** How many times will a hidden service operator attempt to connect to
- * a requested rendezvous point before giving up? */
-#define MAX_REND_FAILURES 1
-/** How many seconds should we spend trying to connect to a requested
- * rendezvous point before giving up? */
-#define MAX_REND_TIMEOUT 30
-
 /* Hidden service directory file names:
  * new file names should be added to rend_service_add_filenames_to_list()
  * for sandboxing purposes. */



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

2017-04-13 Thread nickm

commit b081a7ed21ae729f6e195715e130edaca3e0b7fe
Merge: ba89520 0565f5a
Author: Nick Mathewson 
Date:   Thu Apr 13 16:43:13 2017 -0400

Merge branch 'ticket21891_031_01_squashed'

 src/or/hs_common.c |  34 ++
 src/or/hs_common.h |  25 ++-
 src/or/hs_intropoint.c |   4 +-
 src/or/hs_service.c|   4 +-
 src/or/rendservice.c   | 174 -
 src/or/rendservice.h   |  12 +++-
 src/test/test_hs.c |  20 --
 7 files changed, 173 insertions(+), 100 deletions(-)

diff --cc src/or/hs_service.c
index 71939e2,5d69a1d..205ef11
--- a/src/or/hs_service.c
+++ b/src/or/hs_service.c
@@@ -72,10 -73,11 +73,11 @@@ generate_establish_intro_cell(const uin
  goto err;
}
  
 -  cell = hs_cell_establish_intro_new();
 +  cell = trn_cell_establish_intro_new();
  
/* Set AUTH_KEY_TYPE: 2 means ed25519 */
-   trn_cell_establish_intro_set_auth_key_type(cell, AUTH_KEY_ED25519);
 -  hs_cell_establish_intro_set_auth_key_type(cell,
 -HS_INTRO_AUTH_KEY_TYPE_ED25519);
++  trn_cell_establish_intro_set_auth_key_type(cell,
++ HS_INTRO_AUTH_KEY_TYPE_ED25519);
  
/* Set AUTH_KEY_LEN field */
/* Must also set byte-length of AUTH_KEY to match */

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

[tor-commits] [tor-launcher/master] Translations update

2017-04-13 Thread gk

commit cd299eea7451d92fc7d47374d42080ec7b9712b1
Author: Georg Koppen 
Date:   Thu Apr 13 20:30:03 2017 +

Translations update
---
 src/chrome/locale/ar/network-settings.dtd  |  2 +-
 src/chrome/locale/bn/network-settings.dtd  |  2 +-
 src/chrome/locale/da/network-settings.dtd  | 52 +-
 src/chrome/locale/da/progress.dtd  |  8 ++--
 src/chrome/locale/da/torlauncher.properties| 18 -
 src/chrome/locale/es-MX/network-settings.dtd   |  2 +-
 src/chrome/locale/es/network-settings.dtd  | 28 +++---
 src/chrome/locale/es/torlauncher.properties|  4 +-
 src/chrome/locale/fil/progress.dtd |  2 +-
 src/chrome/locale/fil/torlauncher.properties   |  8 ++--
 src/chrome/locale/fr-CA/network-settings.dtd   |  4 +-
 src/chrome/locale/fr/network-settings.dtd  | 28 +++---
 src/chrome/locale/fr/torlauncher.properties|  6 +--
 src/chrome/locale/hr-HR/network-settings.dtd   |  4 +-
 src/chrome/locale/hr-HR/torlauncher.properties |  6 +--
 src/chrome/locale/it/network-settings.dtd  |  2 +-
 src/chrome/locale/lt/network-settings.dtd  | 22 +--
 src/chrome/locale/lt/torlauncher.properties| 20 +-
 src/chrome/locale/nb/network-settings.dtd  |  2 +-
 src/chrome/locale/pt/network-settings.dtd  | 14 +++
 src/chrome/locale/pt/progress.dtd  |  2 +-
 src/chrome/locale/pt/torlauncher.properties|  8 ++--
 src/chrome/locale/ru/network-settings.dtd  |  2 +-
 src/chrome/locale/sv/network-settings.dtd  |  2 +-
 src/chrome/locale/zh-CN/network-settings.dtd   |  2 +-
 25 files changed, 125 insertions(+), 125 deletions(-)

diff --git a/src/chrome/locale/ar/network-settings.dtd 
b/src/chrome/locale/ar/network-settings.dtd
index 73be5a2..a20acd8 100644
--- a/src/chrome/locale/ar/network-settings.dtd
+++ b/src/chrome/locale/ar/network-settings.dtd
@@ -1,4 +1,4 @@
-
+
 
 
 
diff --git a/src/chrome/locale/bn/network-settings.dtd 
b/src/chrome/locale/bn/network-settings.dtd
index a674a2c..5ebd2d0 100644
--- a/src/chrome/locale/bn/network-settings.dtd
+++ b/src/chrome/locale/bn/network-settings.dtd
@@ -1,4 +1,4 @@
-
+
 
 
 
diff --git a/src/chrome/locale/da/network-settings.dtd 
b/src/chrome/locale/da/network-settings.dtd
index aa32a1f..2851032 100644
--- a/src/chrome/locale/da/network-settings.dtd
+++ b/src/chrome/locale/da/network-settings.dtd
@@ -1,75 +1,75 @@
 
 
 
-
+
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
-
+
 
 
 
 
-
+
 
-
-
+
+
 
 
-
-
-
+
+
+
 
 
 
 
 
 
-
+
 
-
-
+
+
 
 
 
-
+
 
 
 
 
 
-
+
 
 
-
+
 
 
-
+
 
-
-
+
+
 
-
+
 
 
 
 
-
-
-
+
+
+
 https://bridges.torproject.org;>
-
-
+
+
 https://www.riseup.net, 
https://mail.google.com eller https://mail.yahoo.com;>
 
-
+
diff --git a/src/chrome/locale/da/progress.dtd 
b/src/chrome/locale/da/progress.dtd
index 2a8a41a..063ad85 100644
--- a/src/chrome/locale/da/progress.dtd
+++ b/src/chrome/locale/da/progress.dtd
@@ -1,4 +1,4 @@
-
-
-
-
+
+
+
+
diff --git a/src/chrome/locale/da/torlauncher.properties 
b/src/chrome/locale/da/torlauncher.properties
index 2ca0df2..e18d62f 100644
--- a/src/chrome/locale/da/torlauncher.properties
+++ b/src/chrome/locale/da/torlauncher.properties
@@ -4,31 +4,31 @@
 torlauncher.error_title=Tor starter
 
 torlauncher.tor_exited_during_startup=Tor lukkede under opstart. Det kan 
skyldes en fejl i din torrc-fil, en fejl i Tor eller et andet program pÃ¥ dit 
system, eller hardwarefejl. Tor Browser vil ikke starte, fÃ¸r du lÃ¸ser det 
underliggende problem og genstarter Tor.
-torlauncher.tor_exited=Tor lukkede uventet. Dette kan skyldes en fejl i selve 
Tor, et andet program i dit system eller en hardware-fejl. Tor-browseren vil 
ikke vÃ¦re i stand til at forbinde til noget som helst website fÃ¸r du 
genstarter Tor. Send en kopi af din Tor-log til support-teamet hvis problemet 
fortsÃ¦tter.
+torlauncher.tor_exited=Tor lukkede uventet. Dette kan skyldes en fejl i selve 
Tor, et andet program i dit system eller en hardware-fejl. Tor-browseren vil 
ikke vÃ¦re i stand til at forbinde til noget som helst websted fÃ¸r du 
genstarter Tor. Send en kopi af din Tor-log til support-teamet hvis problemet 
fortsÃ¦tter.
 torlauncher.tor_exited2=Fanebladene i din browser vil ikke blive lukket ved af 
at du genstarter Tor.
 torlauncher.tor_controlconn_failed=Kunne ikke forbinde til Tor kontrol-porten.
 torlauncher.tor_failed_to_start=Tor kunne ikke starte.
 torlauncher.tor_control_failed=Det lykkedes ikke at tage kontrol over Tor.
-torlauncher.tor_bootstrap_failed=Tor kunne ikke etablere forbindelse til Tor 
netvÃ¦rket
+torlauncher.tor_bootstrap_failed=Tor kunne ikke etablere forbindelse til 
Tor-netvÃ¦rket
 torlauncher.tor_bootstrap_failed_details=%1$S fejlede (%2$S).
 
 torlauncher.unable_to_start_tor=Kan ikke starte Tor.\n\n%S
 torlauncher.tor_missing=Kunne ikke finde Tor programmet.
 torlauncher.torrc_missing=torrc-filen mangler og kunne ikke dannes.
 torlauncher.datadir_missing=Tor-datamappen findes ikke

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

2017-04-13 Thread translation

commit ae22914ff2dff49673deff795ca651bfb4085324
Author: Translation commit bot 
Date:   Thu Apr 13 20:18:18 2017 +

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

diff --git a/ar/ar.po b/ar/ar.po
index 2f24ce6..39221f2 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -38,7 +38,7 @@ msgid ""
 "Tor Browser uses the Tor network to protect your privacy and anonymity. "
 "Using the Tor network has two main properties:"
 msgstr ""
-"ÙØªØµÙØ Tor ÙØ³ØªØ¹ÙÙ Ø´Ø¨ÙØ© Tor ÙØÙØ§ÙØ© Ø®ØµÙÙØªÙ Ù 
Ø³Ø±ÙØ© ÙÙÙØªÙ. Ø§Ø³ØªØ®Ø¯Ø§Ù Ø´Ø¨ÙØ© Tor ÙÙ "
+" ÙØ³ØªØ¹ÙÙ ÙØªØµÙØ TorØ´Ø¨ÙØ© Tor ÙØÙØ§ÙØ© Ø®ØµÙØµÙØªÙ 
ÙØ³Ø±ÙØ© ÙÙÙØªÙ. Ø§Ø³ØªØ®Ø¯Ø§Ù Ø´Ø¨ÙØ© Tor ÙÙ "
 "Ø®Ø§ØµÙØªØ§Ù Ø±Ø¦ÙØ³ÙØªØ§Ù:"
 
 #: about-tor-browser.page:18
@@ -66,8 +66,8 @@ msgid ""
 "In addition, Tor Browser is designed to prevent websites from "
 "âfingerprintingâ or identifying you based on your browser configuration."
 msgstr ""
-"Ø¨Ø§ÙØ¥Ø¶Ø§ÙØ©Ø ØªÙÙ ØªØµÙÙÙ ÙØªØµÙÙØ Tor ÙÙÙ ÙÙÙØ¹ Ø§ÙÙ
ÙØ§ÙØ¹  Ø§ÙØ¥ÙÙØªØ±ÙÙÙØ© ÙÙ \"Ø£Ø®Ø° Ø¨ØµÙØ§ØªÙ"
-" Ø§ÙØ¥ÙÙØªØ±ÙÙÙØ©\" Ø£Ù ÙÙ Ø§ÙØªØ¹Ø±ÙÙ Ø¹ÙÙ Ø¹Ø¨Ø± 
Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ÙØªØµÙÙØÙ."
+"Ø¥Ø¶Ø§ÙØ© Ø¹ÙÙ Ø°ÙÙØ ØªÙÙ ØªØµÙÙÙ ÙØªØµÙÙØ Tor ÙÙÙ ÙÙÙØ¹ 
Ø§ÙÙÙØ§ÙØ¹  Ø§ÙØ¥ÙÙØªØ±ÙÙÙØ© ÙÙ Ø£Ø®Ø° "
+"\"Ø¨ØµÙØªÙ Ø§ÙØ¥ÙÙØªØ±ÙÙÙØ©\" Ø£Ù ÙÙ Ø§ÙØªØ¹Ø±ÙÙ Ø¹ÙÙ Ø¹Ø¨Ø± 
Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ÙØªØµÙÙØÙ."
 
 #: about-tor-browser.page:39
 msgid ""

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

[tor-commits] [torbutton/master] Version bump, and CHANGELOG update

2017-04-13 Thread gk

commit cb0b9fda68ad2c02aeea49856114dbdae0fffe27
Author: Georg Koppen 
Date:   Thu Apr 13 19:58:27 2017 +

Version bump, and CHANGELOG update
---
 src/CHANGELOG   | 10 ++
 src/install.rdf |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/CHANGELOG b/src/CHANGELOG
index bc1092b..9de9989 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,13 @@
+1.9.7.2
+ * Bug 21865: Update our JIT preferences in the security slider
+ * Bug 21747: Make 'New Tor Circuit for this Site' work in ESR52
+ * Bug 21745: Fix handling of catch-all circuit
+ * Bug 21547: Fix circuit display under e10s
+ * Bug 21268: e10s compatibility for New Identity
+ * Bug 21267: Remove window resize implementation for now
+ * Bug 21201: Make Torbutton multiprocess compatible
+ * Translation updates
+
 1.9.7.1
  * Bug 21396: Allow leaking of resource/chrome URIs (off by default)
  * Bug 21574: Add link for zh manual and create manual links dynamically
diff --git a/src/install.rdf b/src/install.rdf
index 5a698b3..670dbb6 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -6,7 +6,7 @@
 Torbutton
 Mike Perry
 torbut...@torproject.org
-1.9.7.1
+1.9.7.2
 true
 
https://www.torproject.org/projects/torbrowser.html.en
 
chrome://torbutton/content/preferences.xul

___
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

2017-04-13 Thread translation

commit b7c630a38e2685dcba1a890f27c8735f028d4388
Author: Translation commit bot 
Date:   Thu Apr 13 19:48:17 2017 +

Update translations for tor-browser-manual
---
 ar/ar.po | 34 --
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/ar/ar.po b/ar/ar.po
index 74efeb1..2f24ce6 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -409,10 +409,14 @@ msgid ""
 "â32-bitâ or â64-bitâ software: this depends on the model of the 
computer you"
 " are using."
 msgstr ""
+"Ø³ÙØ±Ø¯Ù GetTor ÙØ±Ø³ÙØ§Ù Ø±ÙØ§Ø¨Ø·Ø§Ù ØªØ³ØªØ·ÙØ¹ ÙÙ Ø®ÙØ§ÙÙØ§ 
ØªÙØ²ÙÙ Ø±Ø²ÙØ© ÙØªØµÙÙØ TorØ Ø§ÙØªÙÙÙØ¹ "
+"Ø§ÙÙØ´ÙÙØ± (Ø¶Ø±ÙØ±ÙÙ ÙØªÙØ«ÙÙ Ø§ÙØªÙØ²ÙÙ)Ø Ø¨ØµÙØ© Ø§ÙÙ
ÙØªØ§Ø Ø§ÙÙØ³ØªØ®Ø¯Ù ÙØ¥ÙØ´Ø§Ø¡ Ø§ÙØªÙÙÙØ¹Ø Ù "
+"Ø§Ø®ØªØ¨Ø§Ø±Ù Ø§ÙØ±Ø²ÙØ©. ÙØ¯ ØªØ¬Ø¯ Ø®ÙØ§Ø±ÙÙ ÙÙØªÙØ²ÙÙ : 32-bit 
Ø£Ù 64-bit : Ø¥Ø®ØªØ± Ø§ÙØ±Ø²ÙØ© Ø¨ØØ³Ø¨ "
+"ÙÙØ¯ÙÙ Ø§ÙØØ§Ø³ÙØ¨ Ø§ÙØ°Ù ØªØ³ØªØ®Ø¯ÙÙ."
 
 #: downloading.page:57
 msgid "To use GetTor via Twitter:"
-msgstr ""
+msgstr "ÙØ§Ø³ØªØ®Ø¯Ø§Ù GetTor Ø¹Ø¨Ø± Twitter:"
 
 #: downloading.page:62
 msgid ""
@@ -420,38 +424,44 @@ msgid ""
 "Message to @get_tor with the words \"osx en\" in it (you don't need to "
 "follow the account)."
 msgstr ""
+"ÙØªØØµÙ Ø¹ÙÙ Ø±ÙØ§Ø¨Ø· ØªÙØ²ÙÙ ÙØªØµÙÙØ Tor 
Ø¨Ø§ÙØ¥ÙØ¬ÙÙØ²ÙØ© ÙÙØ¸Ø§Ù OS XØ Ø¥Ø¨Ø¹Ø« Ø¨Ø±Ø³Ø§ÙØ© ÙØ¨Ø§Ø´Ø±Ø© "
+"Ø§ÙÙ @get_tor ØªØØªÙÙ Ø¹ÙÙ ÙÙÙØ§Øª osx en (ÙØ³Øª Ø¨ØØ§ØØ© 
ÙÙÙÙÙ ÙØªØ§Ø¨Ø¹Ø§Ù ÙÙØØ³Ø§Ø¨)."
 
 #: downloading.page:70
 msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):"
-msgstr ""
+msgstr "ÙØ¥Ø³ØªØ®Ø¯Ø§Ù GetTor Ø¹Ø¨Ø± Jabber/XMPP (Ø£Ù Tor Messenger, Jitsi, 
CoyIM):  "
 
 #: downloading.page:75
 msgid ""
 "To get links for downloading Tor Browser in Chinese for Linux, send a "
 "message to get...@torproject.org with the words \"linux zh\" in it."
 msgstr ""
+"ÙÙØØµÙÙ Ø¹ÙÙ Ø±ÙØ§Ø¨Ø· ØªÙØ²ÙÙ ÙØªØµÙÙØ Tor Ø¨Ø§ÙØµÙÙÙØ© 
ÙÙØ¸Ø§Ù LinuxØ Ø¥Ø¨Ø¹Ø« Ø¨Ø±Ø³Ø§ÙØ© ÙØ¨Ø§Ø´Ø±Ø© "
+"Ø§ÙÙ @get_tor ØªØØªÙÙ Ø¹ÙÙ ÙÙÙØ§Øª linux zh."
 
 #: downloading.page:84
 msgid "Satori"
-msgstr ""
+msgstr "Satori"
 
 #: downloading.page:85
 msgid ""
 "Satori is an add-on for the Chrome or Chromium browsers that allows you to "
 "download several security and privacy programs from different sources."
 msgstr ""
+"Satori ÙÙ ØªØ·Ø¨ÙÙ ÙØ¶Ø§Ù ÙÙØªØµÙÙØÙ Chrome Ù Chromium ÙØ³ÙØ 
ÙÙ Ø¨ØªÙØ²ÙÙ Ø¹Ø¯ÙØ© Ø¨Ø±Ø§ÙØ¬ "
+"ØªØªØ¹ÙÙÙ Ø¨Ø§ÙØ£ÙØ§Ù ÙØ§ÙØ®ØµÙØµÙØ© ÙÙ Ø¹Ø¯ÙØ© ÙØµØ§Ø¯Ø±."
 
 #: downloading.page:90
 msgid "To download Tor Browser using Satori:"
-msgstr ""
+msgstr "ÙØªÙØ²ÙÙ ÙØªØµÙÙØ Tor Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù Satori:"
 
 #: downloading.page:95
 msgid "Install Satori from the Chrome App Store."
-msgstr ""
+msgstr "Ø«Ø¨ÙØª Satori ÙÙ ÙØªØ¬Ø± ØªØ·Ø¨ÙÙØ§Øª Chrome."
 
 #: downloading.page:100
 msgid "Select Satori from your browserâs Apps menu."
-msgstr ""
+msgstr "Ø¥Ø®ØªØ± Satori ÙÙ ÙØ§Ø¦ÙØ© Ø§ÙØªØ·Ø¨ÙÙØ§Øª ÙÙ Ù
ØªØµÙÙØÙ."
 
 #: downloading.page:105
 msgid ""
@@ -461,12 +471,18 @@ msgid ""
 "after the name of the program â each one represents a different source from 
"
 "which to get the software. Your download will then begin."
 msgstr ""
+"Ø¹ÙØ¯ÙØ§ ÙÙØªØ SatoriØ Ø¥ÙÙØ± Ø¹ÙÙ ÙØºØªÙ Ø§ÙÙÙØ¶ÙÙØ©. 
Ø³ØªÙØªØ ÙØ§Ø¦ÙØ© ÙØ¯Ø±Ø¬Ø© Ø§ÙØªÙØ²ÙÙØ§Øª "
+"Ø§ÙÙØªÙÙÙØ±Ø© ÙÙØ°Ù Ø§ÙÙØºØ©. Ø£Ø¹Ø«Ø± Ø¹ÙÙ Ø¨ÙØ¯ ÙØªØµÙÙØ 
Tor Ø§ÙØªØ§Ø¨Ø¹ ÙØ¥Ø³Ù ÙØ¸Ø§Ù Ø§ÙØªØ´ØºÙÙ Ø§ÙØ®Ø§Øµ"
+" Ø¨Ù. Ø¥Ø®ØªØ± Ø£Ù A Ø£Ù B Ø§ÙÙÙØÙØ© Ø¨Ø¥Ø³Ù Ø§ÙØ¨Ø±ÙØ§ÙØ¬ - ÙÙ 
ÙÙÙØ§ ÙÙØ«ÙÙ ÙØµØ¯Ø±Ø§Ù ÙØ®ØªÙÙØ§Ù "
+"ÙÙØØµÙÙ Ø¹ÙÙ Ø§ÙØ¨Ø±ÙØ§ÙØ¬. Ø¨Ø¹Ø¯ Ø°ÙÙ ÙØ¨Ø¯Ø£ Ø§ÙØªÙØ²ÙÙ."
 
 #: downloading.page:115
 msgid ""
 "Wait for your download to finish, then find the âGenerate Hashâ section 
in "
 "Satoriâs menu and click âSelect Filesâ."
 msgstr ""
+"Ø¥ÙØªØ¸Ø± ØØªÙ Ø§ÙØªÙØ§Ù Ø§ÙØªÙØ²ÙÙØ Ø«ÙÙ Ø¥Ø¹Ø«Ø± Ø¹ÙÙ ÙØ³Ù 
\"Ø£ÙØ´Ø¦ Ø§ÙÙØ§Ø´\" ÙÙ ÙØ§Ø¦ÙØ© Satori "
+"ÙØ§ÙÙØ± \"Ø¥Ø®ØªØ± Ø§ÙÙÙÙØ§Øª\"."
 
 #: downloading.page:121
 msgid ""
@@ -478,6 +494,12 @@ msgid ""
 "Browser. If they do not match, you may need to try downloading again,"
 " or from a different source."
 msgstr ""
+"Ø¥Ø®ØªØ± Ø§ÙÙÙÙ Ø§ÙØ°Ù ØªÙÙ ØªÙØ²ÙÙÙ. Ø³ÙØ¸ÙØ± Satori 
Ø¥Ø®ØªØ¨Ø§Ø±Ù Ø§ÙÙÙÙ ÙØ§ÙØ°Ù Ø¹ÙÙÙ ÙÙØ§Ø±ÙØªÙ "
+"Ø¨Ø§Ø®ØªØ¨Ø§Ø±Ù Ø§ÙØ¨Ø±ÙØ§ÙØ¬ Ø§ÙØ£ØµÙÙ: ØªØØµÙ Ø¹ÙÙ Ø§ÙØ£ØµÙÙ 
Ø¨Ø§ÙÙÙØ± Ø¹ÙÙ ÙÙÙØ© \"Ø¥Ø®ØªØ¨Ø§Ø±Ù\" Ø¨Ø¹Ø¯ "
+"Ø§ÙØ±Ø§Ø¨Ø· Ø§ÙØ°Ù ØªÙÙ Ø§Ø³ØªØ®Ø¯Ø§ÙÙ ÙØ¨Ø¯Ø¡ Ø§ÙØªÙØ²ÙÙ. Ø¥Ø°Ø§ 
ØªØ·Ø§Ø¨ÙØª ÙØ³Ø®ØªØ§  Ø§ÙØ§Ø®ØªØ¨Ø§Ø±ÙØ ÙØ§Ù "
+"Ø§ÙØªÙØ²ÙÙ ÙØ§Ø¬ØØ§ÙØ ÙØ¨Ø¥ÙÙØ§ÙÙ  
Ø§ÙÙØ¨Ø§Ø´Ø±Ø© Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù "
+"Ø§ÙÙØªØµÙÙØ . Ø¥Ù ÙÙ ØªØªØ·Ø§Ø¨Ù Ø§ÙÙØ³Ø®ØªÙÙØ ÙØ¯ 
ÙÙÙÙ Ø¹ÙÙÙ ÙØ¹Ø§ÙØ¯Ø© Ø§ÙØªÙØ²ÙÙØ Ø£Ù "
+"Ø§ÙØªÙØ²ÙÙ ÙÙ ÙØµØ¯Ø± ÙØ®ØªÙÙ.  "
 
 #:

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

2017-04-13 Thread translation

commit 742c823a8a82a247145be0752189c05ee3b435b1
Author: Translation commit bot 
Date:   Thu Apr 13 19:18:17 2017 +

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

diff --git a/ar/ar.po b/ar/ar.po
index e6f07ad..74efeb1 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -347,7 +347,7 @@ msgstr ""
 
 #: downloading.page:7
 msgid "How to download Tor Browser"
-msgstr ""
+msgstr "ÙÙÙÙØ© ØªÙØ²ÙÙ ÙØªØµÙÙØ Tor"
 
 #: downloading.page:10
 msgid "Downloading"
@@ -360,6 +360,9 @@ msgid ""
 "will be secured using HTTPS, which "
 "makes it much harder for somebody to tamper with."
 msgstr ""
+"Ø§ÙØ·Ø±ÙÙØ© Ø§ÙØ£Ø¨Ø³Ø· ÙØ§ÙØ£ÙØ«Ø± Ø£ÙØ§ÙØ§Ù ÙØªÙØ²ÙÙ Ù
ØªØµÙÙØ Tor ÙÙ ØªÙØ²ÙÙÙ ÙÙ ÙÙÙØ¹ ÙØ´Ø±ÙØ¹ Tor "
+"Ø§ÙØ±Ø³ÙÙ Ø¹ÙÙ https://www.torproject.org. ÙØªÙ ØªØ£ÙÙÙ ØµÙØªÙ 
Ø¨Ø§ÙÙÙÙØ¹ Ø¹Ø¨Ø± Ø¨Ø±ÙØªÙÙÙÙ "
+"HTTPS Ø§ÙØ°Ù ÙØµØ¹Ø¨ 
Ø§ÙØªÙØ§Ø¹Ø¨ Ø¨Ù."
 
 #: downloading.page:19
 msgid ""
@@ -367,10 +370,13 @@ msgid ""
 "for example, it could be blocked on your network. If this happens, you can "
 "use one of the alternative download methods listed below."
 msgstr ""
+"ØºÙØ± Ø£ÙÙÙ Ø£ØÙØ§ÙØ§Ù ÙØ§ ØªØªÙÙÙÙ ÙÙ ÙÙÙØ¬ ÙÙÙØ¹ Ù
Ø´Ø±ÙØ¹ Tor: Ø¹ÙÙ Ø³Ø¨ÙÙ Ø§ÙÙØ«Ø§Ù ÙØ¯ ÙÙÙÙ "
+"Ø§ÙÙÙÙØ¹ ÙØØ¬ÙØ¨Ø§Ù ÙÙ ÙØ¨Ù Ø´Ø¨ÙØªÙ. ÙÙ ÙØ°Ù Ø§ÙØØ§ÙØ 
ØªØ³ØªØ·ÙØ¹ Ø§Ø³ØªØ®Ø¯Ø§Ù Ø¥ØØ¯Ù Ø·Ø±Ù Ø§ÙØªÙØ²ÙÙ "
+"Ø§ÙØ¨Ø¯ÙÙØ© Ø§ÙÙØ°ÙÙØ±Ø© Ø£Ø¯ÙØ§Ù:"
 
 #: downloading.page:27
 msgid "GetTor"
-msgstr ""
+msgstr "getTor"
 
 #: downloading.page:28
 msgid ""
@@ -378,10 +384,12 @@ msgid ""
 "the latest version of Tor Browser, hosted at a variety of locations, such as"
 " Dropbox, Google Drive and Github.."
 msgstr ""
+"GetTor ÙÙ Ø¹Ø¨Ø§Ø±Ø© Ø¹Ù Ø®Ø¯ÙØ© ØªØ±Ø¯Ù Ø¹ÙÙ Ø§ÙØ±Ø³Ø§Ø¦Ù 
ØªÙÙØ§Ø¦ÙØ§Ù ÙØ±Ø³ÙØ© Ø±ÙØ§Ø¨Ø· ÙØ£ØØ¯Ø« ÙØ³Ø®Ø© "
+"ÙÙØªØµÙÙØ TorØ ÙÙØÙÙØ¸Ø© ÙÙ Ø¹Ø¯ÙØ© ÙÙØ§ÙØ¹Ø ÙØ«Ø§Ù 
Dropbox, Google Drive, Ù Github."
 
 #: downloading.page:34
 msgid "To use GetTor via email:"
-msgstr ""
+msgstr "ÙØ§Ø³ØªØ®Ø¯Ø§Ù GetTor Ø¹Ø¨Ø± Ø§ÙØ¥ÙÙÙÙ:"
 
 #: downloading.page:39
 msgid ""
@@ -389,6 +397,8 @@ msgid ""
 "simply write âwindowsâ, âosxâ, or âlinuxâ, (without quotation 
marks) "
 "depending on your operating system."
 msgstr ""
+"Ø£Ø±Ø³Ù Ø¥ÙÙÙÙØ§Ù Ø§ÙÙ Ø¹ÙÙØ§Ù get...@torproject.org, ÙÙÙ 
ØµÙØ¨ Ø§ÙÙÙØ¶ÙØ¹ Ø§ÙØªØ¨ ÙÙØ· Ø¥Ø³Ù "
+"ÙØ¸Ø§Ù Ø§ÙØªØ´ØºÙÙ Ø§ÙØ®Ø§Øµ Ø¨Ù ÙØ«ÙØ§ windows, osx, linux."
 
 #: downloading.page:46
 msgid ""

___
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

2017-04-13 Thread translation

commit 1be0235c25a244c4df16f5f29762a70a5acbff09
Author: Translation commit bot 
Date:   Thu Apr 13 18:48:19 2017 +

Update translations for tor-browser-manual
---
 ar/ar.po | 28 ++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/ar/ar.po b/ar/ar.po
index 84aee7b..e6f07ad 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -242,10 +242,14 @@ msgid ""
 "page for more information on the types of transport that are currently "
 "available."
 msgstr ""
+"ÙØ¯ ÙÙÙÙ ÙØ²ÙÙØ¯Ù ÙÙØ¥ÙØªØ±ÙØª Ø£Ù Ø§ÙØ¯ÙÙØ© Ø¨ØØ¬Ø¨ 
Ø§ÙÙÙÙØ¬ Ø§ÙÙØ¨Ø§Ø´Ø± Ø§ÙÙ Ø´Ø¨ÙØ© Tor. ÙØ´ÙÙ "
+"ÙØªØµÙÙØ Tor Ø¨Ø¹Ø¶ Ø§ÙØ£Ø¯ÙØ§Øª ÙÙØ§ØªÙØ§Ù ØÙÙ ÙØ°Ø§ 
Ø§ÙØØ¬Ø¨. ØªØ³ÙÙÙ ÙØ°Ù Ø§ÙØ£Ø¯ÙØ§Øª Ø¨Ø¥Ø³Ù "
+"\"Ø§ÙÙÙØ§ÙÙ Ø§ÙÙÙØµÙÙØ©\". ØªÙØ¬ÙÙ Ø§ÙÙ ØµÙØØ©  Ø§ÙÙÙØ§ÙÙ "
+"Ø§ÙÙÙØµÙÙØ©  ÙÙÙØ²ÙØ¯ ÙÙ Ø§ÙÙØ¹ÙÙÙØ§Øª ØÙÙ 
Ø£ÙÙØ§Ø¹ Ø§ÙÙÙÙ Ø§ÙÙØªÙÙÙØ±Ø© ØØ§ÙÙØ§Ù. "
 
 #: circumvention.page:22
 msgid "Using pluggable transports"
-msgstr ""
+msgstr "Ø¥Ø³ØªØ®Ø¯Ø§Ù Ø§ÙÙÙØ§ÙÙ Ø§ÙÙÙØµÙÙØ©"
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
@@ -257,12 +261,16 @@ msgid ""
 "external ref='media/circumvention/configure.png' "
 "md5='519d888303eadfe4cb03f178aedd90f5'"
 msgstr ""
+"Ø§ÙÙØ±Ø¬Ø¹ Ø§ÙØ®Ø§Ø±Ø¬Ù='media/circumvention/configure.png' "
+"md5='519d888303eadfe4cb03f178aedd90f5'"
 
 #: circumvention.page:28
 msgid ""
 "To use pluggable transports, click \"Configure\" in the Tor Launcher window "
 "that appears when you first run Tor Browser."
 msgstr ""
+"ÙØ¥Ø³ØªØ®Ø¯Ø§Ù Ø§ÙÙÙØ§ÙÙ Ø§ÙÙÙØµÙÙØ© Ø¥ÙÙØ± \"Ø¶Ø¨Ø·\" ÙÙ 
ÙØ§ÙØ°Ø© Ø¨Ø±ÙØ§ÙØ¬ Ø¥Ø·ÙØ§Ù Tor ÙØ§ÙØªÙ ØªØ¸ÙØ± "
+"Ø£ÙÙÙ ØªØ´ØºÙÙÙ ÙÙØªØµÙÙØ Tor."
 
 #: circumvention.page:33
 msgid ""
@@ -270,12 +278,16 @@ msgid ""
 " clicking on the green onion near your address bar and selecting âTor "
 "Network Settingsâ."
 msgstr ""
+"Ø¨Ø¥ÙÙØ§ÙÙ Ø£ÙØ¶Ø§Ù Ø¶Ø¨Ø· Ø§ÙÙÙØ§ÙÙ Ø§ÙÙÙØµÙÙØ© Ø¨Ø¹Ø¯ 
ØªØ´ØºÙÙ ÙØªØµÙÙØ TorØ Ø¹Ø¨Ø± Ø§ÙÙÙØ± Ø¹ÙÙ "
+"Ø§ÙØ¨ØµÙØ© Ø§ÙØ®Ø¶Ø±Ø§Ø¡ Ø¨Ø¬Ø§ÙØ¨ Ø¹ÙÙØ§Ù Ø§ÙÙØªØµÙÙØ 
ÙØ§Ø®ØªÙØ§Ø± \"Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø´Ø¨ÙØ© Tor\". "
 
 #: circumvention.page:41
 msgid ""
 "Select âyesâ when asked if your Internet Service Provider blocks 
connections"
 " to the Tor network."
 msgstr ""
+"Ø¥Ø®ØªØ± \"ÙØ¹Ù\" Ø¹ÙØ¯ Ø¸ÙÙØ± Ø§ÙØ³Ø¤Ø§Ù \"ÙÙ ÙØØ¬Ø¨ ÙØ²ÙÙØ¯ 
Ø§ÙØ¥ÙØªØ±ÙØª Ø§ÙØ®Ø§Øµ Ø¨Ù Ø§ÙØªÙØ§ØµÙ ÙØ¹ "
+"Ø´Ø¨ÙØ© TorØ\""
 
 #. 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
@@ -287,16 +299,20 @@ msgid ""
 "external ref='media/circumvention/bridges.png' "
 "md5='910cdd5e45860b81a1ad4739c589a195'"
 msgstr ""
+"Ø§ÙÙØ±Ø¬Ø¹ Ø§ÙØ®Ø§Ø±Ø¬Ù='media/circumvention/bridges.png' "
+"md5='910cdd5e45860b81a1ad4739c589a195'"
 
 #: circumvention.page:51
 msgid ""
 "Select âConnect with provided bridgesâ. Tor Browser currently has six "
 "pluggable transport options to choose from."
 msgstr ""
+"Ø¥Ø®ØªØ± \"Ø§ÙØªÙØ§ØµÙ ÙØ¹ Ø§ÙØ¬Ø³ÙØ± Ø§ÙÙØ²ÙÙØ¯Ø©\". ÙØ³ÙØ Ù
ØªØµÙÙØ Tor Ø¨Ø§Ø®ØªÙØ§Ø± Ø§ÙÙ ØØ¯ 6 ÙÙØ§ÙÙ "
+"ÙÙØµÙÙØ©."
 
 #: circumvention.page:60
 msgid "Which transport should I use?"
-msgstr ""
+msgstr "Ø£Ù ÙØ§ÙÙ Ø¹ÙÙÙ Ø§Ø³ØªØ®Ø§ÙÙØ"
 
 #: circumvention.page:61
 msgid ""
@@ -305,6 +321,9 @@ msgid ""
 "Transports page), and their effectiveness depends on your individual "
 "circumstances."
 msgstr ""
+"ØªØ¹ÙÙ ÙÙ ÙÙ Ø§ÙÙÙØ§ÙÙ Ø§ÙÙØ°ÙÙØ±Ø© ÙÙ ÙØ§Ø¦ÙØ© Ø¨Ø±ÙØ§Ù
Ø¬ Ø¥Ø·ÙØ§Ù Tor Ø¨Ø·Ø±ÙÙØ© ÙØ®ØªÙÙØ© (ÙÙÙØ²ÙØ¯ "
+"ÙÙ Ø§ÙÙØ¹ÙÙÙØ§Øª ØªÙØ¬ÙÙ Ø§ÙÙ ØµÙØØ©  
Ø§ÙÙÙØ§ÙÙ "
+"Ø§ÙÙÙØµÙÙØ© )Ø ÙØªØ¹ØªÙØ¯ ÙØ¹ÙØ§ÙÙØ© ÙÙ ÙÙÙØ§ Ø¹ÙÙ 
Ø¸Ø±ÙÙÙ Ø§ÙÙØ±Ø¯ÙÙØ©."
 
 #: circumvention.page:67
 msgid ""
@@ -312,6 +331,8 @@ msgid ""
 " should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-"
 "azure, meek-amazon."
 msgstr ""
+"Ø¥Ù ÙØ§ÙØª Ø£ÙÙÙ ÙØØ§ÙÙØ© ÙÙ Ø¨Ø§ÙØ§ÙØªÙØ§Ù ØÙÙ 
Ø§ÙØØ¬Ø¨Ø Ø¹ÙÙÙ ØªØ¬Ø±Ø¨Ø© Ø§ÙÙÙØ§ÙÙ Ø§ÙÙØ®ØªÙÙØ©: "
+"obfs3, obfs4, ScambleSuit, fte, meek-azure, meek-amazon."
 
 #: circumvention.page:72
 msgid ""
@@ -320,6 +341,9 @@ msgid ""
 "xref=\"bridges\">Bridges section to learn what bridges are and how to"
 " obtain them."
 msgstr ""
+"Ø¥Ø°Ø§ Ø¬Ø±ÙØ¨Øª ÙÙ ÙØ°Ù Ø§ÙØ®ÙØ§Ø±Ø§Øª ÙÙÙ ØªØªÙÙÙÙ ÙÙ 
Ø§ÙÙØµÙÙ Ø§ÙÙ Ø§ÙØ¥ÙØªØ±ÙØªØ Ø³ÙÙÙÙ Ø¹ÙÙÙ "
+"Ø¥Ø¯Ø®Ø§Ù Ø§ÙØ¹ÙØ§ÙÙÙ Ø§ÙØ¬Ø³Ø± ÙØ¯ÙÙØ§Ù. Ø¥ÙØ±Ø£ ÙØ³Ù Ø§ÙØ¬Ø³ÙØ±  "
+"ÙØªØªØ¹ÙÙÙ ÙØ§ÙÙÙØ© Ø§ÙØ¬Ø³ÙØ± ÙÙÙÙÙØ© Ø§ÙØØµÙÙ 
Ø¹ÙÙÙØ§."
 
 #: downloading.page:7
 msgid "How to download Tor Browser"

___
tor-commits mailing list
tor-commits@lists.torproject.org

[tor-commits] [tor/master] fix wide lines

2017-04-13 Thread nickm

commit ba8952059323c614d7a1693228e349820fd1c50a
Author: Nick Mathewson 
Date:   Thu Apr 13 14:36:57 2017 -0400

fix wide lines
---
 src/test/test_circuitlist.c   | 7 ---
 src/test/test_hs_intropoint.c | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c
index 14c65ab..520aaf3 100644
--- a/src/test/test_circuitlist.c
+++ b/src/test/test_circuitlist.c
@@ -420,7 +420,8 @@ test_hs_circuitmap_isolation(void *arg)
 hs_circuitmap_register_intro_circ_v2_relay_side(circ3, tok2);
 
 /* Check that the getters work */
-tt_ptr_op(circ2, OP_EQ, 
hs_circuitmap_get_intro_circ_v2_service_side(tok2));
+tt_ptr_op(circ2, OP_EQ,
+  hs_circuitmap_get_intro_circ_v2_service_side(tok2));
 tt_ptr_op(circ3, OP_EQ, hs_circuitmap_get_intro_circ_v2_relay_side(tok2));
 
 /* Register circ4 with tok2: it should override circ2 */
@@ -431,7 +432,8 @@ test_hs_circuitmap_isolation(void *arg)
 
 /* Check that the getter returns circ4; the last circuit registered with
  * that token. */
-tt_ptr_op(circ4, OP_EQ, 
hs_circuitmap_get_intro_circ_v2_service_side(tok2));
+tt_ptr_op(circ4, OP_EQ,
+  hs_circuitmap_get_intro_circ_v2_service_side(tok2));
   }
 
  done:
@@ -445,7 +447,6 @@ test_hs_circuitmap_isolation(void *arg)
 circuit_free(TO_CIRCUIT(circ4));
 }
 
-
 struct testcase_t circuitlist_tests[] = {
   { "maps", test_clist_maps, TT_FORK, NULL, NULL },
   { "rend_token_maps", test_rend_token_maps, TT_FORK, NULL, NULL },
diff --git a/src/test/test_hs_intropoint.c b/src/test/test_hs_intropoint.c
index 5caa550..7bcd568 100644
--- a/src/test/test_hs_intropoint.c
+++ b/src/test/test_hs_intropoint.c
@@ -548,7 +548,8 @@ test_intro_point_registration(void *arg)
 tt_int_op(1, ==, HT_SIZE(the_hs_circuitmap));
 get_auth_key_from_cell(_key, RELAY_COMMAND_ESTABLISH_INTRO,
establish_intro_cell);
-returned_intro_circ = 
hs_circuitmap_get_intro_circ_v3_relay_side(_key);
+returned_intro_circ =
+  hs_circuitmap_get_intro_circ_v3_relay_side(_key);
 tt_ptr_op(intro_circ, ==, returned_intro_circ);
   }
 

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

[tor-commits] [tor/master] hs: Add service-side circuitmap API.

2017-04-13 Thread nickm

commit f02868bb53f57e416094c7ebc9f6632ce6a3d007
Author: George Kadianakis 
Date:   Fri Jan 20 13:55:06 2017 +0200

hs: Add service-side circuitmap API.

Now we have separate getters and setters for service-side and relay-side. I
took this approach over adding arguments to the already existing methods to
have more explicit type-checking, and also because some functions would grow
too large and dirty.

This commit also fixes every callsite to use the new function names which
modifies the legacy HS (v2) and the prop224 (v3) code.

Signed-off-by: David Goulet 
---
 src/or/hs_circuitmap.c| 250 +-
 src/or/hs_circuitmap.h|  65 ---
 src/or/hs_intropoint.c|   4 +-
 src/or/rendmid.c  |  14 ++-
 src/test/test_circuitlist.c   | 126 +
 src/test/test_hs_intropoint.c |  11 +-
 6 files changed, 363 insertions(+), 107 deletions(-)

diff --git a/src/or/hs_circuitmap.c b/src/or/hs_circuitmap.c
index 4d5c893..ea66fb5 100644
--- a/src/or/hs_circuitmap.c
+++ b/src/or/hs_circuitmap.c
@@ -4,8 +4,9 @@
 /**
  * \file hs_circuitmap.c
  *
- * \brief Manage the hidden service circuitmap: A hash table that maps binary
- *  tokens to introduction and rendezvous circuits.
+ * \brief Hidden service circuitmap: A hash table that maps binary tokens to
+ *  introduction and rendezvous circuits; it's used both by relays acting as
+ *  intro points and rendezvous points, and also by hidden services themselves.
  **/
 
 #define HS_CIRCUITMAP_PRIVATE
@@ -177,15 +178,17 @@ hs_circuitmap_register_circuit(circuit_t *circ,
   hs_circuitmap_register_impl(circ, hs_token);
 }
 
-/* Query circuitmap for circuit with token of size token_len.
- * Only returns a circuit with purpose equal to the wanted_circ_purpose
- * parameter and if it is NOT marked for close. Return NULL if no such circuit
- * is found. */
+/* Helper function for hs_circuitmap_get_origin_circuit() and
+ * hs_circuitmap_get_or_circuit(). Because only circuit_t are indexed in the
+ * circuitmap, this function returns object type so the specialized functions
+ * using this helper can upcast it to the right type.
+ *
+ * Return NULL if not such circuit is found. */
 static circuit_t *
-hs_circuitmap_get_circuit(hs_token_type_t type,
-  size_t token_len,
-  const uint8_t *token,
-  uint8_t wanted_circ_purpose)
+hs_circuitmap_get_circuit_impl(hs_token_type_t type,
+   size_t token_len,
+   const uint8_t *token,
+   uint8_t wanted_circ_purpose)
 {
   circuit_t *found_circ = NULL;
 
@@ -209,38 +212,46 @@ hs_circuitmap_get_circuit(hs_token_type_t type,
   return found_circ;
 }
 
-/** Public circuitmap API /
-
-/* Public function: Return v3 introduction circuit with auth_key. Return
- * NULL if no such circuit is found in the circuitmap. */
-or_circuit_t *
-hs_circuitmap_get_intro_circ_v3(const ed25519_public_key_t *auth_key)
+/* Helper function: Query circuitmap for origin circuit with token of
+ * size token_len and type.  Only returns a circuit with purpose
+ * equal to the wanted_circ_purpose parameter and if it is NOT marked
+ * for close. Return NULL if no such circuit is found. */
+static origin_circuit_t *
+hs_circuitmap_get_origin_circuit(hs_token_type_t type,
+ size_t token_len,
+ const uint8_t *token,
+ uint8_t wanted_circ_purpose)
 {
   circuit_t *circ;
-  tor_assert(auth_key);
+  tor_assert(token);
+  tor_assert(CIRCUIT_PURPOSE_IS_ORIGIN(wanted_circ_purpose));
 
-  circ = hs_circuitmap_get_circuit(HS_TOKEN_INTRO_V3,
-   ED25519_PUBKEY_LEN, auth_key->pubkey,
-   CIRCUIT_PURPOSE_INTRO_POINT);
+  circ = hs_circuitmap_get_circuit_impl(type, token_len, token,
+wanted_circ_purpose);
   if (!circ) {
 return NULL;
   }
 
-  tor_assert(CIRCUIT_IS_ORCIRC(circ));
-  return TO_OR_CIRCUIT(circ);
+  tor_assert(CIRCUIT_IS_ORIGIN(circ));
+  return TO_ORIGIN_CIRCUIT(circ);
 }
 
-/* Public function: Return v2 introduction circuit with digest. Return
- * NULL if no such circuit is found in the circuitmap. */
-or_circuit_t *
-hs_circuitmap_get_intro_circ_v2(const uint8_t *digest)
+/* Helper function: Query circuitmap for OR circuit with token of size
+ * token_len and type.  Only returns a circuit with purpose equal
+ * to the wanted_circ_purpose parameter and if it is NOT marked for
+ * close. Return NULL if no such circuit is found. */
+static or_circuit_t *
+hs_circuitmap_get_or_circuit(hs_token_type_t type,
+ size_t token_len,
+ const uint8_t

[tor-commits] [tor/master] Merge branch 'ticket21889_031_01_squashed'

2017-04-13 Thread nickm

commit 902672eac6dc4cbdbdd7e410a6dc7580f0df7509
Merge: 63e39b2 f02868b
Author: Nick Mathewson 
Date:   Thu Apr 13 14:23:59 2017 -0400

Merge branch 'ticket21889_031_01_squashed'

 src/or/circuitlist.c  |   9 +-
 src/or/hs_circuitmap.c| 296 --
 src/or/hs_circuitmap.h|  69 +++---
 src/or/hs_intropoint.c|   4 +-
 src/or/or.h   |  14 +-
 src/or/rendmid.c  |  16 ++-
 src/test/test_circuitlist.c   | 136 ++-
 src/test/test_hs_intropoint.c |  11 +-
 8 files changed, 416 insertions(+), 139 deletions(-)

diff --cc src/test/test_hs_intropoint.c
index 6e68e2c,40d1f25..5caa550
--- a/src/test/test_hs_intropoint.c
+++ b/src/test/test_hs_intropoint.c
@@@ -788,9 -789,9 +789,9 @@@ test_received_introduce1_handling(void 
  /* Register the circuit in the map for the auth key of the cell. */
  ed25519_public_key_t auth_key;
  const uint8_t *cell_auth_key =
 -  hs_cell_introduce1_getconstarray_auth_key(cell);
 +  trn_cell_introduce1_getconstarray_auth_key(cell);
  memcpy(auth_key.pubkey, cell_auth_key, ED25519_PUBKEY_LEN);
- hs_circuitmap_register_intro_circ_v3(service_circ, _key);
+ hs_circuitmap_register_intro_circ_v3_relay_side(service_circ, _key);
  ret = hs_intro_received_introduce1(circ, request, request_len);
  circuit_free(TO_CIRCUIT(circ));
  circuit_free(TO_CIRCUIT(service_circ));



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

[tor-commits] [tor/master] hs: Refactor circuitmap to use circuit_t instead of or_circuit_t.

2017-04-13 Thread nickm

commit 037ce360bd0a7b0db1d6b6e441c90b1773b4cb06
Author: George Kadianakis 
Date:   Wed Jan 18 12:01:49 2017 +0200

hs: Refactor circuitmap to use circuit_t instead of or_circuit_t.
---
 src/or/circuitlist.c|  9 +++---
 src/or/hs_circuitmap.c  | 72 +
 src/or/hs_circuitmap.h  |  4 +--
 src/or/or.h | 14 -
 src/or/rendmid.c|  2 +-
 src/test/test_circuitlist.c | 10 +++
 6 files changed, 66 insertions(+), 45 deletions(-)

diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 738119f..80bb7f6 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -943,10 +943,6 @@ circuit_free(circuit_t *circ)
 crypto_cipher_free(ocirc->n_crypto);
 crypto_digest_free(ocirc->n_digest);
 
-if (ocirc->hs_token) {
-  hs_circuitmap_remove_circuit(ocirc);
-}
-
 if (ocirc->rend_splice) {
   or_circuit_t *other = ocirc->rend_splice;
   tor_assert(other->base_.magic == OR_CIRCUIT_MAGIC);
@@ -978,6 +974,11 @@ circuit_free(circuit_t *circ)
   /* Remove from map. */
   circuit_set_n_circid_chan(circ, 0, NULL);
 
+  /* Clear HS circuitmap token from this circ (if any) */
+  if (circ->hs_token) {
+hs_circuitmap_remove_circuit(circ);
+  }
+
   /* Clear cell queue _after_ removing it from the map.  Otherwise our
* "active" checks will be violated. */
   cell_queue_clear(>n_chan_cells);
diff --git a/src/or/hs_circuitmap.c b/src/or/hs_circuitmap.c
index 32017f1..4d5c893 100644
--- a/src/or/hs_circuitmap.c
+++ b/src/or/hs_circuitmap.c
@@ -25,8 +25,8 @@ static struct hs_circuitmap_ht *the_hs_circuitmap = NULL;
 /* This is a helper function used by the hash table code (HT_). It returns 1 if
  * two circuits have the same HS token. */
 static int
-hs_circuits_have_same_token(const or_circuit_t *first_circuit,
-const or_circuit_t *second_circuit)
+hs_circuits_have_same_token(const circuit_t *first_circuit,
+const circuit_t *second_circuit)
 {
   const hs_token_t *first_token;
   const hs_token_t *second_token;
@@ -57,7 +57,7 @@ hs_circuits_have_same_token(const or_circuit_t *first_circuit,
 /* This is a helper function for the hash table code (HT_). It hashes a circuit
  * HS token into an unsigned int for use as a key by the hash table routines.*/
 static inline unsigned int
-hs_circuit_hash_token(const or_circuit_t *circuit)
+hs_circuit_hash_token(const circuit_t *circuit)
 {
   tor_assert(circuit->hs_token);
 
@@ -67,11 +67,11 @@ hs_circuit_hash_token(const or_circuit_t *circuit)
 
 /* Register the circuitmap hash table */
 HT_PROTOTYPE(hs_circuitmap_ht, // The name of the hashtable struct
- or_circuit_t,// The name of the element struct,
+ circuit_t,// The name of the element struct,
  hs_circuitmap_node,// The name of HT_ENTRY member
  hs_circuit_hash_token, hs_circuits_have_same_token)
 
-HT_GENERATE2(hs_circuitmap_ht, or_circuit_t, hs_circuitmap_node,
+HT_GENERATE2(hs_circuitmap_ht, circuit_t, hs_circuitmap_node,
  hs_circuit_hash_token, hs_circuits_have_same_token,
  0.6, tor_reallocarray, tor_free_)
 
@@ -116,13 +116,13 @@ hs_token_free(hs_token_t *hs_token)
 }
 
 /** Return the circuit from the circuitmap with token search_token. */
-static or_circuit_t *
+static circuit_t *
 get_circuit_with_token(hs_token_t *search_token)
 {
   tor_assert(the_hs_circuitmap);
 
   /* We use a dummy circuit object for the hash table search routine. */
-  or_circuit_t search_circ;
+  circuit_t search_circ;
   search_circ.hs_token = search_token;
   return HT_FIND(hs_circuitmap_ht, the_hs_circuitmap, _circ);
 }
@@ -130,7 +130,7 @@ get_circuit_with_token(hs_token_t *search_token)
 /* Helper function that registers circ with token on the HS
circuitmap. This function steals reference of token. */
 static void
-hs_circuitmap_register_impl(or_circuit_t *circ, hs_token_t *token)
+hs_circuitmap_register_impl(circuit_t *circ, hs_token_t *token)
 {
   tor_assert(circ);
   tor_assert(token);
@@ -145,13 +145,12 @@ hs_circuitmap_register_impl(or_circuit_t *circ, 
hs_token_t *token)
  take precedence over old ones, so that HSes and clients and reestablish
  killed circuits without changing the HS token. */
   {
-or_circuit_t *found_circ;
+circuit_t *found_circ;
 found_circ = get_circuit_with_token(token);
 if (found_circ) {
   hs_circuitmap_remove_circuit(found_circ);
-  if (!found_circ->base_.marked_for_close) {
-circuit_mark_for_close(TO_CIRCUIT(found_circ),
-   END_CIRC_REASON_FINISHED);
+  if (!found_circ->marked_for_close) {
+circuit_mark_for_close(found_circ, END_CIRC_REASON_FINISHED);
   }
 }
   }
@@ -165,7 +164,7 @@ hs_circuitmap_register_impl(or_circuit_t *circ, hs_token_t 
*token)
  *  circuitmap. Use the HS token as the key to the hash table.  If
  *

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

2017-04-13 Thread translation

commit c715860f9aa7e265e122acb8f4eab18b9ed21fbe
Author: Translation commit bot 
Date:   Thu Apr 13 18:18:17 2017 +

Update translations for tor-browser-manual
---
 ar/ar.po | 25 ++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/ar/ar.po b/ar/ar.po
index c3bb81d..84aee7b 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -138,6 +138,11 @@ msgid ""
 " in combination with pluggable transports helps to disguise the fact that "
 "you are using Tor."
 msgstr ""
+"ØªØªÙÙÙ Ø£ÙØ«Ø±ÙÙØ© Ø§ÙÙÙØ§ÙÙ Ø§ÙÙ
ÙØµÙÙØ©Ø ÙØ«Ø§Ù obfs3 "
+"Ùobfs4Ø Ø¹ÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù ÙØ±ØÙØ§Øª ØªØ¹Ø±Ù Ø¨Ø¥Ø³Ù \" 
Ø§ÙØ¬Ø³Ø±\". ÙÙØ§ Ø§ÙÙØ±ØÙØ§Øª Ø§ÙØ¹Ø§Ø¯ÙÙØ© ÙØ´Ø¨ÙØ©"
+" TorØ ÙØ´ØºÙÙ ÙØªØ·ÙÙØ¹ÙÙ Ø§ÙØ¬Ø³ÙØ±. Ø£ÙÙØ§ Ø¨Ø®ÙØ§Ù Ø§ÙÙ
Ø±ØÙØ§Øª Ø§ÙØ¹Ø§Ø¯ÙØ©Ø ÙØ§ÙØ¬Ø³ÙØ± ØºÙØ± ÙØ¯Ø±Ø¬Ø© "
+"Ø¹ÙÙÙÙØ§ÙØ ÙØ¨Ø§ÙØªØ§ÙÙ ÙØ§ ÙØ³ØªØ·ÙØ¹ Ø¹Ø¯ÙÙ ÙØ§ 
Ø§ÙØªØ¹Ø±ÙÙ Ø¹ÙÙÙØ§ Ø¨Ø³ÙÙÙØ©. Ø¥Ø³ØªØ®Ø¯Ø§Ù Ø§ÙØ¬Ø³ÙØ± "
+"Ø¨Ø§ÙÙØ´Ø§Ø±ÙØ© ÙØ¹ Ø§ÙÙÙØ§ÙÙ Ø§ÙÙÙØµÙÙØ© ÙØ³Ø§Ø¹Ø¯ Ø¹ÙÙ ØªÙ
ÙÙÙ Ø¥Ø³ØªØ®Ø¯Ø§ÙÙ ÙØ´Ø¨ÙØ© Tor."
 
 #: bridges.page:21
 msgid ""
@@ -145,6 +150,8 @@ msgid ""
 "techniques that do not rely on bridges. You do not need to obtain bridge "
 "addresses in order to use these transports."
 msgstr ""
+"ØªØ³ØªØ®Ø¯Ù ÙÙØ§ÙÙ ÙÙØµÙÙØ© Ø£Ø®Ø±ÙØ ÙØ«Ù meekØ ØªÙÙÙØ§Øª Ù
Ø®ØªÙÙØ© ÙØ¶Ø§Ø¯Ø© ÙÙØ±ÙØ§Ø¨Ø©Ø ÙØ§ ØªØ¹ØªÙØ¯ "
+"Ø¹ÙÙ Ø§ÙØ¬Ø³ÙØ±. Ø£ÙØª ÙØ³Øª Ø¨ØØ§Ø¬Ø© ÙÙØØµÙÙ Ø¹ÙÙ 
Ø§ÙØ¹ÙØ§ÙÙÙ Ø§ÙØ¬Ø³Ø± ÙÙÙ ØªØ³ØªØ®Ø¯Ù ÙØ°Ù Ø§ÙÙÙØ§ÙÙ."
 
 #: bridges.page:28
 msgid "Getting bridge addresses"
@@ -163,12 +170,17 @@ msgid ""
 
"href=\"https://bridges.torproject.org/\;>https://bridges.torproject.org/"
 " and follow the instructions, or"
 msgstr ""
+"ÙÙ Ø¨Ø²ÙØ§Ø±Ø© https://bridges.torproject.org/\;>https://bridges.torproject.org/"
+" ÙØ§ØªØ¨Ø¹ Ø§ÙØªØ¹ÙÙÙØ§Øª ÙÙØ§ÙØ Ø£Ù"
 
 #: bridges.page:42
 msgid ""
 "Email brid...@torproject.org from a Gmail, Yahoo, or Riseup email address, "
 "or"
 msgstr ""
+"Ø±Ø§Ø³Ù brid...@torproject.org ÙÙ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯ Ø¥ÙÙØªØ±ÙÙÙ 
YahooØ GmailØ Ø£Ù RiseupØ "
+"Ø£Ù "
 
 #: bridges.page:51
 msgid "Entering bridge addresses"
@@ -178,7 +190,7 @@ msgstr "Ø¥Ø¯Ø®Ø§Ù Ø¹ÙØ§ÙÙÙ Ø§ÙØ¬Ø³Ø±"
 msgid ""
 "Once you have obtained some bridge addresses, you will need to enter them "
 "into Tor Launcher."
-msgstr ""
+msgstr "Ø¹ÙØ¯ ØØµÙÙÙ Ø¹ÙÙ Ø§ÙØ¹ÙØ§ÙÙÙ Ø§ÙØ¬Ø³Ø±Ø Ø³ÙÙÙÙ 
Ø¹ÙÙÙ Ø¥Ø¯Ø®Ø§ÙÙØ§ ÙÙ Ø¨Ø±ÙØ§ÙØ¬ Ø¥Ø·ÙØ§Ù Tor."
 
 #: bridges.page:57
 msgid ""
@@ -186,6 +198,8 @@ msgid ""
 " to the Tor network. Select âUse custom bridgesâ and enter each bridge "
 "address on a separate line."
 msgstr ""
+"Ø¥Ø®ØªØ± \"ÙØ¹Ù\" Ø¹ÙØ¯ Ø¸ÙÙØ± Ø§ÙØ³Ø¤Ø§Ù \"ÙÙ ÙØØ¬Ø¨ ÙØ²ÙÙØ¯ 
Ø§ÙØ¥ÙØªØ±ÙØª Ø§ÙØ®Ø§Øµ Ø¨Ù Ø§ÙØªÙØ§ØµÙ ÙØ¹ "
+"Ø´Ø¨ÙØ© TorØ\". Ø¥Ø®ØªØ± \"Ø§Ø³ØªØ®Ø¯Ù Ø¬Ø³ÙØ± Ø®Ø§ØµÙØ©\" ÙØ§Ø¯Ø®Ù 
Ø¹ÙÙØ§Ù ÙÙ Ø¬Ø³Ø± Ø¹ÙÙ Ø³Ø·Ø± ÙÙÙØ±Ø¯."
 
 #. 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
@@ -197,6 +211,8 @@ msgid ""
 "external ref='media/tor-launcher-custom-bridges_en-US.png' "
 "md5='93365c2aa3fb4d627497e83f28a39b7e'"
 msgstr ""
+"Ø§ÙÙØ±Ø¬Ø¹ Ø§ÙØ®Ø§Ø±Ø¬Ù='media/tor-launcher-custom-bridges_en-US.png' "
+"md5='93365c2aa3fb4d627497e83f28a39b7e'"
 
 #: bridges.page:65
 msgid ""
@@ -205,14 +221,17 @@ msgid ""
 " may be down. Please use one of the above methods to obtain more bridge "
 "addresses, and try again."
 msgstr ""
+"Ø¥ÙÙØ± \"ØªÙØ§ØµÙ\". Ø¥Ø³ØªØ®Ø¯Ø§Ù Ø§ÙØ¬Ø³ÙØ± ÙØ¯ ÙØ¨Ø·Ø¦ ØªÙØ§ØµÙ 
Ø§ÙØ¥ÙØªØ±ÙØª ÙÙØ§Ø±ÙØ© ÙØ¹ ÙØ±ØÙØ§Øª Tor "
+"Ø§ÙØ¹Ø§Ø¯ÙØ©. Ø¥Ù ÙØ´Ù Ø§ÙØªÙØ§ØµÙØ ÙØ¯ ØªÙÙÙ Ø§ÙØ¬Ø³ÙØ± 
ØºÙØ± Ø´ØºÙØ§ÙØ©. Ø¹ÙØ¯Ø¦Ø°Ø Ø§Ø³ØªØ®Ø¯Ù Ø±Ø¬Ø§Ø¡ Ø¥ØØ¯Ù "
+"Ø§ÙØ·Ø±Ù Ø§ÙÙØ°ÙÙØ±Ø© Ø£Ø¹ÙØ§Ù ÙØªØØµÙ Ø¹ÙÙ Ø¹ÙØ§ÙÙÙ Ø¬Ø³Ø± 
Ø£Ø®Ø±ÙØ ÙØ¹Ø§ÙØ¯ Ø§ÙÙØØ§ÙÙØ©."
 
 #: circumvention.page:6
 msgid "What to do if the Tor network is blocked"
-msgstr ""
+msgstr "ÙØ§ Ø§ÙØ¹ÙÙ ÙÙ ØØ§Ù ÙØ§ÙØª Ø´Ø¨ÙØ© Tor ÙØØ¬ÙØ¨Ø©"
 
 #: circumvention.page:10
 msgid "Circumvention"
-msgstr ""
+msgstr "Ø§ÙØ¥ÙØªÙØ§Ù Ø¹ÙÙ Ø§ÙØØ¬Ø¨"
 
 #: circumvention.page:12
 msgid ""

___
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

2017-04-13 Thread translation

commit 8bfe46fd45f7893d525daa3b23fd9c651df81643
Author: Translation commit bot 
Date:   Thu Apr 13 17:48:19 2017 +

Update translations for tor-browser-manual
---
 ar/ar.po | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/ar/ar.po b/ar/ar.po
index 1a78d3f..c3bb81d 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -91,6 +91,11 @@ msgid ""
 " last relay in the circuit (the âexit relayâ) then sends the traffic out "
 "onto the public Internet."
 msgstr ""
+"Tor ÙÙ Ø¹Ø¨Ø§Ø±Ø© Ø¹Ù Ø´Ø¨ÙØ© Ø£ÙÙØ§Ù Ø¥ÙØªØ±Ø§Ø¶ÙØ© ØªØ³ÙØ ÙÙ 
Ø¨ØÙØ§ÙØ© Ø®ØµÙØµÙÙØªÙ ÙØ£ÙØ§Ù ÙØ¹ÙÙÙØ§ØªÙ "
+"Ø¨Ø´ÙÙ Ø£ÙØ¶Ù Ø¹ÙÙ Ø§ÙØ¥ÙØªØ±ÙØª. ÙØ¹ÙÙ Tor Ø¹Ù Ø·Ø±ÙÙ 
Ø¥Ø±Ø³Ø§Ù Ø¨ÙØ§ÙØ§ØªÙ Ø¹Ø¨Ø± Ø«ÙØ§Ø«Ø© Ø®ÙØ§Ø¯Ù "
+"Ø¥ÙØªØ±Ø§Ø¶ÙØ© Ø¹Ø´ÙØ§Ø¦ÙØ© (ØªØ¹Ø±Ù Ø£ÙØ¶Ø§Ù Ø¨Ø¥Ø³Ù  Ø§ÙÙ
Ø±ØÙØ§Øª) Ø¯Ø§Ø®Ù Ø´Ø¨ÙØ© Tor. Ø¨Ø¹Ø¯ Ø°ÙÙ"
+" ØªÙÙÙ Ø§ÙÙØ±ØÙØ© Ø§ÙØ£Ø®ÙØ±Ø© ÙÙ Ø§ÙØ¯Ø§Ø¦Ø±Ø© (Ø£Ù ÙØ±ØÙØ© 
Ø§ÙØ®Ø±ÙØ¬) Ø¨Ø¥Ø±Ø³Ø§Ù Ø§ÙØ¨ÙØ§ÙØ§Øª Ø§ÙÙ Ø´Ø¨ÙØ© "
+"Ø§ÙØ¥ÙØªØ±ÙØª Ø§ÙØ¹Ø§ÙÙØ©. "
 
 #. 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
@@ -102,6 +107,8 @@ msgid ""
 "external ref='media/how-tor-works.png' "
 "md5='6fe4151a88b7a518466f0582e40ccc8c'"
 msgstr ""
+"Ø§ÙÙØ±Ø¬Ø¹ Ø§ÙØ®Ø§Ø±Ø¬Ù='media/how-tor-works.png' "
+"md5='6fe4151a88b7a518466f0582e40ccc8c'"
 
 #: about-tor-browser.page:60
 msgid ""
@@ -110,10 +117,13 @@ msgid ""
 "three keys represent the layers of encryption between the user and each "
 "relay."
 msgstr ""
+"ØªØ¸ÙØ± Ø§ÙØµÙØ±Ø© Ø§ÙØªÙ ÙÙ Ø§ÙØ£Ø¹ÙÙ ÙØ³ØªØ®Ø¯ÙØ§Ù 
ÙØªØµÙÙØ Ø¹Ø¯ÙÙ ÙÙØ§ÙØ¹ Ø¥ÙÙØªØ±ÙÙÙØ© Ø¹Ø¨Ø± Tor. "
+"ØªÙØ«ÙÙ Ø§ÙØÙØ§Ø³ÙØ¨ Ø§ÙØ®Ø¶Ø±Ø§Ø¡ ØºÙ Ø§ÙÙØ³Ø· Ø§ÙÙ Ø§ÙÙ
Ø±ØÙØ§Øª ÙÙ Ø´Ø¨ÙØ© Tor. Ø£ÙÙØ§ Ø§ÙÙÙØ§ØªÙØ "
+"Ø§ÙØ«ÙØ§Ø«Ø© ÙÙÙ ØªØµÙÙØ± Ø·Ø¨ÙØ§Øª Ø§ÙØªØ´ÙÙØ± Ø¨ÙÙ Ø§ÙÙ
Ø³ØªØ®Ø¯Ù ÙÙÙ ÙØ±ØÙØ©."
 
 #: bridges.page:6
 msgid "Learn what bridges are and how to get them"
-msgstr ""
+msgstr "ØªØ¹ÙÙÙ ÙØ§ÙÙÙØ© Ø§ÙØ¬Ø³ÙØ± ÙÙÙÙÙØ© Ø§ÙØØµÙÙ 
Ø¹ÙÙÙØ§."
 
 #: bridges.page:10
 msgid "Bridges"

___
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

2017-04-13 Thread translation

commit 35d293feb71a22597318b5998401b0a0298cfe07
Author: Translation commit bot 
Date:   Thu Apr 13 17:18:18 2017 +

Update translations for tor-browser-manual
---
 ar/ar.po | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ar/ar.po b/ar/ar.po
index be67d0c..1a78d3f 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -6,12 +6,13 @@
 # lamine Kacimi , 2016
 # runasand , 2016
 # ASSYASS Mahmoud , 2017
+# Leya Hanna , 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: ASSYASS Mahmoud , 2017\n"
+"Last-Translator: Leya Hanna , 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -65,6 +66,8 @@ msgid ""
 "In addition, Tor Browser is designed to prevent websites from "
 "âfingerprintingâ or identifying you based on your browser configuration."
 msgstr ""
+"Ø¨Ø§ÙØ¥Ø¶Ø§ÙØ©Ø ØªÙÙ ØªØµÙÙÙ ÙØªØµÙÙØ Tor ÙÙÙ ÙÙÙØ¹ Ø§ÙÙ
ÙØ§ÙØ¹  Ø§ÙØ¥ÙÙØªØ±ÙÙÙØ© ÙÙ \"Ø£Ø®Ø° Ø¨ØµÙØ§ØªÙ"
+" Ø§ÙØ¥ÙÙØªØ±ÙÙÙØ©\" Ø£Ù ÙÙ Ø§ÙØªØ¹Ø±ÙÙ Ø¹ÙÙ Ø¹Ø¨Ø± 
Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ÙØªØµÙÙØÙ."
 
 #: about-tor-browser.page:39
 msgid ""
@@ -72,6 +75,9 @@ msgid ""
 " valid for a single session (until Tor Browser is exited or a New Identity is requested)."
 msgstr ""
+"ÙÙ Ø¥Ø¹Ø¯Ø§Ø¯Ø§ØªÙ Ø§ÙØªÙÙØ§Ø¦ÙØ©Ø ÙØ§ ÙØÙØ¸ ÙØªØµÙÙØ Tor 
Ø£Ù Ø¬ÙØ³Ø§Øª Ø§ÙØªØµÙÙØ Ø§ÙØ³Ø§Ø¨ÙØ©. ØªØ¨ÙÙ "
+"Ø§ÙÙÙÙÙØ² Ø´ØºÙØ§ÙØ© ÙÙØ· ÙØ¬ÙØ³Ø© ÙØ§ØØ¯Ø© (Ø§ÙÙ Ø£Ù ÙØªÙ 
Ø§ÙØ®Ø±ÙØ¬ ÙÙ ÙØªØµÙÙØ Tor Ø£Ù Ø£Ù ÙØªÙ "
+"Ø·ÙØ¨  ÙÙÙÙØ© Ø¬Ø¯ÙØ¯Ø© 
)."
 
 #: about-tor-browser.page:50
 msgid "How Tor works"

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

[tor-commits] [torbutton/master] Translation updates

2017-04-13 Thread gk

commit 8bef7336ccc10aac408aeb0e88099fc42baa0757
Author: Georg Koppen 
Date:   Thu Apr 13 17:04:18 2017 +

Translation updates
---
 src/chrome/locale/fr/torbutton.properties| 2 +-
 src/chrome/locale/vi/aboutTor.dtd| 2 +-
 src/chrome/locale/zh-CN/aboutDialog.dtd  | 2 +-
 src/chrome/locale/zh-CN/torbutton.dtd| 2 +-
 src/chrome/locale/zh-CN/torbutton.properties | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/chrome/locale/fr/torbutton.properties 
b/src/chrome/locale/fr/torbutton.properties
index 51421c9..907babc 100644
--- a/src/chrome/locale/fr/torbutton.properties
+++ b/src/chrome/locale/fr/torbutton.properties
@@ -3,7 +3,7 @@ torbutton.circuit_display.ip_unknown = IP inconnue
 torbutton.circuit_display.onion_site = Site Oignon
 torbutton.circuit_display.this_browser = Ce navigateur
 torbutton.circuit_display.relay = relayer
-torbutton.circuit_display.tor_bridge = Pont
+torbutton.circuit_display.tor_bridge = Pont (Bridge)
 torbutton.circuit_display.unknown_country = Pays inconnu
 torbutton.content_sizer.margin_tooltip = Le navigateur Tor ajoute cette marge 
pour rendre la largeur et la hauteur de votre fenÃªtre moins distinctives, et 
pour rÃ©duire par consÃ©quent la possibilitÃ© que l'on vous suive Ã  la trace 
en ligne.
 torbutton.panel.tooltip.disabled = Cliquer pour activer Tor
diff --git a/src/chrome/locale/vi/aboutTor.dtd 
b/src/chrome/locale/vi/aboutTor.dtd
index d47d73a..4bc3ad5 100644
--- a/src/chrome/locale/vi/aboutTor.dtd
+++ b/src/chrome/locale/vi/aboutTor.dtd
@@ -30,7 +30,7 @@
 
 https://www.torproject.org/download/download.html.en#warning;>
 
-
+
 
 
 
diff --git a/src/chrome/locale/zh-CN/aboutDialog.dtd 
b/src/chrome/locale/zh-CN/aboutDialog.dtd
index 0f6da79..4e7c254 100644
--- a/src/chrome/locale/zh-CN/aboutDialog.dtd
+++ b/src/chrome/locale/zh-CN/aboutDialog.dtd
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
 
diff --git a/src/chrome/locale/zh-CN/torbutton.dtd 
b/src/chrome/locale/zh-CN/torbutton.dtd
index 86c18bf..0977b3d 100644
--- a/src/chrome/locale/zh-CN/torbutton.dtd
+++ b/src/chrome/locale/zh-CN/torbutton.dtd
@@ -43,7 +43,7 @@
 
 
 
-
+
 
 
 
diff --git a/src/chrome/locale/zh-CN/torbutton.properties 
b/src/chrome/locale/zh-CN/torbutton.properties
index 52484d7..398b639 100644
--- a/src/chrome/locale/zh-CN/torbutton.properties
+++ b/src/chrome/locale/zh-CN/torbutton.properties
@@ -21,7 +21,7 @@ torbutton.popup.dontask = ä»¥åèªå¨ä¸è½½æä»¶
 torbutton.popup.prompted_language = ä¸ºäºæ´å¥½å°ä¿æ¤éç§ï¼ Torbutton 
å¯ä»¥è¯·æ±ç½é¡µçè±è¯çæ¬ãè¿å¯è½å¯¼è´æ¨å¸ææµè§çæ¬åè¯è¨çç½é¡µä»¥è±è¯æ¾ç¤ºã\n\nä¸ºäºæ´å¥½å°ä¿æ¤éç§ï¼æ¯å¦è¯·æ±ç½é¡µä»¥è±è¯æ¾ç¤ºï¼
 torbutton.popup.no_newnym = Torbutton æ æ³å®å
¨å°ä¸ºæ¨åæ¢ä¸ä¸ªæ°èº«ä»½ãå®æ æ³è®¿é® Tor 
çæ§å¶ç«¯å£ã\n\næ¨ç®åæ£å¨ä½¿ç¨ Tor æµè§å¨å¥ä»¶åï¼
 torbutton.title.prompt_torbrowser = Torbutton éè¦ä¿¡æ¯
-torbutton.popup.prompt_torbrowser = Torbutton 
å·¥ä½æ¹å¼æææ¹åï¼å®ä¸åæ¯æä¸´æ¶å
³éã\n\nååºè¿ç§æ¹åæ¯å 
ä¸ºå¨éå¿åæµè§çæµè§å¨ä¸ï¼åæ¶ä½¿ç¨ Torbutton å¹¶ä¸å®å
¨ãæå¤ªå¤æ æ³åæçéè¯¯ã\n\nå¦ææ¨å¸ææ£å¸¸ä½¿ç¨ Firefox 
ï¼è¯·å¸è½½ Torbutton æä»¶ï¼ä¸è½½ Tor æµè§å¨å¥ä»¶ãTor 
æµè§å¨çéç§ç¹æ§ä¼äºæ®éç Firefox 
ï¼å³ä½¿Firefoxä¸ä½¿ç¨äºTorbuttonã\n\nç§»é¤ Torbuttonï¼è¯·å° å·¥å
·Tools->éå ç»ä»¶Addons->æ©å±Extensions ä¸ï¼å¨ Torbutton 
æç¹å»å¸è½½ã
+torbutton.popup.prompt_torbrowser = Torbutton 
å·¥ä½æ¹å¼æææ¹åï¼å®ä¸åè½å¤å³éã\n\nååºè¿ç§æ¹åæ¯å 
ä¸ºå¨éå¿åæµè§çæµè§å¨ä¸ï¼åæ¶ä½¿ç¨ Torbutton å¹¶ä¸å®å
¨ãæå¤ªå¤æ æ³åæçéè¯¯ã\n\nå¦ææ¨å¸ææ£å¸¸ä½¿ç¨ Firefox 
ï¼è¯·å¸è½½ Torbutton æä»¶ï¼ä¸è½½ Tor æµè§å¨å¥ä»¶ãTor 
æµè§å¨çéç§ç¹æ§ä¼äºæ®éç Firefox 
ï¼å³ä½¿Firefoxä¸ä½¿ç¨äºTorbuttonã\n\nç§»é¤ Torbuttonï¼è¯·å° å·¥å
·Tools->éå ç»ä»¶Addons->æ©å±Extensions ä¸ï¼å¨ Torbutton 
æç¹å»å¸è½½ã
 torbutton.popup.short_torbrowser = Torbutton éè¦ä¿¡æ¯ï¼\n\nTorbutton 
ç®åå·²ç¥å¤äºå¯ç¨ç¶æã\n\nç¹å» Torbutton è·åæ´å¤ä¿¡æ¯ã
 
 torbutton.popup.confirm_plugins = Flash 
ä¹ç±»çæä»¶å¯å¯¹ç¨æ·çéç§ä¸å¿åæ§é 
æå±å®³ã\n\nå®ä»¬è¿å¯è½ç»è¿ Tor èæ³æ¼ç¨æ·çå½åä½ç½®å IP 
å°åã\n\næ¯å¦ç¡®å®å¯ç¨æä»¶ï¼\n\n

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

[tor-commits] [tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 21795: Fix github.com crashes on Windows

2017-04-13 Thread gk

commit c90a0868540a9771cc10bdc1cf91b8f6a8f37603
Author: Georg Koppen 
Date:   Thu Apr 13 16:14:00 2017 +

Bug 21795: Fix github.com crashes on Windows

This is https://bugzilla.mozilla.org/show_bug.cgi?id=1351278
---
 js/src/jit/IonBuilder.cpp | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/js/src/jit/IonBuilder.cpp b/js/src/jit/IonBuilder.cpp
index 0413b11..1d3377b 100644
--- a/js/src/jit/IonBuilder.cpp
+++ b/js/src/jit/IonBuilder.cpp
@@ -6592,7 +6592,12 @@ IonBuilder::jsop_funapply(uint32_t argc)
 if (argument->type() != MIRType::MagicOptimizedArguments) {
 // Optimize fun.apply(self, array) if the length is sane and there are 
no holes.
 TemporaryTypeSet* objTypes = argument->resultTypeSet();
-if (native && native->isNative() && native->native() == fun_apply &&
+#ifdef XP_WIN
+bool opt = false;
+#else
+bool opt = true;
+#endif
+if (opt && native && native->isNative() && native->native() == 
fun_apply &&
 objTypes &&
 objTypes->getKnownClass(constraints()) == ::class_ &&
 !objTypes->hasObjectFlags(constraints(), 
OBJECT_FLAG_LENGTH_OVERFLOW) &&

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

[tor-commits] [tor-browser/tor-browser-52.0.2esr-7.0-2] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.

2017-04-13 Thread gk

commit 5e44400548a9fd480e6715771c75dad75796f1e7
Author: Nicolas Vigier 
Date:   Thu Apr 13 16:54:08 2017 +0200

fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.

Bug 19316: change update URL from update_2 to update_3
---
 browser/app/profile/firefox.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index d8bfeac..6b3385e 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -134,7 +134,7 @@ pref("app.update.badge", false);
 pref("app.update.staging.enabled", true);
 
 // Update service URL:
-pref("app.update.url", 
"https://aus1.torproject.org/torbrowser/update_2/%CHANNEL%/%BUILD_TARGET%/%VERSION%/%LOCALE%;);
+pref("app.update.url", 
"https://aus1.torproject.org/torbrowser/update_3/%CHANNEL%/%BUILD_TARGET%/%VERSION%/%LOCALE%;);
 
 // app.update.url.manual is in branding section
 // app.update.url.details is in branding section

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

[tor-commits] [tor-browser-bundle/maint-6.5] Picking up missing SSE2-related update patch

2017-04-13 Thread gk

commit 8b029dbb4394446afa0b157e18fe0014966c3dfd
Author: Georg Koppen 
Date:   Thu Apr 13 15:18:21 2017 +

Picking up missing SSE2-related update patch
---
 gitian/versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitian/versions b/gitian/versions
index 82f7e6e..7bde308 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -14,7 +14,7 @@ FIREFOX_VERSION=45.9.0esr
 
 TORBROWSER_UPDATE_CHANNEL=release
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build2
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build3
 TOR_TAG=tor-0.2.9.10
 TORLAUNCHER_TAG=0.2.10.3
 TORBUTTON_TAG=1.9.6.14

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

[tor-commits] [tor-browser/tor-browser-45.9.0esr-6.5-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.

2017-04-13 Thread gk

commit 15cf08adee2d81031b12769e75edb02eab85042b
Author: Nicolas Vigier 
Date:   Thu Apr 13 16:54:08 2017 +0200

fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.

Bug 19316: change update URL from update_2 to update_3

Change the update URL so that 6.5.1 users who don't have SSE available
are not updated to 7.0 directly when it is avaible.
---
 browser/app/profile/firefox.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index ce16a75..c40c936 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -147,7 +147,7 @@ pref("app.update.badge", false);
 pref("app.update.staging.enabled", true);
 
 // Update service URL:
-pref("app.update.url", 
"https://aus1.torproject.org/torbrowser/update_2/%CHANNEL%/%BUILD_TARGET%/%VERSION%/%LOCALE%;);
+pref("app.update.url", 
"https://aus1.torproject.org/torbrowser/update_3/%CHANNEL%/%BUILD_TARGET%/%VERSION%/%LOCALE%;);
 
 // app.update.url.manual is in branding section
 // app.update.url.details is in branding section

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

[tor-commits] [tor-browser-bundle/maint-6.5] Pick up a new tor-browser tag

2017-04-13 Thread gk

commit 652990244e81125aed75612a822eec86bb4c301c
Author: Georg Koppen 
Date:   Thu Apr 13 14:55:10 2017 +

Pick up a new tor-browser tag

We want to be able to deal with the SSE2 requirement for ESR52 without
shipping a Tor Browser 6.5.3 just for that.
---
 Bundle-Data/Docs/ChangeLog.txt | 1 +
 gitian/versions| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 1808047..8e186ce 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -4,6 +4,7 @@ Tor Browser 6.5.2 -- April 19 2017
* Update HTTPS-Everywhere to 5.2.14
* Update NoScript to 5.0.2
* Bug 21555+16450: Don't remove Authorization header on subdomains (e.g. 
Twitter)
+   * Bug 19316: Make sure our Windows updates can deal with the SSE2 
requirement
* Bug 21917: Add new obfs4 bridges
* Bug 21918: Move meek-amazon to d2cly7j4zqgua7.cloudfront.net backend
  * Windows
diff --git a/gitian/versions b/gitian/versions
index 1557a98..82f7e6e 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -14,7 +14,7 @@ FIREFOX_VERSION=45.9.0esr
 
 TORBROWSER_UPDATE_CHANNEL=release
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build2
 TOR_TAG=tor-0.2.9.10
 TORLAUNCHER_TAG=0.2.10.3
 TORBUTTON_TAG=1.9.6.14

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

[tor-commits] [tor-browser/tor-browser-45.9.0esr-6.5-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.

2017-04-13 Thread gk

commit db3f92ed23e12a2a9b9eac5be773d475897edfca
Author: Nicolas Vigier 
Date:   Fri Mar 10 17:32:04 2017 +0100

fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.

Bug 19316: add support for a minInstructionSet attribute in the update
manifests.
---
 toolkit/mozapps/update/nsUpdateService.js | 9 +
 1 file changed, 9 insertions(+)

diff --git a/toolkit/mozapps/update/nsUpdateService.js 
b/toolkit/mozapps/update/nsUpdateService.js
index 4ad5bb8..d098597 100644
--- a/toolkit/mozapps/update/nsUpdateService.js
+++ b/toolkit/mozapps/update/nsUpdateService.js
@@ -1512,6 +1512,15 @@ function Update(update) {
   this.unsupported = (Services.vc.compare(osVersion, minOSVersion) < 0);
 } catch (e) {}
   }
+  if (!this.unsupported && update.hasAttribute("minSupportedInstructionSet")) {
+let minInstructionSet = update.getAttribute("minSupportedInstructionSet");
+if (['MMX', 'SSE', 'SSE2', 'SSE3',
+'SSE4A', 'SSE4_1', 'SSE4_2'].indexOf(minInstructionSet) >= 0) {
+  try {
+this.unsupported = !Services.sysinfo.getProperty("has" + 
minInstructionSet);
+  } catch (e) {}
+}
+  }
 
   if (this._patches.length == 0 && !this.unsupported) {
 throw Cr.NS_ERROR_ILLEGAL_VALUE;

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

[tor-commits] [tor-browser/tor-browser-52.0.2esr-7.0-2] Backport of tjr's patch for bug 1353765

2017-04-13 Thread gk

commit db07e42c13b82aa62a6132be92974aca371546ac
Author: Georg Koppen 
Date:   Thu Apr 13 14:25:03 2017 +

Backport of tjr's patch for bug 1353765

It's not clear if it is still needed but we take it to be on the safe
side. This closes #21868.
---
 dom/filesystem/compat/FileSystemDirectoryReader.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dom/filesystem/compat/FileSystemDirectoryReader.h 
b/dom/filesystem/compat/FileSystemDirectoryReader.h
index d568990..391a793 100644
--- a/dom/filesystem/compat/FileSystemDirectoryReader.h
+++ b/dom/filesystem/compat/FileSystemDirectoryReader.h
@@ -10,6 +10,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BindingDeclarations.h"
+#include "mozilla/dom/FileSystemDirectoryEntry.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWrapperCache.h"
 

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

[tor-commits] [tor-browser/tor-browser-52.0.2esr-7.0-2] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.

2017-04-13 Thread gk

commit 3e531451125720e28f3b7fd113af19b5d02aad18
Author: Nicolas Vigier 
Date:   Fri Mar 10 17:32:04 2017 +0100

fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.

Bug 19316: add support for a minInstructionSet attribute in the update
manifests.
---
 toolkit/mozapps/update/nsUpdateService.js | 9 +
 1 file changed, 9 insertions(+)

diff --git a/toolkit/mozapps/update/nsUpdateService.js 
b/toolkit/mozapps/update/nsUpdateService.js
index 699632d..8abc55a 100644
--- a/toolkit/mozapps/update/nsUpdateService.js
+++ b/toolkit/mozapps/update/nsUpdateService.js
@@ -1550,6 +1550,15 @@ function Update(update) {
   this.unsupported = (Services.vc.compare(osVersion, minOSVersion) < 0);
 } catch (e) {}
   }
+  if (!this.unsupported && update.hasAttribute("minSupportedInstructionSet")) {
+let minInstructionSet = update.getAttribute("minSupportedInstructionSet");
+if (['MMX', 'SSE', 'SSE2', 'SSE3',
+'SSE4A', 'SSE4_1', 'SSE4_2'].indexOf(minInstructionSet) >= 0) {
+  try {
+this.unsupported = !Services.sysinfo.getProperty("has" + 
minInstructionSet);
+  } catch (e) {}
+}
+  }
 
   if (this._patches.length == 0 && !this.unsupported) {
 throw Cr.NS_ERROR_ILLEGAL_VALUE;

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

[tor-commits] [tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 1342887 - Detect and log failures to dispatch SetupMacCommandLine to the main thread. r=rstrong

2017-04-13 Thread gk

commit 4cec6538e51ac73c6a46ec582ee0b2794c7d81d9
Author: Matt Howell 
Date:   Mon Feb 27 13:57:11 2017 -0800

Bug 1342887 - Detect and log failures to dispatch SetupMacCommandLine to 
the main thread. r=rstrong

MozReview-Commit-ID: LMoxF5yfXq2

--HG--
extra : rebase_source : c206e32bf8abf1aa225901ff5cde390a8a2ecec7
---
 toolkit/xre/nsUpdateDriver.cpp | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp
index 7af085a..3abbf7f 100644
--- a/toolkit/xre/nsUpdateDriver.cpp
+++ b/toolkit/xre/nsUpdateDriver.cpp
@@ -108,14 +108,24 @@ UpdateDriverSetupMacCommandLine(int& argc, char**& argv, 
bool restart)
   // monitor to signal us when that happens, and block until then.
   Monitor monitor("nsUpdateDriver SetupMacCommandLine");
 
-  NS_DispatchToMainThread(
+  nsresult rv = NS_DispatchToMainThread(
 NS_NewRunnableFunction([, , restart, ]() -> void
 {
   CommandLineServiceMac::SetupMacCommandLine(argc, argv, restart);
   MonitorAutoLock(monitor).Notify();
 }));
 
-  MonitorAutoLock(monitor).Wait();
+  if (NS_FAILED(rv)) {
+LOG(("Update driver error dispatching SetupMacCommandLine to main thread: 
%d\n", rv));
+return;
+  }
+
+  // The length of this wait is arbitrary, but should be long enough that 
having
+  // it expire means something is seriously wrong.
+  rv = MonitorAutoLock(monitor).Wait(PR_SecondsToInterval(60));
+  if (NS_FAILED(rv)) {
+LOG(("Update driver timed out waiting for SetupMacCommandLine: %d\n", rv));
+  }
 }
 #endif
 

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

[tor-commits] [tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 1335916 - Make sure the update driver only calls SetupMacCommandLine from the main thread. r=rstrong

2017-04-13 Thread gk

commit 899435e1997583bd01ab31e363fe3153486dd134
Author: Matt Howell 
Date:   Thu Feb 2 15:29:32 2017 -0800

Bug 1335916 - Make sure the update driver only calls SetupMacCommandLine 
from the main thread. r=rstrong

MozReview-Commit-ID: 9nOgB6z8ooE

--HG--
extra : rebase_source : 6a6a18f64297a0bd44e7d6f49b1812e035636e4c
---
 toolkit/xre/nsUpdateDriver.cpp | 32 ++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp
index a9dbeff..7af085a 100644
--- a/toolkit/xre/nsUpdateDriver.cpp
+++ b/toolkit/xre/nsUpdateDriver.cpp
@@ -32,6 +32,7 @@
 #include "nsCommandLineServiceMac.h"
 #include "MacLaunchHelper.h"
 #include "updaterfileutils_osx.h"
+#include "mozilla/Monitor.h"
 #endif
 
 #if defined(XP_WIN)
@@ -91,6 +92,33 @@ static const int  kAppUpdaterIOPrioClassDefault = 
IOPRIO_CLASS_IDLE;
 static const int  kAppUpdaterIOPrioLevelDefault = 0;  // Doesn't matter 
for CLASS IDLE
 #endif
 
+#ifdef XP_MACOSX
+static void
+UpdateDriverSetupMacCommandLine(int& argc, char**& argv, bool restart)
+{
+  if (NS_IsMainThread()) {
+CommandLineServiceMac::SetupMacCommandLine(argc, argv, restart);
+return;
+  }
+  // Bug 1335916: SetupMacCommandLine calls a CoreFoundation function that
+  // asserts that it was called from the main thread, so if we are not the main
+  // thread, we have to dispatch that call to there. But we also have to get 
the
+  // result from it, so we can't just dispatch and return, we have to wait
+  // until the dispatched operation actually completes. So we also set up a
+  // monitor to signal us when that happens, and block until then.
+  Monitor monitor("nsUpdateDriver SetupMacCommandLine");
+
+  NS_DispatchToMainThread(
+NS_NewRunnableFunction([, , restart, ]() -> void
+{
+  CommandLineServiceMac::SetupMacCommandLine(argc, argv, restart);
+  MonitorAutoLock(monitor).Notify();
+}));
+
+  MonitorAutoLock(monitor).Wait();
+}
+#endif
+
 static nsresult
 GetCurrentWorkingDir(char *buf, size_t size)
 {
@@ -735,7 +763,7 @@ SwitchToUpdatedApp(nsIFile *greDir, nsIFile *updateDir,
   }
   _exit(0);
 #elif defined(XP_MACOSX)
-  CommandLineServiceMac::SetupMacCommandLine(argc, argv, true);
+  UpdateDriverSetupMacCommandLine(argc, argv, true);
   LaunchChildMac(argc, argv);
   exit(0);
 #else
@@ -1072,7 +1100,7 @@ ApplyUpdate(nsIFile *greDir, nsIFile *updateDir, nsIFile 
*statusFile,
 _exit(0);
   }
 #elif defined(XP_MACOSX)
-  CommandLineServiceMac::SetupMacCommandLine(argc, argv, restart);
+  UpdateDriverSetupMacCommandLine(argc, argv, restart);
 #ifdef DEBUG
   dump_argv("ApplyUpdate after SetupMacCommandLine", argv, argc);
 #endif



___
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 'dgoulet/bug21155_031_02'

2017-04-13 Thread nickm

commit 63e39b291e97438460814e6428f102aeb8528324
Merge: 28ec2d9 e5fc02c
Author: Nick Mathewson 
Date:   Thu Apr 13 09:56:14 2017 -0400

Merge remote-tracking branch 'dgoulet/bug21155_031_02'

 changes/bug21155 |  5 +
 src/or/config.c  | 14 ++
 2 files changed, 19 insertions(+)

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

[tor-commits] [tor/master] config: Warn if EntryNodes and HiddenService are used together

2017-04-13 Thread nickm

commit e5fc02c81c39896a31ee8bb3e26659f917322ed1
Author: David Goulet 
Date:   Wed Apr 5 16:47:55 2017 -0400

config: Warn if EntryNodes and HiddenService are used together

Pinning EntryNodes along with hidden services can be possibly harmful (for
instance #14917 and #21155) so at the very least warn the operator if this 
is
the case.

Fixes #21155

Signed-off-by: David Goulet 
---
 changes/bug21155 |  5 +
 src/or/config.c  | 14 ++
 2 files changed, 19 insertions(+)

diff --git a/changes/bug21155 b/changes/bug21155
new file mode 100644
index 000..f2a34db
--- /dev/null
+++ b/changes/bug21155
@@ -0,0 +1,5 @@
+  o Minor bugfixes (hidden service, logging):
+- Warn user if multiple entries in  EntryNodes and at least one
+  HiddenService are used together. Pinning EntryNodes along with an hidden
+  service can be possibly harmful for instance see ticket 14917 or 21155.
+  Closes bug 21155.
diff --git a/src/or/config.c b/src/or/config.c
index 7ae4005..809ff49 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3510,6 +3510,20 @@ options_validate(or_options_t *old_options, or_options_t 
*options,
 return -1;
   }
 
+  /* Inform the hidden service operator that pinning EntryNodes can possibly
+   * be harmful for the service anonymity. */
+  if (options->EntryNodes &&
+  routerset_is_list(options->EntryNodes) &&
+  (options->RendConfigLines != NULL)) {
+log_warn(LD_CONFIG,
+ "EntryNodes is set with multiple entries and at least one "
+ "hidden service is configured. Pinning entry nodes can possibly "
+ "be harmful to the service anonymity. Because of this, we "
+ "recommend you either don't do that or make sure you know what "
+ "you are doing. For more details, please look at "
+ "https://trac.torproject.org/projects/tor/ticket/21155.;);
+  }
+
   /* Single Onion Services: non-anonymous hidden services */
   if (rend_service_non_anonymous_mode_enabled(options)) {
 log_warn(LD_CONFIG,



___
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 'dgoulet/ticket21919_031_01'

2017-04-13 Thread nickm

commit 28ec2d9c2cbb300af8ba467898626020add977c4
Merge: 755c88a bf68c78
Author: Nick Mathewson 
Date:   Thu Apr 13 09:38:59 2017 -0400

Merge remote-tracking branch 'dgoulet/ticket21919_031_01'

 src/ext/trunnel/trunnel.c   |   2 +-
 src/or/hs_intropoint.c  |  91 +++---
 src/or/hs_intropoint.h  |   4 +-
 src/or/hs_service.c |  42 +--
 src/or/hs_service.h |   4 +-
 src/test/test_hs_intropoint.c   | 102 +++
 src/test/test_hs_service.c  |  14 +-
 src/trunnel/hs/cell_common.c| 179 ++--
 src/trunnel/hs/cell_common.h| 207 +++---
 src/trunnel/hs/cell_common.trunnel  |   6 +-
 src/trunnel/hs/cell_establish_intro.c   | 242 
 src/trunnel/hs/cell_establish_intro.h   | 237 
 src/trunnel/hs/cell_establish_intro.trunnel |  10 +-
 src/trunnel/hs/cell_introduce1.c| 398 +-
 src/trunnel/hs/cell_introduce1.h| 416 ++--
 src/trunnel/hs/cell_introduce1.trunnel  |  14 +-
 16 files changed, 988 insertions(+), 980 deletions(-)

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

[tor-commits] [tor/master] hs: Make check-spaces happy after rename

2017-04-13 Thread nickm

commit bf68c78e942b196e65e2d8ae6f172a5a6a363561
Author: David Goulet 
Date:   Wed Apr 12 07:53:05 2017 -0400

hs: Make check-spaces happy after rename

Signed-off-by: David Goulet 
---
 src/or/hs_intropoint.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c
index b0515be..c32d244 100644
--- a/src/or/hs_intropoint.c
+++ b/src/or/hs_intropoint.c
@@ -94,7 +94,8 @@ verify_establish_intro_cell(const trn_cell_establish_intro_t 
*cell,
   /* Verify the sig */
   {
 ed25519_signature_t sig_struct;
-const uint8_t *sig_array = 
trn_cell_establish_intro_getconstarray_sig(cell);
+const uint8_t *sig_array =
+  trn_cell_establish_intro_getconstarray_sig(cell);
 
 /* Make sure the signature length is of the right size. For EXTRA safety,
  * we check both the size of the array and the length which must be the



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

[tor-commits] [tor/master] prop224: Add basic HS ntor unittest.

2017-04-13 Thread nickm

commit 18ee145cdafb8de265a506439fd66c80f1b8f70a
Author: George Kadianakis 
Date:   Tue Feb 28 13:50:17 2017 +0200

prop224: Add basic HS ntor unittest.

The test checks that introduce1/rendezvous1 key material is generated
correctly both for client-side and service-side.
---
 src/test/test_hs_service.c | 97 ++
 1 file changed, 97 insertions(+)

diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c
index 039d727..48542c7 100644
--- a/src/test/test_hs_service.c
+++ b/src/test/test_hs_service.c
@@ -17,6 +17,8 @@
 #include "hs_service.h"
 #include "hs_intropoint.h"
 
+#include "hs_ntor.h"
+
 /** We simulate the creation of an outgoing ESTABLISH_INTRO cell, and then we
  *  parse it from the receiver side. */
 static void
@@ -100,11 +102,106 @@ test_gen_establish_intro_cell_bad(void *arg)
   UNMOCK(ed25519_sign_prefixed);
 }
 
+/** Test the HS ntor handshake. Simulate the sending of an encrypted INTRODUCE1
+ *  cell, and verify the proper derivation of decryption keys on the other end.
+ *  Then simulate the sending of an authenticated RENDEZVOUS1 cell and verify
+ *  the proper verification on the other end. */
+static void
+test_hs_ntor(void *arg)
+{
+  int retval;
+
+  uint8_t subcredential[DIGEST256_LEN];
+
+  ed25519_keypair_t service_intro_auth_keypair;
+  curve25519_keypair_t service_intro_enc_keypair;
+  curve25519_keypair_t service_ephemeral_rend_keypair;
+
+  curve25519_keypair_t client_ephemeral_enc_keypair;
+
+  hs_ntor_intro_cell_keys_t client_hs_ntor_intro_cell_keys;
+  hs_ntor_intro_cell_keys_t service_hs_ntor_intro_cell_keys;
+
+  hs_ntor_rend_cell_keys_t service_hs_ntor_rend_cell_keys;
+  hs_ntor_rend_cell_keys_t client_hs_ntor_rend_cell_keys;
+
+  (void) arg;
+
+  /* Generate fake data for this unittest */
+  {
+/* Generate fake subcredential */
+memset(subcredential, 'Z', DIGEST256_LEN);
+
+/* service */
+curve25519_keypair_generate(_intro_enc_keypair, 0);
+ed25519_keypair_generate(_intro_auth_keypair, 0);
+curve25519_keypair_generate(_ephemeral_rend_keypair, 0);
+/* client */
+curve25519_keypair_generate(_ephemeral_enc_keypair, 0);
+  }
+
+  /* Client: Simulate the sending of an encrypted INTRODUCE1 cell */
+  retval =
+hs_ntor_client_get_introduce1_keys(_intro_auth_keypair.pubkey,
+   _intro_enc_keypair.pubkey,
+   _ephemeral_enc_keypair,
+   subcredential,
+   _hs_ntor_intro_cell_keys);
+  tt_int_op(retval, ==, 0);
+
+  /* Service: Simulate the decryption of the received INTRODUCE1 */
+  retval =
+hs_ntor_service_get_introduce1_keys(_intro_auth_keypair.pubkey,
+_intro_enc_keypair,
+_ephemeral_enc_keypair.pubkey,
+subcredential,
+_hs_ntor_intro_cell_keys);
+  tt_int_op(retval, ==, 0);
+
+  /* Test that the INTRODUCE1 encryption/mac keys match! */
+  tt_mem_op(client_hs_ntor_intro_cell_keys.enc_key, OP_EQ,
+service_hs_ntor_intro_cell_keys.enc_key,
+CIPHER256_KEY_LEN);
+  tt_mem_op(client_hs_ntor_intro_cell_keys.mac_key, OP_EQ,
+service_hs_ntor_intro_cell_keys.mac_key,
+DIGEST256_LEN);
+
+  /* Service: Simulate creation of RENDEZVOUS1 key material. */
+  retval =
+hs_ntor_service_get_rendezvous1_keys(_intro_auth_keypair.pubkey,
+ _intro_enc_keypair,
+ _ephemeral_rend_keypair,
+ _ephemeral_enc_keypair.pubkey,
+ _hs_ntor_rend_cell_keys);
+  tt_int_op(retval, ==, 0);
+
+  /* Client: Simulate the verification of a received RENDEZVOUS1 cell */
+  retval =
+hs_ntor_client_get_rendezvous1_keys(_intro_auth_keypair.pubkey,
+_ephemeral_enc_keypair,
+_intro_enc_keypair.pubkey,
+_ephemeral_rend_keypair.pubkey,
+_hs_ntor_rend_cell_keys);
+  tt_int_op(retval, ==, 0);
+
+  /* Test that the RENDEZVOUS1 key material match! */
+  tt_mem_op(client_hs_ntor_rend_cell_keys.rend_cell_auth_mac, OP_EQ,
+service_hs_ntor_rend_cell_keys.rend_cell_auth_mac,
+DIGEST256_LEN);
+  tt_mem_op(client_hs_ntor_rend_cell_keys.ntor_key_seed, OP_EQ,
+service_hs_ntor_rend_cell_keys.ntor_key_seed,
+DIGEST256_LEN);
+
+ done:
+  ;
+}
+
 struct testcase_t hs_service_tests[] = {
   { "gen_establish_intro_cell", test_gen_establish_intro_cell, TT_FORK,
 NULL, NULL },
   { "gen_establish_intro_cell_bad", test_gen_establish_intro_cell_bad, TT_FORK,
 NULL, NULL },
+  { "hs_ntor",

[tor-commits] [tor/master] prop224: Add Python integration tests for HS ntor.

2017-04-13 Thread nickm

commit ea5901bf1c6f201f5618aca21ddbb9c41893f147
Author: George Kadianakis 
Date:   Tue Mar 14 15:06:36 2017 +0200

prop224: Add Python integration tests for HS ntor.

This test is identical to the ./src/test/test_ntor.sh integration test.
---
 .gitignore |   2 +
 src/test/hs_ntor_ref.py| 408 +
 src/test/include.am|  17 +-
 src/test/test_hs_ntor.sh   |  11 ++
 src/test/test_hs_ntor_cl.c | 255 
 5 files changed, 691 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index d33b797..0491638 100644
--- a/.gitignore
+++ b/.gitignore
@@ -179,6 +179,7 @@ uptime-*.json
 /src/test/test-child
 /src/test/test-memwipe
 /src/test/test-ntor-cl
+/src/test/test-hs-ntor-cl
 /src/test/test-switch-id
 /src/test/test-timers
 /src/test/test_workqueue
@@ -187,6 +188,7 @@ uptime-*.json
 /src/test/test-bt-cl.exe
 /src/test/test-child.exe
 /src/test/test-ntor-cl.exe
+/src/test/test-hs-ntor-cl.exe
 /src/test/test-memwipe.exe
 /src/test/test-switch-id.exe
 /src/test/test-timers.exe
diff --git a/src/test/hs_ntor_ref.py b/src/test/hs_ntor_ref.py
new file mode 100644
index 000..813e797
--- /dev/null
+++ b/src/test/hs_ntor_ref.py
@@ -0,0 +1,408 @@
+#!/usr/bin/python
+# Copyright 2017, The Tor Project, Inc
+# See LICENSE for licensing information
+
+"""
+hs_ntor_ref.py
+
+This module is a reference implementation of the modified ntor protocol
+proposed for Tor hidden services in proposal 224 (Next Generation Hidden
+Services) in section [NTOR-WITH-EXTRA-DATA].
+
+The modified ntor protocol is a single-round protocol, with three steps in 
total:
+
+1: Client generates keys and sends them to service via INTRODUCE cell
+
+2: Service computes key material based on client's keys, and sends its own
+   keys to client via RENDEZVOUS cell
+
+3: Client computes key material as well.
+
+It's meant to be used to validate Tor's HS ntor implementation by conducting
+various integration tests. Specifically it conducts the following three tests:
+
+- Tests our Python implementation by running the whole protocol in Python and
+  making sure that results are consistent.
+
+- Tests little-t-tor ntor implementation. We use this Python code to instrument
+  little-t-tor and carry out the handshake by using little-t-tor code. The
+  small C wrapper at src/test/test-hs-ntor-cl is used for this Python module to
+  interface with little-t-tor.
+
+- Cross-tests Python and little-t-tor implementation by running half of the
+  protocol in Python code and the other in little-t-tor. This is actually two
+  tests so that all parts of the protocol are run both by little-t-tor and
+  Python.
+
+It requires the curve25519 python module from the curve25519-donna package.
+
+The whole logic and concept for this test suite was taken from ntor_ref.py.
+
+*** DO NOT USE THIS IN PRODUCTION. ***
+"""
+
+import struct
+import os, sys
+import binascii
+import subprocess
+
+try:
+import curve25519
+curve25519mod = curve25519.keys
+except ImportError:
+curve25519 = None
+import slownacl_curve25519
+curve25519mod = slownacl_curve25519
+
+try:
+import sha3
+except ImportError:
+# error code 77 tells automake to skip this test
+sys.exit(77)
+
+# Import Nick's ntor reference implementation in Python
+# We are gonna use a few of its utilities.
+from ntor_ref import hash_nil
+from ntor_ref import PrivateKey
+
+# String constants used in this protocol
+PROTOID = "tor-hs-ntor-curve25519-sha3-256-1"
+T_HSENC= PROTOID + ":hs_key_extract"
+T_HSVERIFY = PROTOID + ":hs_verify"
+T_HSMAC= PROTOID + ":hs_mac"
+M_HSEXPAND = PROTOID + ":hs_key_expand"
+
+INTRO_SECRET_LEN = 161
+REND_SECRET_LEN = 225
+AUTH_INPUT_LEN = 199
+
+# Implements MAC(k,m) = H(htonll(len(k)) | k | m)
+def mac(k,m):
+def htonll(num):
+return struct.pack('!q', num)
+
+s = sha3.SHA3256()
+s.update(htonll(len(k)))
+s.update(k)
+s.update(m)
+return s.digest()
+
+##
+
+# Functions that implement the modified HS ntor protocol
+
+"""As client compute key material for INTRODUCE cell as follows:
+
+  intro_secret_hs_input = EXP(B,x) | AUTH_KEY | X | B | PROTOID
+  info = m_hsexpand | subcredential
+  hs_keys = KDF(intro_secret_hs_input | t_hsenc | info, S_KEY_LEN+MAC_LEN)
+  ENC_KEY = hs_keys[0:S_KEY_LEN]
+  MAC_KEY = hs_keys[S_KEY_LEN:S_KEY_LEN+MAC_KEY_LEN]
+"""
+def intro2_ntor_client(intro_auth_pubkey_str, intro_enc_pubkey,
+   client_ephemeral_enc_pubkey, 
client_ephemeral_enc_privkey, subcredential):
+
+dh_result = client_ephemeral_enc_privkey.get_shared_key(intro_enc_pubkey, 
hash_nil)
+secret =  dh_result + intro_auth_pubkey_str + 
client_ephemeral_enc_pubkey.serialize() + intro_enc_pubkey.serialize() + PROTOID
+assert(len(secret) == INTRO_SECRET_LEN)
+info = M_HSEXPAND +

[tor-commits] [tor/master] Merge branch 'asn/prop224-ntor-v2-squashed'

2017-04-13 Thread nickm

commit 755c88a4746b8b58d1b36486a611abc2d4f44144
Merge: 01fc93f ea5901b
Author: Nick Mathewson 
Date:   Thu Apr 13 09:22:34 2017 -0400

Merge branch 'asn/prop224-ntor-v2-squashed'

 .gitignore |   2 +
 src/or/hs_ntor.c   | 626 +
 src/or/hs_ntor.h   |  77 ++
 src/or/include.am  |   2 +
 src/test/hs_ntor_ref.py| 408 +
 src/test/include.am|  17 +-
 src/test/test_hs_ntor.sh   |  11 +
 src/test/test_hs_ntor_cl.c | 255 ++
 src/test/test_hs_service.c |  97 +++
 9 files changed, 1493 insertions(+), 2 deletions(-)

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

[tor-commits] [tor/master] prop224: Add module that performs the HS ntor handshake.

2017-04-13 Thread nickm

commit 50b0bc5bfe7903ba129baaed86ac409541ebfdf8
Author: George Kadianakis 
Date:   Tue Feb 28 13:46:36 2017 +0200

prop224: Add module that performs the HS ntor handshake.

and also does the key expansion.
---
 src/or/hs_ntor.c  | 626 ++
 src/or/hs_ntor.h  |  77 +++
 src/or/include.am |   2 +
 3 files changed, 705 insertions(+)

diff --git a/src/or/hs_ntor.c b/src/or/hs_ntor.c
new file mode 100644
index 000..1198998
--- /dev/null
+++ b/src/or/hs_ntor.c
@@ -0,0 +1,626 @@
+/* Copyright (c) 2017, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/** \file hs_ntor.c
+ *  \brief Implements the ntor variant used in Tor hidden services.
+ *
+ *  \details
+ *  This module handles the variant of the ntor handshake that is documented in
+ *  section [NTOR-WITH-EXTRA-DATA] of rend-spec-ng.txt .
+ *
+ *  The functions in this file provide an API that should be used when sending
+ *  or receiving INTRODUCE1/RENDEZVOUS1 cells to generate the various key
+ *  material required to create and handle those cells.
+ *
+ *  In the case of INTRODUCE1 it provides encryption and MAC keys to
+ *  encode/decode the encrypted blob (see hs_ntor_intro_cell_keys_t). The
+ *  relevant pub functions are hs_ntor_{client,service}_get_introduce1_keys().
+ *
+ *  In the case of RENDEZVOUS1 it calculates the MAC required to authenticate
+ *  the cell, and also provides the key seed that is used to derive the crypto
+ *  material for rendezvous encryption (see hs_ntor_rend_cell_keys_t). The
+ *  relevant pub functions are hs_ntor_{client,service}_get_rendezvous1_keys().
+ *  It also provides a function (hs_ntor_circuit_key_expansion()) that does the
+ *  rendezvous key expansion to setup end-to-end rend circuit keys.
+ */
+
+#include "or.h"
+#include "hs_ntor.h"
+
+/* String constants used by the ntor HS protocol */
+#define PROTOID "tor-hs-ntor-curve25519-sha3-256-1"
+#define PROTOID_LEN (sizeof(PROTOID) - 1)
+#define SERVER_STR "Server"
+#define SERVER_STR_LEN (sizeof(SERVER_STR) - 1)
+
+/* Protocol-specific tweaks to our crypto inputs */
+#define T_HSENC PROTOID ":hs_key_extract"
+#define T_HSENC_LEN (sizeof(T_HSENC) - 1)
+#define T_HSVERIFY PROTOID ":hs_verify"
+#define T_HSMAC PROTOID ":hs_mac"
+#define M_HSEXPAND PROTOID ":hs_key_expand"
+#define M_HSEXPAND_LEN (sizeof(M_HSEXPAND) - 1)
+
+/* Helper functions: ***/
+
+/** Helper macro: copy len bytes from inp to ptr and
+ *advance ptr by the number of bytes copied. Stolen from onion_ntor.c */
+#define APPEND(ptr, inp, len)   \
+  STMT_BEGIN {  \
+memcpy(ptr, (inp), (len));  \
+ptr += len; \
+  } STMT_END
+
+/* Length of EXP(X,y) | EXP(X,b) | AUTH_KEY | B | X | Y | PROTOID */
+#define REND_SECRET_HS_INPUT_LEN (CURVE25519_OUTPUT_LEN * 2 + \
+  ED25519_PUBKEY_LEN + CURVE25519_PUBKEY_LEN * 3 + PROTOID_LEN)
+/* Length of auth_input = verify | AUTH_KEY | B | Y | X | PROTOID | "Server" */
+#define REND_AUTH_INPUT_LEN (DIGEST256_LEN + ED25519_PUBKEY_LEN + \
+  CURVE25519_PUBKEY_LEN * 3 + PROTOID_LEN + SERVER_STR_LEN)
+
+/** Helper function: Compute the last part of the HS ntor handshake which
+ *  derives key material necessary to create and handle RENDEZVOUS1
+ *  cells. Function used by both client and service. The actual calculations is
+ *  as follows:
+ *
+ *NTOR_KEY_SEED = MAC(rend_secret_hs_input, t_hsenc)
+ *verify = MAC(rend_secret_hs_input, t_hsverify)
+ *auth_input = verify | AUTH_KEY | B | Y | X | PROTOID | "Server"
+ *auth_input_mac = MAC(auth_input, t_hsmac)
+ *
+ *  where in the above, AUTH_KEY is intro_auth_pubkey, B is
+ *  intro_enc_pubkey, Y is service_ephemeral_rend_pubkey, and X
+ *  is client_ephemeral_enc_pubkey. The provided
+ *  rend_secret_hs_input is of size REND_SECRET_HS_INPUT_LEN.
+ *
+ *  The final results of NTOR_KEY_SEED and auth_input_mac are placed in
+ *  hs_ntor_rend_cell_keys_out. Return 0 if everything went fine. */
+static int
+get_rendezvous1_key_material(const uint8_t *rend_secret_hs_input,
+  const ed25519_public_key_t *intro_auth_pubkey,
+  const curve25519_public_key_t *intro_enc_pubkey,
+  const curve25519_public_key_t *service_ephemeral_rend_pubkey,
+  const curve25519_public_key_t *client_ephemeral_enc_pubkey,
+  hs_ntor_rend_cell_keys_t *hs_ntor_rend_cell_keys_out)
+{
+  int bad = 0;
+  uint8_t ntor_key_seed[DIGEST256_LEN];
+  uint8_t ntor_verify[DIGEST256_LEN];
+  uint8_t rend_auth_input[REND_AUTH_INPUT_LEN];
+  uint8_t rend_cell_auth[DIGEST256_LEN];
+  uint8_t *ptr;
+
+  /* Let's build NTOR_KEY_SEED */
+  crypto_mac_sha3_256(ntor_key_seed, sizeof(ntor_key_seed),
+  rend_secret_hs_input, REND_SECRET_HS_INPUT_LEN,
+  (const uint8_t *)T_HSENC,

[tor-commits] [tor-browser-bundle/maint-6.5] Fix typo in changelog

2017-04-13 Thread gk

commit 7974cac344e5610f4f1cec42b668251e62579ac2
Author: Georg Koppen 
Date:   Thu Apr 13 10:18:38 2017 +

Fix typo in changelog
---
 Bundle-Data/Docs/ChangeLog.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index c8d6fcc..1808047 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -3,7 +3,7 @@ Tor Browser 6.5.2 -- April 19 2017
* Update Firefox to 45.9.0esr
* Update HTTPS-Everywhere to 5.2.14
* Update NoScript to 5.0.2
-   * Bug 21555+16450: Don't remove Authorization header on subdomains (e.g.  
Twitter)
+   * Bug 21555+16450: Don't remove Authorization header on subdomains (e.g. 
Twitter)
* Bug 21917: Add new obfs4 bridges
* Bug 21918: Move meek-amazon to d2cly7j4zqgua7.cloudfront.net backend
  * Windows

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

[tor-commits] [torbutton/master] Bug 21865: Update our JIT preferences in the slider

2017-04-13 Thread gk

commit cb73494b177f0dcb595920090a81af5621083f8d
Author: Georg Koppen 
Date:   Thu Apr 13 09:24:04 2017 +

Bug 21865: Update our JIT preferences in the slider

It turns out that the JIT *.content prefs are gone for a while now. This
happened in https://bugzilla.mozilla.org/show_bug.cgi?id=939562 and the
patch updates the security slider to take this into account. We got the
tip to include `javascript.options.native_regexp` as well.

`javascript.options.typeinference` is gone with
https://bugzilla.mozilla.org/show_bug.cgi?id=972817 and we therefore
remove it. And asm.js is disabled globally until we find a good solution
for #19417.

The tooltip text got updated accordingly.
---
 src/chrome/locale/en/torbutton.dtd | 2 +-
 src/modules/security-prefs.js  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/chrome/locale/en/torbutton.dtd 
b/src/chrome/locale/en/torbutton.dtd
index 97a994f..6bc7141 100644
--- a/src/chrome/locale/en/torbutton.dtd
+++ b/src/chrome/locale/en/torbutton.dtd
@@ -41,7 +41,7 @@
 
 
 
-
+
 
 
 
diff --git a/src/modules/security-prefs.js b/src/modules/security-prefs.js
index 4a39ca8..3d3630b 100644
--- a/src/modules/security-prefs.js
+++ b/src/modules/security-prefs.js
@@ -19,12 +19,12 @@ let log = (level, msg) => logger.log(level, msg);
 // corresponding to the old 2-medium-high setting.
 const kSecuritySettings = {
   // Preference name :[0, 1-high 2-m3-m4-low]
-  "javascript.options.ion.content" :  [,  false, false, false, true ],
-  "javascript.options.typeinference" :[,  false, false, false, true ],
+  "javascript.options.ion" :  [,  false, false, false, true ],
+  "javascript.options.baselinejit" :  [,  false, false, false, true ],
+  "javascript.options.native_regexp" :[,  false, false, false, true ],
   "noscript.forbidMedia" :[,  true,  true,  true,  false],
   "media.webaudio.enabled" :  [,  false, false, false, true ],
   "mathml.disabled" : [,  true,  true,  true,  false],
-  "javascript.options.baselinejit.content" :  [,  false, false, false, true ],
   "gfx.font_rendering.opentype_svg.enabled" : [,  false, false, false, true ],
   "noscript.global" : [,  false, false, false, true ],
   "noscript.globalHttpsWhitelist" :   [,  false, true,  true,  false],

___
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 21930: NSS libraries are missing from mar-tools archive

2017-04-13 Thread boklm

commit 867176ff839bb0b7067ab2a8e237621a14c98616
Author: Nicolas Vigier 
Date:   Thu Apr 13 10:30:47 2017 +0200

Bug 21930: NSS libraries are missing from mar-tools archive

The Linux sigmar program needs libfreeblpriv3.so and libsoftokn3.so,
so include them in the mar-tools archive.

tor-browser-bundle.git commit: c2bae45c6a41923712bf176df6fb9bd1f773d887
---
 projects/firefox/build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index 3985aec..1cf9be1 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -126,7 +126,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/
 [% IF c("var/linux") %]
   cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/
   cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/
-  NSS_LIBS="libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so 
libsmime3.so libssl3.so"
+  NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssdbm3.so 
libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so"
   NSPR_LIBS="libnspr4.so libplc4.so libplds4.so"
   for LIB in $NSS_LIBS $NSPR_LIBS; do
   cp -p obj-*/dist/bin/$LIB $MARTOOLS/

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

1 2 >

1 - 100 of 105 matches

Mail list logo