date:20180824

[tor-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] squash! TB4: Tor Browser's Firefox preference overrides.

2018-08-24 Thread gk

commit 03c692e334c33c21a2f50c5df75d839b93533e55
Author: Arthur Edelstein 
Date:   Fri Aug 24 15:37:17 2018 -0700

squash! TB4: Tor Browser's Firefox preference overrides.

Bug 27257: Remove obsolete pref "dom.network.enabled"
(The API is disabled under privacy.resistFingerprinting.)
---
 browser/app/profile/000-tor-browser.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/browser/app/profile/000-tor-browser.js 
b/browser/app/profile/000-tor-browser.js
index a859a7143060..6fe5955960e2 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -126,7 +126,6 @@ pref("webgl.min_capability_mode", true);
 pref("webgl.disable-extensions", true);
 pref("webgl.disable-fail-if-major-performance-caveat", true);
 pref("webgl.enable-webgl2", false);
-pref("dom.network.enabled",false); // fingerprinting due to differing OS 
implementations
 pref("gfx.downloadable_fonts.fallback_delay", -1);
 pref("general.appname.override", "Netscape");
 pref("general.appversion.override", "5.0 (Windows)");

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

[tor-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] squash! TB4: Tor Browser's Firefox preference overrides.

2018-08-24 Thread gk

commit 853758c5aede1fbe3f1402a9bd62b731795f1564
Author: Arthur Edelstein 
Date:   Fri Aug 24 15:49:25 2018 -0700

squash! TB4: Tor Browser's Firefox preference overrides.

Bug 27262: Remove leftover HTTP pipelining preferences
The prefs were removed from Firefox in
https://bugzilla.mozilla.org/show_bug.cgi?id=1340655
---
 browser/app/profile/000-tor-browser.js | 4 
 1 file changed, 4 deletions(-)

diff --git a/browser/app/profile/000-tor-browser.js 
b/browser/app/profile/000-tor-browser.js
index bddbe05c92bb..a859a7143060 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -256,10 +256,6 @@ pref("gfx.font_rendering.graphite.enabled", false);
 pref("security.ssl.enable_false_start", true);
 pref("network.http.connection-retry-timeout", 0);
 pref("network.http.max-persistent-connections-per-proxy", 256);
-pref("network.http.pipelining.reschedule-timeout", 15000);
-pref("network.http.pipelining.read-timeout", 6);
-// Hacked pref: Now means "Attempt to pipeline at least this many requests 
together"
-pref("network.http.pipelining.max-optimistic-requests", 3);
 pref("network.manage-offline-status", false);
 // No need to leak things to Mozilla, see bug 21790
 pref("network.captive-portal-service.enabled", false);

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

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

2018-08-24 Thread translation

commit b83a8ede80ac356ab6a06f4a1cf203e8a4296bac
Author: Translation commit bot 
Date:   Sat Aug 25 00:48:56 2018 +

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

diff --git a/contents+pt_BR.po b/contents+pt_BR.po
index 48eba796f..5f6791ddf 100644
--- a/contents+pt_BR.po
+++ b/contents+pt_BR.po
@@ -1819,6 +1819,8 @@ msgid ""
 "Sometimes Javascript-heavy websites can have functional issues over Tor "
 "Browser."
 msgstr ""
+"Algumas vezes websites que tem muito cÃ³digo em Javascript pode ter problemas"
+" funcionais sobre o Navegador Tor."
 
 #: http//localhost/tbb/tbb-39/
 #: (content/tbb/tbb-39/contents+en.lrquestion.description)

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

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

2018-08-24 Thread translation

commit 20b5e8a23e21df61d33f2cde37f101d2a52c5ae7
Author: Translation commit bot 
Date:   Sat Aug 25 00:18:07 2018 +

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

diff --git a/ga/abouttor.properties b/ga/abouttor.properties
index 972a44406..be20969fa 100644
--- a/ga/abouttor.properties
+++ b/ga/abouttor.properties
@@ -12,3 +12,6 @@ aboutTor.donationBanner.tagline2=Saoirse LÃonraithe ar fud 
an domhain
 aboutTor.donationBanner.tagline3=Saoirse Ar LÃne
 aboutTor.donationBanner.tagline4=Saoirse Cainte Ã¡ cothÃº ar fud an domhain
 aboutTor.donationBanner.tagline5=PrÃobhÃ¡ideachas na milliÃºn Ã¡ chosaint 
chuile lÃ¡
+
+aboutTor.newsletter.tagline=Faigh an nuacht is dÃ©anaÃ maidir le Tor i do 
bhosca isteach.
+aboutTor.newsletter.link_text=ClÃ¡raigh le Nuachtlitir Tor.

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

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

2018-08-24 Thread translation

commit fb53891451abfc2216865ae84be6a7f11aa997d6
Author: Translation commit bot 
Date:   Sat Aug 25 00:18:02 2018 +

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

diff --git a/ga/abouttor.properties b/ga/abouttor.properties
index 717fbeb8c..be20969fa 100644
--- a/ga/abouttor.properties
+++ b/ga/abouttor.properties
@@ -13,5 +13,5 @@ aboutTor.donationBanner.tagline3=Saoirse Ar LÃne
 aboutTor.donationBanner.tagline4=Saoirse Cainte Ã¡ cothÃº ar fud an domhain
 aboutTor.donationBanner.tagline5=PrÃobhÃ¡ideachas na milliÃºn Ã¡ chosaint 
chuile lÃ¡
 
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your 
inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
+aboutTor.newsletter.tagline=Faigh an nuacht is dÃ©anaÃ maidir le Tor i do 
bhosca isteach.
+aboutTor.newsletter.link_text=ClÃ¡raigh le Nuachtlitir Tor.

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

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

2018-08-24 Thread translation

commit f4680304a2264f76c8a5d68a706fbf8e26f1a92e
Author: Translation commit bot 
Date:   Fri Aug 24 23:48:56 2018 +

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

diff --git a/contents+pt_BR.po b/contents+pt_BR.po
index 43af2947a..48eba796f 100644
--- a/contents+pt_BR.po
+++ b/contents+pt_BR.po
@@ -3647,6 +3647,8 @@ msgid ""
 "* You should also see the message \"Registered server transport 'obfs4'\" "
 "indicating that obfs4proxy is functional."
 msgstr ""
+"* VocÃª deveria olhar tambÃ©m a mensagem \"Servidor de transporte registrado "
+"'obfs4'\" indicando que obfs4proxy Ã© funcional."
 
 #: http//localhost/operators/operators-6/
 #: (content/operators/operators-6/contents+en.lrquestion.seo_slug)

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

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

2018-08-24 Thread translation

commit d94b7b41b19a2c1909e87b448d5c327d013c2f83
Author: Translation commit bot 
Date:   Fri Aug 24 23:18:54 2018 +

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

diff --git a/contents+de.po b/contents+de.po
index afd8d1bfe..6ea23d505 100644
--- a/contents+de.po
+++ b/contents+de.po
@@ -1992,6 +1992,10 @@ msgid ""
 "protection is blocking me from accessing Tor Browser, it is "
 "common for anti-virus / anti-malware software to cause this type of issue."
 msgstr ""
+"Wenn du ein Anti-Viren-Programm benutzt, siehe http://support.torproject.org/#tbb-10\";>Mein Anti-Viren-Programm "
+"blockiert meinen Zugang zu Tor Browser, es ist unÃ¼blich fÃ¼r 
Anti-"
+"Viren- / Anti-Malware-Programme solche Probleme zu verursachen."
 
 #: http//localhost/tbb/tbb-42/
 #: (content/tbb/tbb-42/contents+en.lrquestion.seo_slug)

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

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

2018-08-24 Thread translation

commit 6ca5067445fa3cddef16d1e3dd08bd75c9a3ec06
Author: Translation commit bot 
Date:   Fri Aug 24 21:49:08 2018 +

Update translations for support-portal
---
 contents+he.po| 26 +++---
 contents+pt_BR.po | 10 +-
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/contents+he.po b/contents+he.po
index 2f1d74e39..5fe2705af 100644
--- a/contents+he.po
+++ b/contents+he.po
@@ -213,6 +213,8 @@ msgid ""
 "Should I install a new add-on or extension in Tor Browser, like AdBlock Plus"
 " or uBlock Origin?"
 msgstr ""
+"××× ×× × ×¦×¨×× ×××ª×§×× ××ª×§×¢ ×××© ×× ×ª××¡×¤×ª ×××©× 
×××¤××¤× Tor, ××× AdBlock Plus ×× "
+"uBlock Origin?"
 
 #: http//localhost/faq/faq-3/
 #: (content/faq/faq-3/contents+en.lrquestion.description)
@@ -1680,7 +1682,7 @@ msgstr "why-is-tor-using-duckduckgo"
 #: http//localhost/tbb/tbb-42/
 #: (content/tbb/tbb-42/contents+en.lrquestion.title)
 msgid "Why does my Tor Browser say something about Firefox not working?"
-msgstr ""
+msgstr "××× ××¤××¤× Tor ×©×× ××××¨ ××©×× ×¢× ×× ×©Ö¾Firefox 
××× × ×¢×××?"
 
 #: http//localhost/tbb/tbb-42/
 #: (content/tbb/tbb-42/contents+en.lrquestion.description)
@@ -1717,6 +1719,8 @@ msgid ""
 "Can I still use another browser, like Chrome or Firefox, when I am using Tor"
 " Browser?"
 msgstr ""
+"××× ×× × ×¢××× ×××× ×××©×ª××© ×××¤××¤× ×××¨, ××× 
Chrome ×× Firefox, ××©×× × ××©×ª××© "
+"×××¤××¤× Tor?"
 
 #: http//localhost/tbb/tbb-5/
 #: (content/tbb/tbb-5/contents+en.lrquestion.description)
@@ -1860,7 +1864,7 @@ msgstr "website-blocked-by-censor-can-tor-browser-help"
 
 #: http//localhost/tbb/tbb-9/ (content/tbb/tbb-9/contents+en.lrquestion.title)
 msgid "Can I use Tor with a browser besides Tor Browser?"
-msgstr ""
+msgstr "××× ×× × ×××× ×××©×ª××© ×Ö¾Tor ×¢× ××¤××¤× ×××× 
××¤××¤× Tor?"
 
 #: http//localhost/tbb/tbb-9/
 #: (content/tbb/tbb-9/contents+en.lrquestion.description)
@@ -2682,7 +2686,7 @@ msgstr "can-eavesdroppers-see-information-i-share"
 #: http//localhost/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.title)
 msgid "How do I run a middle or guard relay on Debian?"
-msgstr ""
+msgstr "××× ×× × ××¨××¥ ×××¡×¨ ×××¦×¢× ×× ×××¡×¨ ×©×××¨ ×¢× 
Debian?"
 
 #: http//localhost/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -2959,7 +2963,7 @@ msgstr "how-do-i-run-a-middle-or-guard-relay"
 #: http//localhost/operators/operators-2/
 #: (content/operators/operators-2/contents+en.lrquestion.title)
 msgid "How do I run an exit relay on Debian?"
-msgstr ""
+msgstr "××× ×× × ××¨××¥ ×××¡×¨ ××¦××× ×¢× Debian?"
 
 #: http//localhost/operators/operators-2/
 #: (content/operators/operators-2/contents+en.lrquestion.description)
@@ -3078,7 +3082,7 @@ msgstr "how-do-i-run-a-middle-or-guard-on-freebsd"
 #: http//localhost/operators/operators-4/
 #: (content/operators/operators-4/contents+en.lrquestion.title)
 msgid "How do I make sure that I'm using the correct packages on Ubuntu?"
-msgstr ""
+msgstr "××× ×× × ××××× ×©×× × ××©×ª××© ×××××××ª ×× ××× 
××ª ×¢× Ubuntu?"
 
 #: http//localhost/operators/operators-4/
 #: (content/operators/operators-4/contents+en.lrquestion.description)
@@ -3161,7 +3165,7 @@ msgstr "using-correct-packages"
 #: http//localhost/operators/operators-6/
 #: (content/operators/operators-6/contents+en.lrquestion.title)
 msgid "How do I run a obfs4 bridge on Debian?"
-msgstr ""
+msgstr "××× ×× × ××¨××¥ ××©×¨ obfs4 ×¢× Debian?"
 
 #: http//localhost/operators/operators-6/
 #: (content/operators/operators-6/contents+en.lrquestion.description)
@@ -3225,7 +3229,7 @@ msgstr "how-do-i-run-a-obfs4-bridge-debian"
 #: http//localhost/operators/operators-7/
 #: (content/operators/operators-7/contents+en.lrquestion.title)
 msgid "Should I run an exit relay from home?"
-msgstr ""
+msgstr "××× ×× × ×¦×¨×× ×××¨××¥ ×××¡×¨ ××¦××× ×××××ª?"
 
 #: http//localhost/operators/operators-7/
 #: (content/operators/operators-7/contents+en.lrquestion.description)
@@ -3658,7 +3662,7 @@ msgstr 
"someone-asks-to-download-tor-browser-to-unlock-my-files"
 #: http//localhost/misc/misc-6/
 #: (content/misc/misc-6/contents+en.lrquestion.title)
 msgid "Does Tor keep logs?"
-msgstr ""
+msgstr "××× Tor ×©×××¨ ×××× ××?"
 
 #: http//localhost/misc/misc-6/
 #: (content/misc/misc-6/contents+en.lrquestion.description)
@@ -3745,7 +3749,7 @@ msgstr "having-a-problem-updating-vidalia"
 
 #: templates/footer.html:5
 msgid "Our mission:"
-msgstr ""
+msgstr "×××©××× ×©×× ×:"
 
 #: templates/footer.html:5
 msgid ""
@@ -3757,11 +3761,11 @@ msgstr ""
 
 #: templates/footer.html:24
 msgid "Subscribe to our Newsletter"
-msgstr ""
+msgstr "×××¨×©× ××× ×× ×××××¢×× ×©×× ×"
 
 #: templates/footer.html:25
 msgid "Get monthly updates and opportunities from the

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

2018-08-24 Thread translation

commit 807e2aa8c0448960b8840ceec4ca894b8c3fafea
Author: Translation commit bot 
Date:   Fri Aug 24 21:19:03 2018 +

Update translations for support-portal
---
 contents+he.po | 32 +++-
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/contents+he.po b/contents+he.po
index 6bf654aa4..2f1d74e39 100644
--- a/contents+he.po
+++ b/contents+he.po
@@ -148,6 +148,8 @@ msgid ""
 "Our website is blocked by a censor. Can Tor Browser help users access our "
 "website?"
 msgstr ""
+"×××ª×¨ ×©×× × ××¡×× ×¢\"× ××¦× ××¨. ××× ××¤××¤× Tor ×××× 
××¢×××¨ ×××©×ª××©×× ××§×× ×××©× ×× "
+"×××ª×¨ ×©×× ×?"
 
 #: http//localhost/faq/faq-2/
 #: (content/faq/faq-2/contents+en.lrquestion.description)
@@ -239,7 +241,7 @@ msgstr "install-add-on-extension-tor-browser"
 #: http//localhost/tbb/tbb-31/
 #: (content/tbb/tbb-31/contents+en.lrquestion.title)
 msgid "Which platforms is Tor Browser available for?"
-msgstr ""
+msgstr "×¢×××¨ ×××× ×¤×××¤××¨×××ª ××¤××¤× Tor ××××?"
 
 #: http//localhost/faq/faq-4/
 #: (content/faq/faq-4/contents+en.lrquestion.description)
@@ -301,7 +303,7 @@ msgstr "use-vpn-with-tor"
 msgid ""
 "What are the most common issues with the latest stable version of Tor "
 "Browser?"
-msgstr ""
+msgstr "×× ×× ××¡×××××ª ×× ×¤××¦××ª ××××ª×¨ ×¢× ×××¨×¡× 
×××¦××× ××××¨×× × ×©× ××¤××¤× Tor?"
 
 #: http//localhost/tbb/tbb-1/
 #: (content/tbb/tbb-1/contents+en.lrquestion.description)
@@ -499,7 +501,7 @@ msgstr "using-flash-tor-browser"
 #: http//localhost/tbb/tbb-13/
 #: (content/tbb/tbb-13/contents+en.lrquestion.title)
 msgid "Does using Tor Browser protect other applications on my computer?"
-msgstr ""
+msgstr "××× ×©××××© ×××¤××¤× Tor ××× ×¢× ×××©×××× 
×××¨×× ××××©× ×©××?"
 
 #: http//localhost/tbb/tbb-13/
 #: (content/tbb/tbb-13/contents+en.lrquestion.description)
@@ -651,7 +653,7 @@ msgstr "is-there-support-for-bsd"
 #: http//localhost/censorship/censorship-6/
 #: (content/censorship/censorship-6/contents+en.lrquestion.title)
 msgid "I canât connect to Tor Browser, is my network censored?"
-msgstr ""
+msgstr "××× × ×××× ×××ª×××¨ ×× ××¤××¤× Tor, ××× ××¨×©×ª 
×©×× ××¦×× ××¨×ª?"
 
 #: http//localhost/tbb/tbb-19/
 #: (content/tbb/tbb-19/contents+en.lrquestion.description)
@@ -822,6 +824,8 @@ msgstr "view-tor-browser-message-log"
 msgid ""
 "How can I make Tor run faster? Is Tor Browser slower than other browsers?"
 msgstr ""
+"××× ×× × ×××× ×××¨×× ×× Tor ××¨××¥ ×××¨ ×××ª×¨? ××× 
××¤××¤× Tor ×××× ×××ª×¨ ×××©×¨ "
+"××¤××¤× ×× ×××¨××?"
 
 #: http//localhost/tbb/tbb-22/
 #: (content/tbb/tbb-22/contents+en.lrquestion.description)
@@ -860,7 +864,7 @@ msgstr "make-tor-faster"
 msgid ""
 "What search engine comes with Tor Browser and how does it protect my "
 "privacy?"
-msgstr ""
+msgstr "×××× ×× ××¢ ×××¤××© ××××¢ ×¢× ××¤××¤× Tor ×××× 
××× ××× ×¢× ×¤×¨××××ª×?"
 
 #: http//localhost/tbb/tbb-23/
 #: (content/tbb/tbb-23/contents+en.lrquestion.description)
@@ -1224,6 +1228,8 @@ msgid ""
 "A website (bank, email provider, etc..) locks me out whenever I use Tor, "
 "what can I do?"
 msgstr ""
+"××ª×¨ (×× ×§, ×¡×¤×§ ×××\"×, ×××'...) × ××¢× ×××ª× ××××¥ 
××× ×¤×¢× ×©×× × ××©×ª××© ×××¤××¤× Tor,"
+" ×× ×× × ×××× ××¢×©××ª?"
 
 #: http//localhost/tbb/tbb-30/
 #: (content/tbb/tbb-30/contents+en.lrquestion.description)
@@ -1278,7 +1284,7 @@ msgstr "which-platform-tor-browser-available"
 #: http//localhost/tbb/tbb-32/
 #: (content/tbb/tbb-32/contents+en.lrquestion.title)
 msgid "Can I set Tor Browser as my default browser?"
-msgstr ""
+msgstr "××× ×× × ×××× ××××××¨ ××ª ××¤××¤× Tor ×××¤××¤× 
××¨××¨×ª ××××× ×©××?"
 
 #: http//localhost/tbb/tbb-32/
 #: (content/tbb/tbb-32/contents+en.lrquestion.description)
@@ -1310,7 +1316,7 @@ msgstr "setting-tor-browser-as-default"
 #: http//localhost/tbb/tbb-33/
 #: (content/tbb/tbb-33/contents+en.lrquestion.title)
 msgid "Does running Tor Browser make me a relay?"
-msgstr ""
+msgstr "××× ××¨×¦×ª ××¤××¤× Tor ×××¤××ª ×××ª× ×× ×××¡×¨?"
 
 #: http//localhost/tbb/tbb-33/
 #: (content/tbb/tbb-33/contents+en.lrquestion.description)
@@ -1339,7 +1345,7 @@ msgstr "running-tor-browser-make-me-relay"
 #: http//localhost/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.title)
 msgid "Why does Tor Browser ship with Javascript enabled?"
-msgstr ""
+msgstr "××× ××¤××¤× Tor ××××¢ ×¢× JavaScript ××××¤×©×¨?"
 
 #: http//localhost/tbb/tbb-34/
 #: (content/tbb/tbb-34/contents+en.lrquestion.description)
@@ -1386,7 +1392,7 @@ msgstr "tor-browser-js-enabled-default"
 #: http//localhost/tbb/tbb-35/
 #: (content/tbb/tbb-35/contents+en.lrquestion.title)
 msgid "Can you get rid of all the captchas?"
-msgstr ""
+msgstr "××× × ××ª× ××××¤××¨ ××× ×Ö¾CAPTCHA?"

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

2018-08-24 Thread translation

commit a6b55503765e5843a8190544b4bbc4d2583e8d33
Author: Translation commit bot 
Date:   Fri Aug 24 21:15:53 2018 +

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

diff --git a/he.po b/he.po
index a9a13e3eb..78b1b6c36 100644
--- a/he.po
+++ b/he.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-16 07:57+0200\n"
-"PO-Revision-Date: 2018-08-24 20:45+\n"
+"PO-Revision-Date: 2018-08-24 20:57+\n"
 "Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -563,7 +563,7 @@ msgstr "{volume_name} â {drive_name}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
 msgid "No file containers added"
-msgstr "×× ××ª×××¡×¤× ×××× ×§××¦××"
+msgstr "×× ××ª×××¡×¤× ×Öµ×Ö·×× ×§××¦××"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:98
 msgid "No VeraCrypt devices detected"
@@ -580,14 +580,14 @@ msgstr "×Öµ×Ö·× ××§××¦×× %s ××××¨ ×××××ª 
×××¨ ××ª×× ××¨×©×
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:131
 msgid "Container opened read-only"
-msgstr ""
+msgstr "×Öµ×Ö·× × ×¤×ª× ×¢× ×§×¨××× ××××"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:132
 #, python-brace-format
 msgid ""
 "The file container {path} could not be opened with write access. It was 
opened read-only instead. You will not be able to modify the content of the 
container.\n"
 "{error_message}"
-msgstr ""
+msgstr "×Öµ×Ö·× ××§××¦×× {path} ×× ××× ×××× ××××¤×ª× ×¢× 
×××©×ª ××ª×××. ××× × ×¤×ª× ×¢× ×§×¨×××Ö¾×××× ×××§××. ×× 
×ª××× ××©× ××ª ××ª ×ª××× ××Öµ×Ö·×.\n{error_message}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:137
 msgid "Error opening file"
@@ -611,11 +611,11 @@ msgstr "× ××©× ××××¡×¤×ª ×Öµ×Ö·×"
 msgid ""
 "Could not add file container %s: Timeout while waiting for loop setup.Please"
 " try using the Disks application instead."
-msgstr ""
+msgstr "×× ××× × ××ª× ××××¡××£ ××× ×§××¦×× %s: ×¤×¡×§ ××× 
××¢×ª ×××ª× × ×× ××××¨×ª ×××××. ×× × × ×¡× ×××©×ª××© 
××××©×× ×××¡×§×× ×××§××."
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:208
 msgid "Choose File Container"
-msgstr ""
+msgstr "×××¨ ×Öµ×Ö·× ×§××¦××"
 
 #: 
../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
 msgid "Report an error"
@@ -656,7 +656,7 @@ msgstr "××× × ×¢×××ª ××¨×× VeraCrypt"
 
 #: 
../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:2
 msgid "Mount VeraCrypt encrypted file containers and devices"
-msgstr ""
+msgstr "××¦× ×Öµ×Ö·××× ×××¦×¤× ×× ×©× ×§××¦×× ×××ª×§× ×× 
×××¦×¤× ×× ××¡×× VeraCrypt"
 
 #: 
../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
 msgid "Additional Software"
@@ -698,7 +698,7 @@ msgstr "× ×¢× ××¨× ××"
 
 #: 
../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/volume.ui.in:61
 msgid "Detach this volume"
-msgstr ""
+msgstr "× ×ª×§ ××¨× ××"
 
 #: 
../config/chroot_local-includes/usr/local/share/mime/packages/unlock-veracrypt-volumes.xml.in.h:1
 msgid "TrueCrypt/VeraCrypt container"

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

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

2018-08-24 Thread translation

commit 91ced0b002d88816fef37902d6c5709027b60e4d
Author: Translation commit bot 
Date:   Fri Aug 24 21:15:58 2018 +

Update translations for tails-misc_completed
---
 he.po | 391 ++
 1 file changed, 345 insertions(+), 46 deletions(-)

diff --git a/he.po b/he.po
index 63babdec5..78b1b6c36 100644
--- a/he.po
+++ b/he.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-24 08:44+0800\n"
-"PO-Revision-Date: 2018-08-06 19:59+\n"
+"POT-Creation-Date: 2018-08-16 07:57+0200\n"
+"PO-Revision-Date: 2018-08-24 20:57+\n"
 "Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr "Tor ××××"
 msgid "You can now access the Internet."
 msgstr "××ª× ×××× ×××©×× ×××©× ××¢×ª ×××× ××¨× ×."
 
-#: config/chroot_local-includes/etc/whisperback/config.py:66
+#: config/chroot_local-includes/etc/whisperback/config.py:69
 #, python-format
 msgid ""
 "Help us fix your bug!\n"
@@ -48,6 +48,29 @@ msgid ""
 "\n"
 msgstr "×¢×××¨ ×× × ××ª×§× ××ª ××ª×§× ×©××!\n×§×¨× 
××ª×××¨×××ª ××××× ××ª×§××× ×©×× 
×.\n×× ×ª×××× ××××¢ ×××©× ×××ª×¨ 
×××¦××¨×!\n×××× × ×ª×× ×ª ××ª×××ª ×××\"× ×× 
×\n\n× ×ª×× ×ª ××ª×××ª ×××\"× ×× × ××ª××¨× ×× × 
×××¦××¨ ×××ª× ×§×©×¨ ××× ××××××¨ ××ª ×××¢××.\n×× × ×××¥ 
××¨×× ××××¨××¢ ×©× ×××××××× ×©×× ×× × ××§×××× ××¢×× 
××¨×××ª ×××××××× ××× ×× ××××¢ ××¦××¨×ª ×§×©×¨ ×× 
××¡×¨× ×ª××¢××ª. ××¦× ×©× ×, ×× ×× ××¡×¤×§ ××××× ××ª 
×××¦××ª×ª××, ××× ×¡×¤×§ ×××× ××¨× × ×× ×¡×¤×§ ××××\"× 
×©×× ×××©×¨ ×©××ª× ××©×ª××© ×-Tails.\n\n"
 
+#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:51
+msgid ""
+"You can install additional software automatically from your persistent "
+"storage when starting Tails."
+msgstr "××ª× ×××× ×××ª×§×× ×ª××× × × ××¡×¤×ª ××××¤× 
××××××× ×××××¡×× ×××ª××× ×©×× ××¢×ª ××ª×××ª Tails."
+
+#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:77
+msgid ""
+"The following software is installed automatically from your persistent "
+"storage when starting Tails."
+msgstr "××ª××× × ×××× ×××ª×§× ×ª ××××¤× ××××××× 
×××××¡×× ×××ª××× ×©×× ××¢×ª ××ª×××ª Tails."
+
+#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:132
+msgid ""
+"To add more, install some software using Synaptic Package Manager or APT on the command line."
+msgstr "××× ××××¡××£ ×¢××, ××ª×§× ×ª××× ××ª ×××©×× ×¢\"× 
×©××××© ××× ×× ××××××ª ×¡×× 
×¤××××ª ×× APT ×¢× ×©××¨×ª 
××¤×§×××."
+
+#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:151
+msgid "_Create persistent storage"
+msgstr "_×¦××¨ ×××¡×× ××ª×××"
+
 #: config/chroot_local-includes/usr/local/bin/electrum:57
 msgid "Persistence is disabled for Electrum"
 msgstr "××ª××× ×××©××ª×ª ×¢×××¨ Electrum"
@@ -126,50 +149,167 @@ msgstr "××××¢ ×× ××:\n%s"
 msgid "not available"
 msgstr "×××ª× ××××"
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:170
-msgid "Your additional software installation failed"
-msgstr "×××ª×§× × ×©× ××ª××× × ×× ××¡×¤×ª ×©×× × ××©××"
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:142
+#, python-brace-format
+msgid ""
+"{details} Please check your list of additional software or read the system "
+"log to understand the problem."
+msgstr "{details} ×× × ××××§ ××ª ××¨×©××× ×©× ××ª××× × ×× 
××¡×¤×ª ×©×× ×× ×§×¨× ××ª ×××× ××××¨××¢×× ×©× ×××¢×¨××ª 
××× ××××× ××ª ×××¢××."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:147
+msgid ""
+"Please check your list of additional software or read the system log to "
+"understand the problem."
+msgstr "×× × ××××§ ××ª ××¨×©××× ×©× ×ª××× × × ××¡×¤×ª ×©×× 
×× ×§×¨× ××ª ×××× ××××¨××¢×× ×©× ×××¢×¨××ª ××× ××××× 
××ª ×××¢××."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:151
+msgid "Show Log"
+msgstr "××¦× ××××"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:151
+msgid "Configure"
+msgstr "××××¨"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:215
+#, python-brace-format
+msgid "{beginning} and {last}"
+msgstr "{beginning} × {last}"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:216
+msgid ", "
+msgstr ", "
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additiona

[tor-commits] [tor/master] Update to 0.3.4.7-rc-dev

2018-08-24 Thread nickm

commit 4c1c818ffa2ea3d18c4a45406acd78d40c0b3a91
Author: Nick Mathewson 
Date:   Fri Aug 24 16:49:56 2018 -0400

Update to 0.3.4.7-rc-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index b7f15a6f9..6ef53eeb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.4.7-rc])
+AC_INIT([tor],[0.3.4.7-rc-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index fad92b589..85ba10773 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.4.7-rc"
+!define VERSION "0.3.4.7-rc-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/";
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index c7f865f0f..40c57c387 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.4.7-rc"
+#define VERSION "0.3.4.7-rc-dev"
 
 
 



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

[tor-commits] [tor/release-0.3.4] Update to 0.3.4.7-rc-dev

2018-08-24 Thread nickm

commit 4c1c818ffa2ea3d18c4a45406acd78d40c0b3a91
Author: Nick Mathewson 
Date:   Fri Aug 24 16:49:56 2018 -0400

Update to 0.3.4.7-rc-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index b7f15a6f9..6ef53eeb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.4.7-rc])
+AC_INIT([tor],[0.3.4.7-rc-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index fad92b589..85ba10773 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.4.7-rc"
+!define VERSION "0.3.4.7-rc-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/";
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index c7f865f0f..40c57c387 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.4.7-rc"
+#define VERSION "0.3.4.7-rc-dev"
 
 
 



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

[tor-commits] [tor/master] Forward-port changelog from 0.3.4.7-rc

2018-08-24 Thread nickm

commit 81175ecafd29078d8b46db51f0393f31a9fcdea4
Author: Nick Mathewson 
Date:   Fri Aug 24 16:50:12 2018 -0400

Forward-port changelog from 0.3.4.7-rc
---
 ChangeLog | 104 ++
 1 file changed, 104 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 84a3f1045..25ddebc8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,107 @@
+Changes in version 0.3.4.7-rc - 2018-08-24
+  Tor 0.3.4.7-rc fixes several small compilation, portability, and
+  correctness issues in previous versions of Tor. This version is a
+  release candidate: if no serious bugs are found, we expect that the
+  stable 0.3.4 release will be (almost) the same as this release.
+
+  o Minor features (bug workaround):
+- Compile correctly on systems that provide the C11 stdatomic.h
+  header, but where C11 atomic functions don't actually compile.
+  Closes ticket 26779; workaround for Debian issue 903709.
+
+  o Minor features (continuous integration):
+- Backport Travis rust distcheck to 0.3.3. Closes ticket 24629.
+- Enable macOS builds in our Travis CI configuration. Closes
+  ticket 24629.
+- Install libcap-dev and libseccomp2-dev so these optional
+  dependencies get tested on Travis CI. Closes ticket 26560.
+- Only post Appveyor IRC notifications when the build fails.
+  Implements ticket 27275.
+- Run asciidoc during Travis CI. Implements ticket 27087.
+- Use ccache in our Travis CI configuration. Closes ticket 26952.
+
+  o Minor features (continuous integration, rust):
+- Use cargo cache in our Travis CI configuration. Closes
+  ticket 26952.
+
+  o Minor features (directory authorities):
+- Authorities no longer vote to make the subprotocol version
+  "LinkAuth=1" a requirement: it is unsupportable with NSS, and
+  hasn't been needed since Tor 0.3.0.1-alpha. Closes ticket 27286.
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the August 7 2018 Maxmind GeoLite2
+  Country database. Closes ticket 27089.
+
+  o Minor bugfixes (compilation, windows):
+- Don't link or search for pthreads when building for Windows, even
+  if we are using build environment (like mingw) that provides a
+  pthreads library. Fixes bug 27081; bugfix on 0.1.0.1-rc.
+
+  o Minor bugfixes (continuous integration):
+- Improve Appveyor CI IRC logging. Generate correct branches and
+  URLs for pull requests and tags. Use unambiguous short commits.
+  Fixes bug 26979; bugfix on master.
+- Build with zstd on macOS. Fixes bug 27090; bugfix on 0.3.1.5-alpha.
+- Pass the module flags to distcheck configure, and log the flags
+  before running configure. (Backported to 0.2.9 and later as a
+  precaution.) Fixes bug 27088; bugfix on 0.3.4.1-alpha.
+
+  o Minor bugfixes (in-process restart):
+- Always call tor_free_all() when leaving tor_run_main(). When we
+  did not, restarting tor in-process would cause an assertion
+  failure. Fixes bug 26948; bugfix on 0.3.3.1-alpha.
+
+  o Minor bugfixes (linux seccomp2 sandbox):
+- Fix a bug in out sandboxing rules for the openat() syscall.
+  Previously, no openat() call would be permitted, which would break
+  filesystem operations on recent glibc versions. Fixes bug 25440;
+  bugfix on 0.2.9.15. Diagnosis and patch from Daniel Pinto.
+
+  o Minor bugfixes (onion services):
+- Fix bug that causes services to not ever rotate their descriptors
+  if they were getting SIGHUPed often. Fixes bug 26932; bugfix
+  on 0.3.2.1-alpha.
+
+  o Minor bugfixes (portability):
+- Fix compilation of the unit tests on GNU/Hurd, which does not
+  define PATH_MAX. Fixes bug 26873; bugfix on 0.3.3.1-alpha. Patch
+  from "paulusASol".
+
+  o Minor bugfixes (rust):
+- Backport test_rust.sh from master. Fixes bug 26497; bugfix
+  on 0.3.1.5-alpha.
+- Consistently use ../../.. as a fallback for $abs_top_srcdir in
+  test_rust.sh. Fixes bug 27093; bugfix on 0.3.4.3-alpha.
+- Protover parsing was accepting the presence of whitespace in
+  version strings, which the C implementation would choke on, e.g.
+  "Desc=1\t,2". Fixes bug 27177; bugfix on 0.3.3.5-rc.
+- Protover parsing was ignoring a 2nd hyphen and everything after
+  it, accepting entries like "Link=1-5-foo". Fixes bug 27164; bugfix
+  on 0.3.3.1-alpha.
+- Stop setting $CARGO_HOME. cargo will use the user's $CARGO_HOME, or
+  $HOME/.cargo by default. Fixes bug 26497; bugfix on 0.3.1.5-alpha.
+- cd to ${abs_top_builddir}/src/rust before running cargo in
+  src/test/test_rust.sh. This makes the working directory consistent
+  between builds and tests. Fixes bug 26497; bugfix on 0.3.3.2-alpha.
+
+  o Minor bugfixes (testing, bootstrap):
+- When calculating bootstrap progress, check exit policies and the
+  exit flag. Previously, Tor would only check the exit flag, which
+  caused race conditi

[tor-commits] [tor/maint-0.3.4] Update to 0.3.4.7-rc-dev

2018-08-24 Thread nickm

commit 4c1c818ffa2ea3d18c4a45406acd78d40c0b3a91
Author: Nick Mathewson 
Date:   Fri Aug 24 16:49:56 2018 -0400

Update to 0.3.4.7-rc-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index b7f15a6f9..6ef53eeb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.4.7-rc])
+AC_INIT([tor],[0.3.4.7-rc-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index fad92b589..85ba10773 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.4.7-rc"
+!define VERSION "0.3.4.7-rc-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/";
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index c7f865f0f..40c57c387 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.4.7-rc"
+#define VERSION "0.3.4.7-rc-dev"
 
 
 

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

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

2018-08-24 Thread nickm

commit 2e54c80aec5ed4684950f5ef1ba208fcc0b8339c
Merge: 81175ecaf 4c1c818ff
Author: Nick Mathewson 
Date:   Fri Aug 24 16:50:24 2018 -0400

Merge branch 'maint-0.3.4'

"ours" to avoid version bump.

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

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

2018-08-24 Thread nickm

commit f5fea59342a5c7fb8129d5157e5e5ceead9ac6ef
Merge: 8465a8d84 4c1c818ff
Author: Nick Mathewson 
Date:   Fri Aug 24 16:50:32 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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

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

2018-08-24 Thread translation

commit 5f6fe40bf9d6a8582f0f414942474f92c910db6b
Author: Translation commit bot 
Date:   Fri Aug 24 20:45:54 2018 +

Update translations for tails-misc
---
 he.po| 20 ++--
 pt_BR.po |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/he.po b/he.po
index 6b677cc17..a9a13e3eb 100644
--- a/he.po
+++ b/he.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-16 07:57+0200\n"
-"PO-Revision-Date: 2018-08-23 05:51+\n"
+"PO-Revision-Date: 2018-08-24 20:45+\n"
 "Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -563,7 +563,7 @@ msgstr "{volume_name} â {drive_name}"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
 msgid "No file containers added"
-msgstr ""
+msgstr "×× ××ª×××¡×¤× ×××× ×§××¦××"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:98
 msgid "No VeraCrypt devices detected"
@@ -571,12 +571,12 @@ msgstr "×× ××ª××× ××ª×§× × VeraCrypt"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:114
 msgid "Container already added"
-msgstr ""
+msgstr "×Öµ×Ö·× ××ª×××¡×£ ×××¨"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:115
 #, python-format
 msgid "The file container %s should already be listed."
-msgstr ""
+msgstr "×Öµ×Ö·× ××§××¦×× %s ××××¨ ×××××ª ×××¨ ××ª×× 
××¨×©×××."
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:131
 msgid "Container opened read-only"
@@ -595,16 +595,16 @@ msgstr "×©×××× ××¤×ª×××ª ×§×××¥"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:159
 msgid "Not a VeraCrypt container"
-msgstr ""
+msgstr "×× ×Öµ×Ö·× VeraCrypt"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:160
 #, python-format
 msgid "The file %s does not seem to be a VeraCrypt container."
-msgstr ""
+msgstr "× ×¨×× ×©××§×××¥ %s ××× × ×Öµ×Ö·× VeraCrypt."
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:162
 msgid "Failed to add container"
-msgstr ""
+msgstr "× ××©× ××××¡×¤×ª ×Öµ×Ö·×"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:163
 #, python-format
@@ -678,7 +678,7 @@ msgstr "××× ×××ª××× ××¡××£ ×©××¨×©, ××ª× 
×¦×¨×× ××××ª."
 
 #: 
../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:61
 msgid "File Containers"
-msgstr ""
+msgstr "×Öµ×Ö·×× ×§××¦××"
 
 #: 
../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:80
 msgid "_Add"
@@ -686,7 +686,7 @@ msgstr "_×××¡×£"
 
 #: 
../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:86
 msgid "Add a file container"
-msgstr ""
+msgstr "×××¡×£ ×Öµ×Ö·× ×§××¦××"
 
 #: 
../config/chroot_local-includes/usr/share/unlock-veracrypt-volumes/ui/main.ui.in:103
 msgid "Partitions and Drives"
@@ -702,4 +702,4 @@ msgstr ""
 
 #: 
../config/chroot_local-includes/usr/local/share/mime/packages/unlock-veracrypt-volumes.xml.in.h:1
 msgid "TrueCrypt/VeraCrypt container"
-msgstr ""
+msgstr "×Öµ×Ö·× TrueCrypt/VeraCrypt"
diff --git a/pt_BR.po b/pt_BR.po
index 54e7fb954..1be01daa6 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -26,8 +26,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-16 07:57+0200\n"
-"PO-Revision-Date: 2018-08-24 15:53+\n"
-"Last-Translator: Reurison Silva Rodrigues\n"
+"PO-Revision-Date: 2018-08-24 20:44+\n"
+"Last-Translator: Malkon F \n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -210,7 +210,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:285
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:314
 msgid "Install Only Once"
-msgstr ""
+msgstr "Instale Somente Uma Vez"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:291
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:319

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

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

2018-08-24 Thread translation

commit 902654de26a494dec6bfff2e5331c6a6eb6df5f6
Author: Translation commit bot 
Date:   Fri Aug 24 20:46:44 2018 +

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

diff --git a/he/he.po b/he/he.po
index a9eee35c9..2116d544a 100644
--- a/he/he.po
+++ b/he/he.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2018-08-16 11:14+0200\n"
-"PO-Revision-Date: 2018-08-24 19:53+\n"
+"PO-Revision-Date: 2018-08-24 20:41+\n"
 "Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -101,7 +101,7 @@ msgstr "×©×× ×××× ×××©×× ×©×¢×©××ª ××× ×¡× 
××ª××§×£ ××××¨ ××¤
 
 #: ../lib/Tails/Persistence/Configuration/Setting.pm:113
 msgid "Custom"
-msgstr "× ×ª×× ×××©××ª"
+msgstr "×××ª×× ×××©××ª"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:56
 msgid "Personal Data"
@@ -133,7 +133,7 @@ msgstr "×ª××× × × ××¡×¤×ª"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:103
 msgid "Software installed when starting Tails"
-msgstr ""
+msgstr "×ª××× × ×××ª×§× ×ª ××¢×ª ××ª×××ª Tails"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:121
 msgid "Printers"
@@ -217,7 +217,7 @@ msgid ""
 "Beware! Using persistence has consequences that must be well "
 "understood. Tails can't help you if you use it wrong! See the Encrypted "
 "persistence page of the Tails documentation to learn more."
-msgstr ""
+msgstr "×××××¨! ××©××××© ×××ª××× ××© ××©××××ª 
×©××××××ª ×××××ª ×××× ××ª ××××. Tails ××× × ×××× 
××¢×××¨ ×× ×× ×ª×©×ª××© ×× ××××¤× ×©×××! ×¨×× ××ª ×××£ 
××ª××× ×××¦×¤× ×ª ×©× ×ª××¢×× Tails ××× ××××× ×¢××."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:169
 msgid "Passphrase:"
@@ -260,11 +260,11 @@ msgstr "×××¨×©×××ª ×©× ×××¨× ×××ª××× 
××ª××§× ×."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:314
 msgid "Creating default persistence configuration."
-msgstr ""
+msgstr "×××¦×¨ ×ª×¦××¨×ª ××¨××¨×ª ×××× ×©× ××ª×××."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:317
 msgid "The default persistence configuration will be created."
-msgstr ""
+msgstr "×ª×¦××¨×ª ××¨××¨×ª ××××× ×©× ××ª××× ×ª××××¦×¨."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:332
 msgid "Creating..."

___
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

2018-08-24 Thread translation

commit 0d882768699ad904aa4ca73caab2322a165daeb9
Author: Translation commit bot 
Date:   Fri Aug 24 20:46:49 2018 +

Update translations for tails-persistence-setup_completed
---
 he/he.po | 379 ---
 1 file changed, 190 insertions(+), 189 deletions(-)

diff --git a/he/he.po b/he/he.po
index 01167aef3..2116d544a 100644
--- a/he/he.po
+++ b/he/he.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2017-05-15 13:51+0200\n"
-"PO-Revision-Date: 2018-08-06 19:57+\n"
+"POT-Creation-Date: 2018-08-16 11:14+0200\n"
+"PO-Revision-Date: 2018-08-24 20:41+\n"
 "Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -22,307 +22,308 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 
1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:48
-msgid "Personal Data"
-msgstr "× ×ª×× ×× ×××©×××"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:50
-msgid "Keep files stored in the `Persistent' directory"
-msgstr "×©×××¨ ×§××¦×× ×××××¡× ×× ××¡××¤×¨×××ª `Persistent'"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:58
-msgid "GnuPG"
-msgstr "GnuPG"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:60
-msgid "GnuPG keyrings and configuration"
-msgstr "×××××§× ××¤×ª×××ª ××ª×¦××¨× ×©× GnuPG"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:68
-msgid "SSH Client"
-msgstr "××§×× SSH"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:70
-msgid "SSH keys, configuration and known hosts"
-msgstr "××¤×ª×××ª, ×ª×¦××¨× ××××¨××× ××××¢×× ×©× SSH"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:78
-msgid "Pidgin"
-msgstr "Pidgin"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:80
-msgid "Pidgin profiles and OTR keyring"
-msgstr "×¤×¨××¤××× Pidgin ××××××§ ××¤×ª×××ª OTR"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:88
-msgid "Thunderbird"
-msgstr "Thunderbird"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:90
-msgid "Thunderbird profiles and locally stored email"
-msgstr "×¤×¨××¤×××× ××××\"× ×××××¡× ××§××××ª ×©× 
Thunderbird"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:98
-msgid "GNOME Keyring"
-msgstr "×××××§ ××¤×ª×××ª GNOME"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:100
-msgid "Secrets stored by GNOME Keyring"
-msgstr "×¡××××ª ×××××¡× ×× ××××××§ ××¤×ª×××ª GNOME"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:108
-msgid "Network Connections"
-msgstr "×××××¨× ×¨×©×ª"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:110
-msgid "Configuration of network devices and connections"
-msgstr "×ª×¦××¨× ×©× ××ª×§× × ×¨×©×ª ××××××¨××"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:118
-msgid "Browser bookmarks"
-msgstr "×¡××× ×××ª ××¤××¤×"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:120
-msgid "Bookmarks saved in the Tor Browser"
-msgstr "×¡××× ×××ª ×©×××¨××ª ×××¤××¤× Tor"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:128
-msgid "Printers"
-msgstr "×××¤×¡××ª"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:130
-msgid "Printers configuration"
-msgstr "×ª×¦××¨×ª ×××¤×¡××ª"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:138
-msgid "Bitcoin client"
-msgstr "××§×× ××××§×××"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:140
-msgid "Electrum's bitcoin wallet and configuration"
-msgstr "××¨× ×§ ××××§××× ××ª×¦××¨× ×©× Electrum"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:148
-msgid "APT Packages"
-msgstr "××××××ª APT"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:150
-msgid "Packages downloaded by APT"
-msgstr "××××××ª ×©×××¨×× ×¢\"× APT"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:158
-msgid "APT Lists"
-msgstr "×¨×©××××ª APT"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:160
-msgid "Lists downloaded by APT"
-msgstr "×¨×©××××ª ×©×××¨×× ×¢\"× APT"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:168
-msgid "Dotfiles"
-msgstr "Dotfiles"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:170
-msgid ""
-"Symlink into $HOME every file or directory found in the `dotfiles' directory"
-msgstr "×¦××¨ ×§××©××¨ ×¡××× ×× $HOME ××× ×§×××¥ ×× 
×¡××¤×¨××× ×× ××¦××× ××¡××¤×¨××× `dotfiles'"
-
-#: ../lib/Tails/Persistence/Setup.pm:230
+#: ../lib/Tails/Persistence/Setup.pm:265
 msgid "Setup Tails persistent volume"
 msgstr "×§×××¢×ª ×ª×¦××¨×ª ××¨× ××ª××× ×©× Tails"
 
-#: ../lib/Tails/Persistence/Setup.pm:312 ../lib/Tails/Persistence/Setup.pm:459
+#: ../lib/Tails/Per

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

2018-08-24 Thread translation

commit 16e983221ceb530bf7adf171965bde20f3b3cea4
Author: Translation commit bot 
Date:   Fri Aug 24 20:46:23 2018 +

Update translations for tails-greeter-2_completed
---
 es/es.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/es/es.po b/es/es.po
index ad95eca47..eb623d266 100644
--- a/es/es.po
+++ b/es/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-01 20:26+0100\n"
+"POT-Creation-Date: 2018-08-16 11:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Emma Peel, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
@@ -297,7 +297,7 @@ msgstr "_Iniciar Tails "
 msgid "default:LTR"
 msgstr "predeterminado:LTR"
 
-#: ../tailsgreeter/persistence.py:89
+#: ../tailsgreeter/persistence.py:91
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -306,7 +306,7 @@ msgstr ""
 "live-persist fallÃ³ con un cÃ³digo de retorno {returncode}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#: ../tailsgreeter/persistence.py:124 ../tailsgreeter/persistence.py:141
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -317,7 +317,7 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:156
+#: ../tailsgreeter/persistence.py:158
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -328,7 +328,7 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:170
+#: ../tailsgreeter/persistence.py:172
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"

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

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

2018-08-24 Thread translation

commit 39ef9c9a93fdfe59e2e7231a51e4af647cce4e7d
Author: Translation commit bot 
Date:   Fri Aug 24 20:46:18 2018 +

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

diff --git a/es/es.po b/es/es.po
index ad95eca47..eb623d266 100644
--- a/es/es.po
+++ b/es/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-01 20:26+0100\n"
+"POT-Creation-Date: 2018-08-16 11:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Emma Peel, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
@@ -297,7 +297,7 @@ msgstr "_Iniciar Tails "
 msgid "default:LTR"
 msgstr "predeterminado:LTR"
 
-#: ../tailsgreeter/persistence.py:89
+#: ../tailsgreeter/persistence.py:91
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -306,7 +306,7 @@ msgstr ""
 "live-persist fallÃ³ con un cÃ³digo de retorno {returncode}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#: ../tailsgreeter/persistence.py:124 ../tailsgreeter/persistence.py:141
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -317,7 +317,7 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:156
+#: ../tailsgreeter/persistence.py:158
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -328,7 +328,7 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:170
+#: ../tailsgreeter/persistence.py:172
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"

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

[tor-commits] [webwml/master] 0.3.4.7-rc is now tagged.

2018-08-24 Thread nickm

commit cc2b06bf8f1632de0f4a4d045177cc8f33887728
Author: Nick Mathewson 
Date:   Fri Aug 24 16:33:20 2018 -0400

0.3.4.7-rc is now tagged.
---
 Makefile | 2 +-
 include/versions.wmi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 9dbd67f5..775301dd 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 # website component, and set it to needs_review.
 
 export STABLETAG=tor-0.3.3.9
-export DEVTAG=tor-0.3.4.6-rc
+export DEVTAG=tor-0.3.4.7-rc
 
 WMLBASE=.
 SUBDIRS=docs eff projects press about download getinvolved donate 
docs/torbutton
diff --git a/include/versions.wmi b/include/versions.wmi
index 2fa8dcfe..c85a1b8f 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,5 +1,5 @@
 0.3.3.9
-0.3.4.6-rc
+0.3.4.7-rc
 
 maint-7.5
 

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

[tor-commits] [tor/release-0.3.4] Fix a version number, set a release date (today)

2018-08-24 Thread nickm

commit 8465a8d84647c349d5995807b93a06f3afdd6185
Author: Nick Mathewson 
Date:   Fri Aug 24 15:52:43 2018 -0400

Fix a version number, set a release date (today)
---
 ChangeLog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6e61813ce..25ddebc8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
-Changes in version 0.3.4.7-rc - 2018-08-2?
-  Tor 0.3.4.6-rc fixes several small compilation, portability, and
+Changes in version 0.3.4.7-rc - 2018-08-24
+  Tor 0.3.4.7-rc fixes several small compilation, portability, and
   correctness issues in previous versions of Tor. This version is a
   release candidate: if no serious bugs are found, we expect that the
   stable 0.3.4 release will be (almost) the same as this release.

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

[tor-commits] [tor/release-0.3.4] Fold in one more changelog entry

2018-08-24 Thread nickm

commit 6809bbe766dbf6b3fccbf950d67baa71eae5a25a
Author: Nick Mathewson 
Date:   Fri Aug 24 12:37:21 2018 -0400

Fold in one more changelog entry
---
 ChangeLog | 5 +
 changes/27286 | 4 
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2012eb644..6e61813ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,11 @@ Changes in version 0.3.4.7-rc - 2018-08-2?
 - Use cargo cache in our Travis CI configuration. Closes
   ticket 26952.
 
+  o Minor features (directory authorities):
+- Authorities no longer vote to make the subprotocol version
+  "LinkAuth=1" a requirement: it is unsupportable with NSS, and
+  hasn't been needed since Tor 0.3.0.1-alpha. Closes ticket 27286.
+
   o Minor features (geoip):
 - Update geoip and geoip6 to the August 7 2018 Maxmind GeoLite2
   Country database. Closes ticket 27089.
diff --git a/changes/27286 b/changes/27286
deleted file mode 100644
index 5f5f7a4ae..0
--- a/changes/27286
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (directory authorities):
-- Authorities no longer vote to make the subprotocol version "LinkAuth=1"
-  a requirement: it is unsupportable with NSS, and hasn't been needed
-  since Tor 0.3.0.1-alpha. Closes ticket 27286.



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

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

2018-08-24 Thread translation

commit c5667ecf1193b3322fdf168708598f00a916e033
Author: Translation commit bot 
Date:   Fri Aug 24 20:16:38 2018 +

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

diff --git a/he/he.po b/he/he.po
index 46dfba6f0..a9eee35c9 100644
--- a/he/he.po
+++ b/he/he.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2018-08-16 11:14+0200\n"
-"PO-Revision-Date: 2018-08-16 18:46+\n"
+"PO-Revision-Date: 2018-08-24 19:53+\n"
 "Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -50,28 +50,28 @@ msgstr "×××ª×§× %s ××× ××¨× ××ª×××."
 msgid ""
 "Cannot delete the persistent volume on %s while in use. You should restart "
 "Tails without persistence."
-msgstr ""
+msgstr "×× × ××ª× ×××××§ ××ª ××¨× ×××ª××× ×¢× %s ×××× 
×©××××©. ××ª× ×¦×¨×× ×××¤×¢×× ××××© ××ª Tails ××× ××ª×××."
 
 #: ../lib/Tails/Persistence/Setup.pm:407
 #, perl-format
 msgid "Persistence volume on %s is not unlocked."
-msgstr ""
+msgstr "××¨× ××ª××× ×¢× %s ××× × ×××ª×Ö¾× ×¢××."
 
 #: ../lib/Tails/Persistence/Setup.pm:412
 #, perl-format
 msgid "Persistence volume on %s is not mounted."
-msgstr ""
+msgstr "××¨× ××ª××× ×¢× %s ××× × ×××¦×."
 
 #: ../lib/Tails/Persistence/Setup.pm:417
 #, perl-format
 msgid ""
 "Persistence volume on %s is not readable. Permissions or ownership problems?"
-msgstr ""
+msgstr "××¨× ××ª××× ×¢× %s ××× × ×§×¨××. ××¢×××ª ×©× 
××¨×©×××ª ×× ××¢×××ª?"
 
 #: ../lib/Tails/Persistence/Setup.pm:422
 #, perl-format
 msgid "Persistence volume on %s is not writable."
-msgstr ""
+msgstr "××¨× ××ª××× ×¢× %s ××× × ××¨Ö¾××ª×××."
 
 #: ../lib/Tails/Persistence/Setup.pm:431
 #, perl-format

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

[tor-commits] [tor/master] Fix a compilation warning on i386 with clang

2018-08-24 Thread nickm

commit bb65b539663550bd22732369295c3572a426899a
Author: Nick Mathewson 
Date:   Fri Aug 24 16:13:30 2018 -0400

Fix a compilation warning on i386 with clang
---
 src/test/test_util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/test_util.c b/src/test/test_util.c
index b395110cd..6cbd504e3 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -6299,7 +6299,7 @@ test_util_log_mallinfo(void *arg)
   tt_assert(next2);
   if (mem2 == 0) {
 /* This is a fake mallinfo that doesn't actually fill in its outputs. */
-tt_int_op(mem1, OP_EQ, 0);
+tt_u64_op(mem1, OP_EQ, 0);
   } else {
 tt_u64_op(mem1, OP_LT, mem2);
   }

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

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

2018-08-24 Thread translation

commit e72cb9eed3f1a3ae6aa5cff05d904bb181324659
Author: Translation commit bot 
Date:   Fri Aug 24 19:17:19 2018 +

Update translations for tor-browser-manual
---
 ru/ru.po | 21 +
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/ru/ru.po b/ru/ru.po
index d387b079d..3aa0205b3 100644
--- a/ru/ru.po
+++ b/ru/ru.po
@@ -155,6 +155,12 @@ msgid ""
 " in combination with pluggable transports helps to disguise the fact that "
 "you are using Tor."
 msgstr ""
+"ÐÐ¾Ð»ÑÑÐ¸Ð½ÑÑÐ²Ð¾ Pluggable Transports, 
ÑÐ°ÐºÐ¸Ðµ ÐºÐ°Ðº"
+" obfs3 Ð¸ obfs4, Ð¿Ð¾Ð»Ð°Ð³Ð°ÑÑÑÑ Ð½Ð° Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ 
Â«Ð¼Ð¾ÑÑÐ¾Ð²ÑÑÂ» ÑÐµÐ»Ðµ. ÐÐ°Ðº Ð¾Ð±ÑÑÐ½ÑÐµ "
+"ÑÐµÑÑÐ°Ð½ÑÐ»ÑÑÐ¾ÑÑ Tor, Ð¼Ð¾ÑÑÑ ÑÐ¿ÑÐ°Ð²Ð»ÑÑÑÑÑ 
Ð´Ð¾Ð±ÑÐ¾Ð²Ð¾Ð»ÑÑÐ°Ð¼Ð¸; Ð² Ð¾ÑÐ»Ð¸ÑÐ¸Ðµ Ð¾Ñ Ð¾Ð±ÑÑÐ½ÑÑ "
+"ÑÐµÐ»Ðµ, Ð¾Ð½Ð¸ Ð½Ðµ Ð¿ÑÐ±Ð»Ð¸ÐºÑÑÑÑÑ Ð¿ÑÐ±Ð»Ð¸ÑÐ½Ð¾, Ð¿Ð¾ÑÑÐ¾Ð¼Ñ 
Ð¿ÑÐ¾ÑÐ¸Ð²Ð½Ð¸Ðº Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð»ÐµÐ³ÐºÐ¾ "
+"Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÑÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð¸Ñ. ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ 
Ð¼Ð¾ÑÑÐ¾Ð² Ð² ÑÐ¾ÑÐµÑÐ°Ð½Ð¸Ð¸ Ñ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ°ÐµÐ¼ÑÐ¼Ð¸ "
+"ÑÑÐ°Ð½ÑÐ¿Ð¾ÑÑÐ°Ð¼Ð¸ Ð¿Ð¾Ð¼Ð¾Ð³Ð°ÐµÑ ÑÐºÑÑÑÑ ÑÐ¾Ñ ÑÐ°ÐºÑ, 
ÑÑÐ¾ Ð²Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÐµ Tor."
 
 #: bridges.page:21
 msgid ""
@@ -162,6 +168,9 @@ 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"
@@ -259,9 +268,9 @@ msgstr ""
 "ÐÑÑÐ¼Ð¾Ð¹ Ð´Ð¾ÑÑÑÐ¿ Ðº ÑÐµÑÐ¸ Tor Ð¸Ð½Ð¾Ð³Ð´Ð° Ð¼Ð¾Ð¶ÐµÑ 
Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑÑÑ Ð²Ð°ÑÐ¸Ð¼ Ð¸Ð½ÑÐµÑÐ½ÐµÑ-"
 "Ð¿ÑÐ¾Ð²Ð°Ð¹Ð´ÐµÑÐ¾Ð¼ Ð¸Ð»Ð¸ Ð¿ÑÐ°Ð²Ð¸ÑÐµÐ»ÑÑÑÐ²Ð¾Ð¼. Tor Browser 
Ð²ÐºÐ»ÑÑÐ°ÐµÑ Ð½ÐµÐºÐ¾ÑÐ¾ÑÑÐµ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÑ "
 "Ð¾Ð±ÑÐ¾Ð´Ð°, ÑÑÐ¾Ð±Ñ Ð¾Ð±Ð¾Ð¹ÑÐ¸ ÑÑÐ¸ Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÐ¸. ÐÑÐ¸ 
Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÑ Ð½Ð°Ð·ÑÐ²Ð°ÑÑÑÑ "
-"Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ°ÐµÐ¼ÑÐ¼Ð¸ ÑÑÐ°Ð½ÑÐ¿Ð¾ÑÑÐ°Ð¼Ð¸ - Â«Pluggable 
TransportsÂ». ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÑ "
-"Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ ÑÐ¸Ð¿Ð°Ñ ÑÑÐ°Ð½ÑÐ¿Ð¾ÑÑÐ°, Ð´Ð¾ÑÑÑÐ¿Ð½ÑÑ 
Ð² Ð½Ð°ÑÑÐ¾ÑÑÐµÐµ Ð²ÑÐµÐ¼Ñ, ÑÐ¼Ð¾ÑÑÐ¸ÑÐµ Ð½Ð° "
-"ÑÑÑÐ°Ð½Ð¸ÑÐµ Pluggable Transports."
+"Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ°ÐµÐ¼ÑÐ¼Ð¸ ÑÑÐ°Ð½ÑÐ¿Ð¾ÑÑÐ°Ð¼Ð¸ 
- Â«Pluggable "
+"TransportsÂ». ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ 
ÑÐ¸Ð¿Ð°Ñ ÑÑÐ°Ð½ÑÐ¿Ð¾ÑÑÐ°, Ð´Ð¾ÑÑÑÐ¿Ð½ÑÑ "
+"Ð² Ð½Ð°ÑÑÐ¾ÑÑÐµÐµ Ð²ÑÐµÐ¼Ñ, ÑÐ¼Ð¾ÑÑÐ¸ÑÐµ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐµ 
Pluggable Transports."
 
 #: circumvention.page:22
 msgid "Using pluggable transports"
@@ -359,6 +368,10 @@ msgid ""
 "xref=\"bridges\">Bridges section to learn what bridges are and how to"
 " obtain them."
 msgstr ""
+"ÐÑÐ»Ð¸ Ð²Ñ Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐµÑÐµ Ð²ÑÐµ ÑÑÐ¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ, Ð¸ Ð½Ð¸ 
Ð¾Ð´Ð¸Ð½ Ð¸Ð· Ð½Ð¸Ñ Ð½Ðµ Ð¿Ð¾Ð¼Ð¾Ð¶ÐµÑ Ð²Ð°Ð¼ "
+"Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ Ð´Ð¾ÑÑÑÐ¿ Ð² ÐÐ½ÑÐµÑÐ½ÐµÑ, Ð²Ð°Ð¼ Ð½ÑÐ¶Ð½Ð¾ 
Ð±ÑÐ´ÐµÑ Ð²Ð²ÐµÑÑÐ¸ Ð°Ð´ÑÐµÑÐ° Ð¼Ð¾ÑÑÐ¾Ð² Ð²ÑÑÑÐ½ÑÑ. "
+"ÐÑÐ¾ÑÑÐ¸ÑÐµ Ð¼Ð¾ÑÑÑ -  Bridges, 
ÑÑÐ¾Ð±Ñ ÑÐ·Ð½Ð°ÑÑ, ÐºÐ°ÐºÐ¸Ðµ"
+" Ð±ÑÐ²Ð°ÑÑ Ð¼Ð¾ÑÑÑ Ð¸ ÐºÐ°Ðº Ð¸Ñ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ."
 
 #: downloading.page:7
 msgid "How to download Tor Browser"
@@ -484,7 +497,7 @@ msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Satori Ð¸Ð· Chrome App Store."
 
 #: downloading.page:100
 msgid "Select Satori from your browserâs Apps menu."
-msgstr ""
+msgstr "ÐÑÐ±ÐµÑÐµÑÐ¸ Satori Ð² Ð¼ÐµÐ½Ñ Ð²Ð°ÑÐµÐ³Ð¾ Ð±ÑÐ°ÑÐ·ÐµÑÐ°."
 
 #: downloading.page:105
 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

2018-08-24 Thread translation

commit 29c99439098883d481740296f3d267681b725207
Author: Translation commit bot 
Date:   Fri Aug 24 18:47:19 2018 +

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

diff --git a/ru/ru.po b/ru/ru.po
index 54d01ec1c..d387b079d 100644
--- a/ru/ru.po
+++ b/ru/ru.po
@@ -17,12 +17,13 @@
 # Roberto Brigante, 2017
 # ÐÐ½ÑÐ¾Ð½ Ð¢Ð¾Ð»Ð¼Ð°ÑÐµÐ² , 2017
 # Boris Shminke, 2017
+# Sergey Lapshov , 2018
 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: Boris Shminke, 2017\n"
+"Last-Translator: Sergey Lapshov , 2018\n"
 "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -232,6 +233,11 @@ 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"
@@ -250,6 +256,12 @@ msgid ""
 "page for more information on the types of transport that are currently "
 "available."
 msgstr ""
+"ÐÑÑÐ¼Ð¾Ð¹ Ð´Ð¾ÑÑÑÐ¿ Ðº ÑÐµÑÐ¸ Tor Ð¸Ð½Ð¾Ð³Ð´Ð° Ð¼Ð¾Ð¶ÐµÑ 
Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑÑÑ Ð²Ð°ÑÐ¸Ð¼ Ð¸Ð½ÑÐµÑÐ½ÐµÑ-"
+"Ð¿ÑÐ¾Ð²Ð°Ð¹Ð´ÐµÑÐ¾Ð¼ Ð¸Ð»Ð¸ Ð¿ÑÐ°Ð²Ð¸ÑÐµÐ»ÑÑÑÐ²Ð¾Ð¼. Tor Browser 
Ð²ÐºÐ»ÑÑÐ°ÐµÑ Ð½ÐµÐºÐ¾ÑÐ¾ÑÑÐµ Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÑ "
+"Ð¾Ð±ÑÐ¾Ð´Ð°, ÑÑÐ¾Ð±Ñ Ð¾Ð±Ð¾Ð¹ÑÐ¸ ÑÑÐ¸ Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÐ¸. ÐÑÐ¸ 
Ð¸Ð½ÑÑÑÑÐ¼ÐµÐ½ÑÑ Ð½Ð°Ð·ÑÐ²Ð°ÑÑÑÑ "
+"Ð¿Ð¾Ð´ÐºÐ»ÑÑÐ°ÐµÐ¼ÑÐ¼Ð¸ ÑÑÐ°Ð½ÑÐ¿Ð¾ÑÑÐ°Ð¼Ð¸ - Â«Pluggable 
TransportsÂ». ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÑ "
+"Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ ÑÐ¸Ð¿Ð°Ñ ÑÑÐ°Ð½ÑÐ¿Ð¾ÑÑÐ°, Ð´Ð¾ÑÑÑÐ¿Ð½ÑÑ 
Ð² Ð½Ð°ÑÑÐ¾ÑÑÐµÐµ Ð²ÑÐµÐ¼Ñ, ÑÐ¼Ð¾ÑÑÐ¸ÑÐµ Ð½Ð° "
+"ÑÑÑÐ°Ð½Ð¸ÑÐµ Pluggable Transports."
 
 #: circumvention.page:22
 msgid "Using pluggable transports"

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

[tor-commits] [tor/master] Fix revision counter bugs caused by bad SRV start time computation.

2018-08-24 Thread nickm

commit 5febea0d54ea986ab66dc62905a686cc23abbcb6
Author: George Kadianakis 
Date:   Fri Aug 17 15:10:20 2018 +0300

Fix revision counter bugs caused by bad SRV start time computation.

Bug description: For each descriptor, its revision counter is the OPE
ciphertext of the number of seconds since the start time of its SRV value.
This bug caused us to confuse the SRV start time in the middle of the 
lifetime
of a descriptor in some edge-cases, which caused descriptor rejects.

Bug cause: The bug occurs when we fetch a 23:00 consensus after
midnight (e.g. at 00:08 when not all dirauths have fetched the latest 00:00
consensus). In that case, the voting schedule (which was used for SRV start
time calculation) would return a valid-after past-midnight, whereas our
consensus would be pre-midnight, and that would confuse the SRV start time
computation which is used by HS revision counters (because we would reset 
the
start time of SRV, without rotating descriptors).

Bug fix: We now use our local consensus time to calculate the SRV start 
time,
instead of the voting schedule. The voting schedule does not work as 
originally
envisioned in this case, because it was created for voting by dirauths and 
not
for scheduling stuff on clients.
---
 src/feature/hs_common/shared_random_client.c | 21 +
 src/test/test_shared_random.c| 34 
 2 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/src/feature/hs_common/shared_random_client.c 
b/src/feature/hs_common/shared_random_client.c
index ff98a719d..a13404a32 100644
--- a/src/feature/hs_common/shared_random_client.c
+++ b/src/feature/hs_common/shared_random_client.c
@@ -51,9 +51,13 @@ get_voting_interval(void)
   return interval;
 }
 
-/* Given the time now, return the start time of the current round of
+/* Given the current consensus, return the start time of the current round of
  * the SR protocol. For example, if it's 23:47:08, the current round thus
- * started at 23:47:00 for a voting interval of 10 seconds. */
+ * started at 23:47:00 for a voting interval of 10 seconds.
+ *
+ * This function uses the consensus voting schedule to derive its results,
+ * instead of the actual consensus we are currently using, so it should be used
+ * for voting purposes. */
 time_t
 get_start_time_of_current_round(void)
 {
@@ -231,8 +235,17 @@ sr_state_get_start_time_of_current_protocol_run(void)
 {
   int total_rounds = SHARED_RANDOM_N_ROUNDS * SHARED_RANDOM_N_PHASES;
   int voting_interval = get_voting_interval();
-  /* Find the time the current round started. */
-  time_t beginning_of_curr_round = get_start_time_of_current_round();
+  time_t beginning_of_curr_round;
+
+  /* This function is not used for voting purposes, so if we have a live
+ consensus, use its valid-after as the beginning of the current round,
+ otherwise resort to the voting schedule which should always exist. */
+  networkstatus_t *ns = networkstatus_get_live_consensus(approx_time());
+  if (ns) {
+beginning_of_curr_round = ns->valid_after;
+  } else {
+beginning_of_curr_round = get_start_time_of_current_round();
+  }
 
   /* Get current SR protocol round */
   int curr_round_slot;
diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c
index d2defdf68..72e4522da 100644
--- a/src/test/test_shared_random.c
+++ b/src/test/test_shared_random.c
@@ -290,6 +290,40 @@ test_get_start_time_of_current_run(void *arg)
 tt_str_op("2015-04-20 00:00:00", OP_EQ, tbuf);
   }
 
+  {
+/* We want the local time to be past midnight, but the current consensus to
+ * have valid-after 23:00 (e.g. this can happen if we fetch a new consensus
+ * at 00:08 before dircaches have a chance to get the midnight consensus).
+ *
+ * Basically, we want to cause a desynch between ns->valid_after (23:00)
+ * and the voting_schedule.interval_starts (01:00), to make sure that
+ * sr_state_get_start_time_of_current_protocol_run() handles it gracefully:
+ * It should actually follow the local consensus time and not the voting
+ * schedule (which is designed for authority voting purposes). */
+retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:00:00 UTC",
+&mock_consensus.fresh_until);
+tt_int_op(retval, OP_EQ, 0);
+
+retval = parse_rfc1123_time("Mon, 19 Apr 2015 23:00:00 UTC",
+&mock_consensus.valid_after);
+
+retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:08:00 UTC",
+¤t_time);
+tt_int_op(retval, OP_EQ, 0);
+update_approx_time(current_time);
+voting_schedule_recalculate_timing(get_options(), current_time);
+
+run_start_time = sr_state_get_start_time_of_current_protocol_run();
+
+/* Compare it with the correct result */
+format_iso_time(tbuf, run_start_time);
+tt_str_op("2015-04-19 00:00:00", OP_EQ, tbuf

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/289'

2018-08-24 Thread nickm

commit 7217bdacb50e6934abdf9bb43b4c9b1073155647
Merge: 4c3b43604 5febea0d5
Author: Nick Mathewson 
Date:   Fri Aug 24 12:57:18 2018 -0400

Merge remote-tracking branch 'tor-github/pr/289'

 src/feature/hs_common/shared_random_client.c | 21 +
 src/test/test_shared_random.c| 34 
 2 files changed, 51 insertions(+), 4 deletions(-)

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

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

2018-08-24 Thread translation

commit 15fc9dd00cb16e720e975b2594fc1afde42fc4be
Author: Translation commit bot 
Date:   Fri Aug 24 16:48:58 2018 +

Update translations for support-portal
---
 contents+pt_BR.po | 39 ++-
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/contents+pt_BR.po b/contents+pt_BR.po
index 99362e784..e70c5d094 100644
--- a/contents+pt_BR.po
+++ b/contents+pt_BR.po
@@ -1413,6 +1413,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: http//localhost/tbb/tbb-29/
 #: (content/tbb/tbb-29/contents+en.lrquestion.description)
@@ -2208,6 +2210,9 @@ msgid ""
 "href=\"https://blog.torproject.org/sunsetting-tor-messenger\";>Tor "
 "Messenger."
 msgstr ""
+"NÃ£o. Depois de onze lanÃ§amentos beta, nÃ³s descontinuaremos o suporte ao https://blog.torproject.org/sunsetting-tor-messenger\";>Tor "
+"Messenger."
 
 #: http//localhost/tormessenger/tormessenger-1/
 #: (content/tormessenger/tormessenger-1/contents+en.lrquestion.description)
@@ -2215,6 +2220,8 @@ msgid ""
 "We still believe in Tor's ability to be used in a messaging app, but we "
 "don't have the resources to make it happen right now."
 msgstr ""
+"NÃ³s ainda acreditamos na utilidade do Tor para se utilizando como aplicativo"
+" de mensagens, mas nÃ£o temos recursos para fazer isso agora."
 
 #: http//localhost/tormessenger/tormessenger-1/
 #: (content/tormessenger/tormessenger-1/contents+en.lrquestion.description)
@@ -2247,6 +2254,9 @@ msgid ""
 "https://guardianproject.info/apps/orfox/\";>Orfox "
 "web pages."
 msgstr ""
+"Mais informaÃ§Ãµes podem ser encontradas nas pÃ¡ginas https://guardianproject.info/apps/orbot/\";>Orbot e "
+"https://guardianproject.info/apps/orfox/\";>Orfox."
 
 #: http//localhost/tormobile/tormobile-1/
 #: (content/tormobile/tormobile-1/contents+en.lrquestion.description)
@@ -2449,7 +2459,7 @@ msgstr ""
 #: http//localhost/gettor/gettor-2/
 #: (content/gettor/gettor-2/contents+en.lrquestion.seo_slug)
 msgid "to-use-gettor-via-email"
-msgstr ""
+msgstr "para-usar-gettor-via-email"
 
 #: http//localhost/gettor/gettor-3/
 #: (content/gettor/gettor-3/contents+en.lrquestion.title)
@@ -2488,7 +2498,7 @@ msgstr "* Windows"
 #: http//localhost/gettor/gettor-3/
 #: (content/gettor/gettor-3/contents+en.lrquestion.seo_slug)
 msgid "to-use-gettor-via-twitter"
-msgstr ""
+msgstr "para-usar-gettor-via-twitter"
 
 #: http//localhost/gettor/gettor-4/
 #: (content/gettor/gettor-4/contents+en.lrquestion.title)
@@ -2507,7 +2517,7 @@ msgstr ""
 #: http//localhost/gettor/gettor-4/
 #: (content/gettor/gettor-4/contents+en.lrquestion.seo_slug)
 msgid "to-use-gettor-via-xmpp"
-msgstr ""
+msgstr "para-usar-gettor-via-xmpp"
 
 #: http//localhost/connecting/connecting-1/
 #: (content/connecting/connecting-1/contents+en.lrquestion.seo_slug)
@@ -3028,16 +3038,19 @@ msgid ""
 "If the site you are visiting uses HTTPS, then the traffic leaving your exit "
 "relay will be encrypted, and won't be visible to eavesdroppers."
 msgstr ""
+"Se o site que vocÃª estÃ¡ visitando utiliza HTTPS, entÃ£o o trÃ¡fego deixando 
o "
+"seu relay de saÃda serÃ¡ criptografado, e nÃ£o serÃ¡ visÃvel para "
+"bisbilhoteiros."
 
 #: http//localhost/https/https-1/
 #: (content/https/https-1/contents+en.lrquestion.description)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: http//localhost/https/https-1/
 #: (content/https/https-1/contents+en.lrquestion.description)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: http//localhost/https/https-1/
 #: (content/https/https-1/contents+en.lrquestion.description)
@@ -3051,7 +3064,7 @@ msgstr ""
 #: http//localhost/https/https-1/
 #: (content/https/https-1/contents+en.lrquestion.description)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: http//localhost/https/https-1/
 #: (content/https/https-1/contents+en.lrquestion.description)
@@ -3060,11 +3073,14 @@ msgid ""
 "visible to eavesdroppers with and without Tor Browser and HTTPS "
 "encryption."
 msgstr ""
+"Esta visualizaÃ§Ã£o mostra que informaÃ§Ãµes sÃ£o "
+"visÃveis para bisbilhoteiros com e sem a utilizaÃ§Ã£o do navegador Tor e "
+"criptografia HTTPS."
 
 #: http//localhost/https/https-1/
 #: (content/https/https-1/contents+en.lrquestion.seo_slug)
 msgid "can-eavesdroppers-see-information-i-share"
-msgstr ""
+msgstr "bisbilhoteiros-podem-ver-informaÃ§Ãµes-que-eu-compartilho"
 
 #: http//localhost/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.title)
@@ -3096,6 +3112,9 @@ msgid ""
 "* Make sure your clock, date, and timezone are set correctly. Install the "
 "ntp or openntpd (or similar) package to keep it that way."
 msgstr ""
+"* Certifique-se que seu relÃ³gio, data e fuso horÃ¡rio estÃ£o configurados "
+"corretamente. Instale o pacote ntp ou openntpd (ou similar) para sejam "
+"mantidos corretos."
 
 #: http//localhost/operators/operators-1/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3124,7 +3143,7 @@ msgstr ""
 #: http//localhost/operators/operators-6/
 #: (content/operators/operators-6/contents+en.lrquestion.description)
 m

[tor-commits] [tor/master] Bootstrap: try harder to get descriptors in non-exit test networks

2018-08-24 Thread nickm

commit 7a5896d5d444d2e32190063e38abb23030daae06
Author: teor 
Date:   Fri Aug 24 11:59:47 2018 +1000

Bootstrap: try harder to get descriptors in non-exit test networks

Use the mid weight for the third hop when there are no exits.

Fixes bug 27237; bugfix on 0.2.6.2-alpha.
---
 changes/bug27237|  4 
 src/feature/nodelist/nodelist.c | 11 ---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/changes/bug27237 b/changes/bug27237
new file mode 100644
index 0..6fa70d785
--- /dev/null
+++ b/changes/bug27237
@@ -0,0 +1,4 @@
+  o Minor bugfixes (bootstrap):
+- Try harder to get descriptors in non-exit test networks, by
+  using the mid weight for the third hop when there are no exits.
+  Fixes bug 27237; bugfix on 0.2.6.2-alpha.
diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c
index bf298337a..07edc5aba 100644
--- a/src/feature/nodelist/nodelist.c
+++ b/src/feature/nodelist/nodelist.c
@@ -2361,9 +2361,14 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
   f_exit = f_myexit;
   }
 
-  /* if the consensus has no exits, treat the exit fraction as 100% */
+  /* if the consensus has no exits, we can only build onion service paths,
+   * which are G - M - M. So use the middle fraction for the exit fraction. */
   if (router_have_consensus_path() != CONSENSUS_PATH_EXIT) {
-f_exit = 1.0;
+/* If there are no exits in the consensus, then f_exit is always 0, so
+ * it is safe to replace f_exit with f_mid. */
+if (!BUG(f_exit > 0.0)) {
+  f_exit = f_mid;
+}
   }
 
   f_path = f_guard * f_mid * f_exit;
@@ -2379,7 +2384,7 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
  (int)(f_exit*100),
  (router_have_consensus_path() == CONSENSUS_PATH_EXIT ?
   "" :
-  " (no exits in consensus)"),
+  " (no exits in consensus, using mid)"),
  (int)(f_path*100));
 
   return f_path;



___
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 'teor/ticket27211'

2018-08-24 Thread nickm

commit 4c3b43604b7dedf3456136a1ad71fa0802744b2e
Merge: 622231ce2 4217dc055
Author: Nick Mathewson 
Date:   Fri Aug 24 12:45:42 2018 -0400

Merge remote-tracking branch 'teor/ticket27211'

 changes/ticket27211|  3 ++
 scripts/README |  6 
 scripts/test/chutney-git-bisect.sh | 62 ++
 3 files changed, 71 insertions(+)

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

[tor-commits] [tor/master] Add scripts/test/chutney-git-bisect.sh, for bisecting using chutney

2018-08-24 Thread nickm

commit 4217dc0558c9fabfab1568b42dc5e101c69ddef7
Author: teor 
Date:   Fri Aug 24 04:03:56 2018 +1000

Add scripts/test/chutney-git-bisect.sh, for bisecting using chutney

Supports bisection on 0.3.4 and earlier.
Recommend that users copy the script before bisecting.

Implements ticket 27211.
---
 changes/ticket27211|  3 ++
 scripts/README |  6 
 scripts/test/chutney-git-bisect.sh | 62 ++
 3 files changed, 71 insertions(+)

diff --git a/changes/ticket27211 b/changes/ticket27211
new file mode 100644
index 0..c3d661a01
--- /dev/null
+++ b/changes/ticket27211
@@ -0,0 +1,3 @@
+  o Minor features (testing):
+- Add scripts/test/chutney-git-bisect.sh, for bisecting using chutney.
+  Implements ticket 27211.
diff --git a/scripts/README b/scripts/README
index 02faabe06..9cd6e74ac 100644
--- a/scripts/README
+++ b/scripts/README
@@ -30,6 +30,12 @@ orconfig.h files.
 Testing scripts
 ---
 
+test/chutney-git-bisect.sh -- a git bisect run script that bisects using
+chutney. The script builds tor and tor-gencert, then runs chutney. The script
+takes optional arguments for out-of-tree builds, and specific chutney network
+flavours. You should copy this script before using it with git bisect, so that
+it doesn't change (or disappear) during bisection.
+
 test/cov-blame -- Mash up the results of gcov with git blame.  Mainly useful
 to find out who has been writing untested code.
 
diff --git a/scripts/test/chutney-git-bisect.sh 
b/scripts/test/chutney-git-bisect.sh
new file mode 100755
index 0..8a3f2c70c
--- /dev/null
+++ b/scripts/test/chutney-git-bisect.sh
@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+
+# Compile tor and run chutney to find out if the current commit works
+#
+# Usage:
+# # Copy the script, so it doesn't change during bisection
+# cp scripts/test/chutney-git-bisect.sh .
+# git bisect run \
+#   ./chutney-git-bisect.sh [tries [build-dir [flavour [skip-flavour
+#
+# Runs chutney up to  times (default 3), because some bugs involve race
+# conditions.
+# Changes to  (default no cd) before running tests.
+# Runs chutney network  (default make test-network-all) as the test.
+# Skips the test if  fails (default no skip).
+
+CHUTNEY_TRIES=3
+if [ ! -z "$1" ]; then
+CHUTNEY_TRIES="$1"
+fi
+
+if [ ! -z "$2" ]; then
+cd "$2"
+fi
+
+CHUTNEY_TEST_CMD="make test-network-all"
+if [ ! -z "$3" ]; then
+CHUTNEY_TEST_CMD="$CHUTNEY_PATH/tools/test-network.sh --flavour $3"
+fi
+
+CHUTNEY_SKIP_ON_FAIL_CMD="true"
+if [ ! -z "$4" ]; then
+CHUTNEY_SKIP_ON_FAIL_CMD="$CHUTNEY_PATH/tools/test-network.sh --flavour $4"
+fi
+
+CHUTNEY_BUILD_CMD_OR="make src/or/tor src/tools/tor-gencert"
+CHUTNEY_BUILD_CMD_APP="make src/app/tor src/tools/tor-gencert"
+if ! ( $CHUTNEY_BUILD_CMD_APP || $CHUTNEY_BUILD_CMD_OR ) ; then
+echo "building '$CHUTNEY_BUILD_CMD_APP || $CHUTNEY_BUILD_CMD_OR' failed, 
skip"
+exit 125
+fi
+
+if ! $CHUTNEY_SKIP_ON_FAIL_CMD ; then
+echo "pre-condition '$CHUTNEY_SKIP_ON_FAIL_CMD' failed, skip"
+exit 125
+fi
+
+i=1
+while [ "$i" -le "$CHUTNEY_TRIES" ]; do
+echo
+echo "Round $i/$CHUTNEY_TRIES:"
+echo
+if $CHUTNEY_TEST_CMD ; then
+echo "test '$CHUTNEY_TEST_CMD' succeeded after $i/$CHUTNEY_TRIES 
attempts, good"
+exit 0
+fi
+i=$[$i+1]
+done
+
+i=$[$i-1]
+echo "test '$CHUTNEY_TEST_CMD' failed $i/$CHUTNEY_TRIES attempts, bad"
+exit 1



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

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug27237'

2018-08-24 Thread nickm

commit 622231ce2e3abc033172d5c82df7fb6bfd374db0
Merge: b1d0fa04f 7a5896d5d
Author: Nick Mathewson 
Date:   Fri Aug 24 12:44:46 2018 -0400

Merge remote-tracking branch 'teor/bug27237'

 changes/bug27237|  4 
 src/feature/nodelist/nodelist.c | 11 ---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --cc src/feature/nodelist/nodelist.c
index a0f068cf9,07edc5aba..d6bc47448
--- a/src/feature/nodelist/nodelist.c
+++ b/src/feature/nodelist/nodelist.c
@@@ -2399,8 -2383,8 +2404,8 @@@ compute_frac_paths_available(const netw
   (int)(f_mid*100),
   (int)(f_exit*100),
   (router_have_consensus_path() == CONSENSUS_PATH_EXIT ?
 -  "" :
 -  " (no exits in consensus, using mid)"),
 +  "exit bw" :
-   "end bw (no exits in consensus)"),
++  "end bw (no exits in consensus, using mid)"),
   (int)(f_path*100));
  
return f_path;



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

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

2018-08-24 Thread nickm

commit 658171318f67dd83ee115044cbf103325951a174
Merge: dd27e17cc 33e4e30d0
Author: Nick Mathewson 
Date:   Fri Aug 24 12:33:20 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/27286| 4 
 src/or/dirauth/dirvote.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --cc src/or/dirauth/dirvote.c
index 101826778,7023d4f95..bf05286b3
--- a/src/or/dirauth/dirvote.c
+++ b/src/or/dirauth/dirvote.c
@@@ -3899,692 -4039,49 +3899,692 @@@ dirvote_format_all_microdesc_vote_lines
return result;
  }
  
 -/** If vrs has a hash made for the consensus method method with
 - * the digest algorithm alg, decode it and copy it into
 - * digest256_out and return 0.  Otherwise return -1. */
 -int
 -vote_routerstatus_find_microdesc_hash(char *digest256_out,
 -  const vote_routerstatus_t *vrs,
 -  int method,
 -  digest_algorithm_t alg)
 +/** Parse and extract all SR commits from tokens and place them in
 + *  ns. */
 +static void
 +extract_shared_random_commits(networkstatus_t *ns, const smartlist_t *tokens)
  {
 -  /*  only returns the sha256 method. */
 -  const vote_microdesc_hash_t *h;
 -  char mstr[64];
 -  size_t mlen;
 -  char dstr[64];
 +  smartlist_t *chunks = NULL;
  
 -  tor_snprintf(mstr, sizeof(mstr), "%d", method);
 -  mlen = strlen(mstr);
 -  tor_snprintf(dstr, sizeof(dstr), " %s=",
 -   crypto_digest_algorithm_get_name(alg));
 +  tor_assert(ns);
 +  tor_assert(tokens);
 +  /* Commits are only present in a vote. */
 +  tor_assert(ns->type == NS_TYPE_VOTE);
  
 -  for (h = vrs->microdesc; h; h = h->next) {
 -const char *cp = h->microdesc_hash_line;
 -size_t num_len;
 -/* cp looks like \d+(,\d+)* (digesttype=val )+ .  Let's hunt for mstr in
 - * the first part. */
 -while (1) {
 -  num_len = strspn(cp, "1234567890");
 -  if (num_len == mlen && fast_memeq(mstr, cp, mlen)) {
 -/* This is the line. */
 -char buf[BASE64_DIGEST256_LEN+1];
 -/*  ignores extraneous stuff if the digest is too long.  This
 - * seems harmless enough, right? */
 -cp = strstr(cp, dstr);
 -if (!cp)
 -  return -1;
 -cp += strlen(dstr);
 -strlcpy(buf, cp, sizeof(buf));
 -return digest256_from_base64(digest256_out, buf);
 +  ns->sr_info.commits = smartlist_new();
 +
 +  smartlist_t *commits = find_all_by_keyword(tokens, K_COMMIT);
 +  /* It's normal that a vote might contain no commits even if it participates
 +   * in the SR protocol. Don't treat it as an error. */
 +  if (commits == NULL) {
 +goto end;
 +  }
 +
 +  /* Parse the commit. We do NO validation of number of arguments or ordering
 +   * for forward compatibility, it's the parse commit job to inform us if it's
 +   * supported or not. */
 +  chunks = smartlist_new();
 +  SMARTLIST_FOREACH_BEGIN(commits, directory_token_t *, tok) {
 +/* Extract all arguments and put them in the chunks list. */
 +for (int i = 0; i < tok->n_args; i++) {
 +  smartlist_add(chunks, tok->args[i]);
 +}
 +sr_commit_t *commit = sr_parse_commit(chunks);
 +smartlist_clear(chunks);
 +if (commit == NULL) {
 +  /* Get voter identity so we can warn that this dirauth vote contains
 +   * commit we can't parse. */
 +  networkstatus_voter_info_t *voter = smartlist_get(ns->voters, 0);
 +  tor_assert(voter);
 +  log_warn(LD_DIR, "SR: Unable to parse commit %s from vote of voter %s.",
 +   escaped(tok->object_body),
 +   hex_str(voter->identity_digest,
 +   sizeof(voter->identity_digest)));
 +  /* Commitment couldn't be parsed. Continue onto the next commit because
 +   * this one could be unsupported for instance. */
 +  continue;
 +}
 +/* Add newly created commit object to the vote. */
 +smartlist_add(ns->sr_info.commits, commit);
 +  } SMARTLIST_FOREACH_END(tok);
 +
 + end:
 +  smartlist_free(chunks);
 +  smartlist_free(commits);
 +}
 +
 +/* Using the given directory tokens in tokens, parse the shared random commits
 + * and put them in the given vote document ns.
 + *
 + * This also sets the SR participation flag if present in the vote. */
 +void
 +dirvote_parse_sr_commits(networkstatus_t *ns, const smartlist_t *tokens)
 +{
 +  /* Does this authority participates in the SR protocol? */
 +  directory_token_t *tok = find_opt_by_keyword(tokens, K_SR_FLAG);
 +  if (tok) {
 +ns->sr_info.participate = 1;
 +/* Get the SR commitments and reveals from the vote. */
 +extract_shared_random_commits(ns, tokens);
 +  }
 +}
 +
 +/* For the given vote, free the shared random commits if any. */
 +void
 +dirvote_clear_commits(networkstatus_t *ns)
 +{
 +  tor_assert(ns->type == NS_TYPE_VOTE);
 +
 +  if (ns->sr_info.commits) {
 +SMARTLIST_FOREACH(ns->sr_info.commits, sr_commit_t *, c,
 +  sr_commit_free(

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

2018-08-24 Thread nickm

commit 33e4e30d0a0aa8717ca67cb82581e536b402f30b
Merge: e01ea64f0 98e1a1d10
Author: Nick Mathewson 
Date:   Fri Aug 24 12:32:10 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)




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

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

2018-08-24 Thread nickm

commit 583ef6042cc57b65c93417afb45d678e9ea0f66e
Merge: d0dadf4d1 33e4e30d0
Author: Nick Mathewson 
Date:   Fri Aug 24 12:32:10 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)

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

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

2018-08-24 Thread nickm

commit 33e4e30d0a0aa8717ca67cb82581e536b402f30b
Merge: e01ea64f0 98e1a1d10
Author: Nick Mathewson 
Date:   Fri Aug 24 12:32:10 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)




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

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

2018-08-24 Thread nickm

commit 98e1a1d106f9abe07d184bd4b0568bd50f91bf93
Merge: 36bb11a65 14be9cba4
Author: Nick Mathewson 
Date:   Fri Aug 24 12:32:06 2018 -0400

Merge branch 'ticket27286_032_v2' into maint-0.3.2

 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)



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

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

2018-08-24 Thread nickm

commit 86409ec247f167aa6a3d123672f03a7dbfb3d011
Merge: eb7596672 658171318
Author: Nick Mathewson 
Date:   Fri Aug 24 12:35:26 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

 changes/27286| 4 
 src/or/dirauth/dirvote.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)

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

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

2018-08-24 Thread nickm

commit 98e1a1d106f9abe07d184bd4b0568bd50f91bf93
Merge: 36bb11a65 14be9cba4
Author: Nick Mathewson 
Date:   Fri Aug 24 12:32:06 2018 -0400

Merge branch 'ticket27286_032_v2' into maint-0.3.2

 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)



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

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

2018-08-24 Thread nickm

commit 33e4e30d0a0aa8717ca67cb82581e536b402f30b
Merge: e01ea64f0 98e1a1d10
Author: Nick Mathewson 
Date:   Fri Aug 24 12:32:10 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)




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

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

2018-08-24 Thread nickm

commit 66cad7e97347b7bae9564ef0d205bf1f87a76185
Merge: f68d4318e 98e1a1d10
Author: Nick Mathewson 
Date:   Fri Aug 24 12:32:10 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)

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

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

2018-08-24 Thread nickm

commit 658171318f67dd83ee115044cbf103325951a174
Merge: dd27e17cc 33e4e30d0
Author: Nick Mathewson 
Date:   Fri Aug 24 12:33:20 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/27286| 4 
 src/or/dirauth/dirvote.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --cc src/or/dirauth/dirvote.c
index 101826778,7023d4f95..bf05286b3
--- a/src/or/dirauth/dirvote.c
+++ b/src/or/dirauth/dirvote.c
@@@ -3899,692 -4039,49 +3899,692 @@@ dirvote_format_all_microdesc_vote_lines
return result;
  }
  
 -/** If vrs has a hash made for the consensus method method with
 - * the digest algorithm alg, decode it and copy it into
 - * digest256_out and return 0.  Otherwise return -1. */
 -int
 -vote_routerstatus_find_microdesc_hash(char *digest256_out,
 -  const vote_routerstatus_t *vrs,
 -  int method,
 -  digest_algorithm_t alg)
 +/** Parse and extract all SR commits from tokens and place them in
 + *  ns. */
 +static void
 +extract_shared_random_commits(networkstatus_t *ns, const smartlist_t *tokens)
  {
 -  /*  only returns the sha256 method. */
 -  const vote_microdesc_hash_t *h;
 -  char mstr[64];
 -  size_t mlen;
 -  char dstr[64];
 +  smartlist_t *chunks = NULL;
  
 -  tor_snprintf(mstr, sizeof(mstr), "%d", method);
 -  mlen = strlen(mstr);
 -  tor_snprintf(dstr, sizeof(dstr), " %s=",
 -   crypto_digest_algorithm_get_name(alg));
 +  tor_assert(ns);
 +  tor_assert(tokens);
 +  /* Commits are only present in a vote. */
 +  tor_assert(ns->type == NS_TYPE_VOTE);
  
 -  for (h = vrs->microdesc; h; h = h->next) {
 -const char *cp = h->microdesc_hash_line;
 -size_t num_len;
 -/* cp looks like \d+(,\d+)* (digesttype=val )+ .  Let's hunt for mstr in
 - * the first part. */
 -while (1) {
 -  num_len = strspn(cp, "1234567890");
 -  if (num_len == mlen && fast_memeq(mstr, cp, mlen)) {
 -/* This is the line. */
 -char buf[BASE64_DIGEST256_LEN+1];
 -/*  ignores extraneous stuff if the digest is too long.  This
 - * seems harmless enough, right? */
 -cp = strstr(cp, dstr);
 -if (!cp)
 -  return -1;
 -cp += strlen(dstr);
 -strlcpy(buf, cp, sizeof(buf));
 -return digest256_from_base64(digest256_out, buf);
 +  ns->sr_info.commits = smartlist_new();
 +
 +  smartlist_t *commits = find_all_by_keyword(tokens, K_COMMIT);
 +  /* It's normal that a vote might contain no commits even if it participates
 +   * in the SR protocol. Don't treat it as an error. */
 +  if (commits == NULL) {
 +goto end;
 +  }
 +
 +  /* Parse the commit. We do NO validation of number of arguments or ordering
 +   * for forward compatibility, it's the parse commit job to inform us if it's
 +   * supported or not. */
 +  chunks = smartlist_new();
 +  SMARTLIST_FOREACH_BEGIN(commits, directory_token_t *, tok) {
 +/* Extract all arguments and put them in the chunks list. */
 +for (int i = 0; i < tok->n_args; i++) {
 +  smartlist_add(chunks, tok->args[i]);
 +}
 +sr_commit_t *commit = sr_parse_commit(chunks);
 +smartlist_clear(chunks);
 +if (commit == NULL) {
 +  /* Get voter identity so we can warn that this dirauth vote contains
 +   * commit we can't parse. */
 +  networkstatus_voter_info_t *voter = smartlist_get(ns->voters, 0);
 +  tor_assert(voter);
 +  log_warn(LD_DIR, "SR: Unable to parse commit %s from vote of voter %s.",
 +   escaped(tok->object_body),
 +   hex_str(voter->identity_digest,
 +   sizeof(voter->identity_digest)));
 +  /* Commitment couldn't be parsed. Continue onto the next commit because
 +   * this one could be unsupported for instance. */
 +  continue;
 +}
 +/* Add newly created commit object to the vote. */
 +smartlist_add(ns->sr_info.commits, commit);
 +  } SMARTLIST_FOREACH_END(tok);
 +
 + end:
 +  smartlist_free(chunks);
 +  smartlist_free(commits);
 +}
 +
 +/* Using the given directory tokens in tokens, parse the shared random commits
 + * and put them in the given vote document ns.
 + *
 + * This also sets the SR participation flag if present in the vote. */
 +void
 +dirvote_parse_sr_commits(networkstatus_t *ns, const smartlist_t *tokens)
 +{
 +  /* Does this authority participates in the SR protocol? */
 +  directory_token_t *tok = find_opt_by_keyword(tokens, K_SR_FLAG);
 +  if (tok) {
 +ns->sr_info.participate = 1;
 +/* Get the SR commitments and reveals from the vote. */
 +extract_shared_random_commits(ns, tokens);
 +  }
 +}
 +
 +/* For the given vote, free the shared random commits if any. */
 +void
 +dirvote_clear_commits(networkstatus_t *ns)
 +{
 +  tor_assert(ns->type == NS_TYPE_VOTE);
 +
 +  if (ns->sr_info.commits) {
 +SMARTLIST_FOREACH(ns->sr_info.commits, sr_commit_t *, c,
 +  sr_commit_free(

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

2018-08-24 Thread nickm

commit 98e1a1d106f9abe07d184bd4b0568bd50f91bf93
Merge: 36bb11a65 14be9cba4
Author: Nick Mathewson 
Date:   Fri Aug 24 12:32:06 2018 -0400

Merge branch 'ticket27286_032_v2' into maint-0.3.2

 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)



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

[tor-commits] [tor/release-0.3.4] Update the protocol versions recommendations to remove LinkAuth=1

2018-08-24 Thread nickm

commit 14be9cba4ee1c3ec96638f4870112848efad2503
Author: Nick Mathewson 
Date:   Thu Aug 23 11:24:39 2018 -0400

Update the protocol versions recommendations to remove LinkAuth=1

LinkAuth method 1 is the one where we pull the TLS master secrets
out of the OpenSSL data structures and authenticate them with
RSA. Right now we list method 1 as required for clients and relays.
That's a problem, since we can't reasonably support it with NSS. So
let's remove it as a requirement and a recommendation.

As for method 3: I'd like to recommend it it, but that would make
0.2.9 start warning.  Let's not do that till at least some time
after 0.3.5 (the next LTS) is stable.

Closes ticket 27286
---
 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/changes/27286 b/changes/27286
new file mode 100644
index 0..5f5f7a4ae
--- /dev/null
+++ b/changes/27286
@@ -0,0 +1,4 @@
+  o Minor features (directory authorities):
+- Authorities no longer vote to make the subprotocol version "LinkAuth=1"
+  a requirement: it is unsupportable with NSS, and hasn't been needed
+  since Tor 0.3.0.1-alpha. Closes ticket 27286.
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 08557a6a1..a1ccf03e9 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -3082,16 +3082,16 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t 
*private_key,
   /* These are hardwired, to avoid disaster. */
   v3_out->recommended_relay_protocols =
 tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2");
+   "Link=4 Microdesc=1-2 Relay=2");
   v3_out->recommended_client_protocols =
 tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2");
+   "Link=4 Microdesc=1-2 Relay=2");
   v3_out->required_client_protocols =
 tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2");
+   "Link=4 Microdesc=1-2 Relay=2");
   v3_out->required_relay_protocols =
 tor_strdup("Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=3-4 LinkAuth=1 Microdesc=1 Relay=1-2");
+   "Link=3-4 Microdesc=1 Relay=1-2");
 
   /* We are not allowed to vote to require anything we don't have. */
   tor_assert(protover_all_supported(v3_out->required_relay_protocols, NULL));



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

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

2018-08-24 Thread nickm

commit 658171318f67dd83ee115044cbf103325951a174
Merge: dd27e17cc 33e4e30d0
Author: Nick Mathewson 
Date:   Fri Aug 24 12:33:20 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/27286| 4 
 src/or/dirauth/dirvote.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --cc src/or/dirauth/dirvote.c
index 101826778,7023d4f95..bf05286b3
--- a/src/or/dirauth/dirvote.c
+++ b/src/or/dirauth/dirvote.c
@@@ -3899,692 -4039,49 +3899,692 @@@ dirvote_format_all_microdesc_vote_lines
return result;
  }
  
 -/** If vrs has a hash made for the consensus method method with
 - * the digest algorithm alg, decode it and copy it into
 - * digest256_out and return 0.  Otherwise return -1. */
 -int
 -vote_routerstatus_find_microdesc_hash(char *digest256_out,
 -  const vote_routerstatus_t *vrs,
 -  int method,
 -  digest_algorithm_t alg)
 +/** Parse and extract all SR commits from tokens and place them in
 + *  ns. */
 +static void
 +extract_shared_random_commits(networkstatus_t *ns, const smartlist_t *tokens)
  {
 -  /*  only returns the sha256 method. */
 -  const vote_microdesc_hash_t *h;
 -  char mstr[64];
 -  size_t mlen;
 -  char dstr[64];
 +  smartlist_t *chunks = NULL;
  
 -  tor_snprintf(mstr, sizeof(mstr), "%d", method);
 -  mlen = strlen(mstr);
 -  tor_snprintf(dstr, sizeof(dstr), " %s=",
 -   crypto_digest_algorithm_get_name(alg));
 +  tor_assert(ns);
 +  tor_assert(tokens);
 +  /* Commits are only present in a vote. */
 +  tor_assert(ns->type == NS_TYPE_VOTE);
  
 -  for (h = vrs->microdesc; h; h = h->next) {
 -const char *cp = h->microdesc_hash_line;
 -size_t num_len;
 -/* cp looks like \d+(,\d+)* (digesttype=val )+ .  Let's hunt for mstr in
 - * the first part. */
 -while (1) {
 -  num_len = strspn(cp, "1234567890");
 -  if (num_len == mlen && fast_memeq(mstr, cp, mlen)) {
 -/* This is the line. */
 -char buf[BASE64_DIGEST256_LEN+1];
 -/*  ignores extraneous stuff if the digest is too long.  This
 - * seems harmless enough, right? */
 -cp = strstr(cp, dstr);
 -if (!cp)
 -  return -1;
 -cp += strlen(dstr);
 -strlcpy(buf, cp, sizeof(buf));
 -return digest256_from_base64(digest256_out, buf);
 +  ns->sr_info.commits = smartlist_new();
 +
 +  smartlist_t *commits = find_all_by_keyword(tokens, K_COMMIT);
 +  /* It's normal that a vote might contain no commits even if it participates
 +   * in the SR protocol. Don't treat it as an error. */
 +  if (commits == NULL) {
 +goto end;
 +  }
 +
 +  /* Parse the commit. We do NO validation of number of arguments or ordering
 +   * for forward compatibility, it's the parse commit job to inform us if it's
 +   * supported or not. */
 +  chunks = smartlist_new();
 +  SMARTLIST_FOREACH_BEGIN(commits, directory_token_t *, tok) {
 +/* Extract all arguments and put them in the chunks list. */
 +for (int i = 0; i < tok->n_args; i++) {
 +  smartlist_add(chunks, tok->args[i]);
 +}
 +sr_commit_t *commit = sr_parse_commit(chunks);
 +smartlist_clear(chunks);
 +if (commit == NULL) {
 +  /* Get voter identity so we can warn that this dirauth vote contains
 +   * commit we can't parse. */
 +  networkstatus_voter_info_t *voter = smartlist_get(ns->voters, 0);
 +  tor_assert(voter);
 +  log_warn(LD_DIR, "SR: Unable to parse commit %s from vote of voter %s.",
 +   escaped(tok->object_body),
 +   hex_str(voter->identity_digest,
 +   sizeof(voter->identity_digest)));
 +  /* Commitment couldn't be parsed. Continue onto the next commit because
 +   * this one could be unsupported for instance. */
 +  continue;
 +}
 +/* Add newly created commit object to the vote. */
 +smartlist_add(ns->sr_info.commits, commit);
 +  } SMARTLIST_FOREACH_END(tok);
 +
 + end:
 +  smartlist_free(chunks);
 +  smartlist_free(commits);
 +}
 +
 +/* Using the given directory tokens in tokens, parse the shared random commits
 + * and put them in the given vote document ns.
 + *
 + * This also sets the SR participation flag if present in the vote. */
 +void
 +dirvote_parse_sr_commits(networkstatus_t *ns, const smartlist_t *tokens)
 +{
 +  /* Does this authority participates in the SR protocol? */
 +  directory_token_t *tok = find_opt_by_keyword(tokens, K_SR_FLAG);
 +  if (tok) {
 +ns->sr_info.participate = 1;
 +/* Get the SR commitments and reveals from the vote. */
 +extract_shared_random_commits(ns, tokens);
 +  }
 +}
 +
 +/* For the given vote, free the shared random commits if any. */
 +void
 +dirvote_clear_commits(networkstatus_t *ns)
 +{
 +  tor_assert(ns->type == NS_TYPE_VOTE);
 +
 +  if (ns->sr_info.commits) {
 +SMARTLIST_FOREACH(ns->sr_info.commits, sr_commit_t *, c,
 +  sr_commit_free(

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

2018-08-24 Thread nickm

commit 98e1a1d106f9abe07d184bd4b0568bd50f91bf93
Merge: 36bb11a65 14be9cba4
Author: Nick Mathewson 
Date:   Fri Aug 24 12:32:06 2018 -0400

Merge branch 'ticket27286_032_v2' into maint-0.3.2

 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)



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

[tor-commits] [tor/release-0.3.3] Update the protocol versions recommendations to remove LinkAuth=1

2018-08-24 Thread nickm

commit 14be9cba4ee1c3ec96638f4870112848efad2503
Author: Nick Mathewson 
Date:   Thu Aug 23 11:24:39 2018 -0400

Update the protocol versions recommendations to remove LinkAuth=1

LinkAuth method 1 is the one where we pull the TLS master secrets
out of the OpenSSL data structures and authenticate them with
RSA. Right now we list method 1 as required for clients and relays.
That's a problem, since we can't reasonably support it with NSS. So
let's remove it as a requirement and a recommendation.

As for method 3: I'd like to recommend it it, but that would make
0.2.9 start warning.  Let's not do that till at least some time
after 0.3.5 (the next LTS) is stable.

Closes ticket 27286
---
 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/changes/27286 b/changes/27286
new file mode 100644
index 0..5f5f7a4ae
--- /dev/null
+++ b/changes/27286
@@ -0,0 +1,4 @@
+  o Minor features (directory authorities):
+- Authorities no longer vote to make the subprotocol version "LinkAuth=1"
+  a requirement: it is unsupportable with NSS, and hasn't been needed
+  since Tor 0.3.0.1-alpha. Closes ticket 27286.
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 08557a6a1..a1ccf03e9 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -3082,16 +3082,16 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t 
*private_key,
   /* These are hardwired, to avoid disaster. */
   v3_out->recommended_relay_protocols =
 tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2");
+   "Link=4 Microdesc=1-2 Relay=2");
   v3_out->recommended_client_protocols =
 tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2");
+   "Link=4 Microdesc=1-2 Relay=2");
   v3_out->required_client_protocols =
 tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2");
+   "Link=4 Microdesc=1-2 Relay=2");
   v3_out->required_relay_protocols =
 tor_strdup("Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=3-4 LinkAuth=1 Microdesc=1 Relay=1-2");
+   "Link=3-4 Microdesc=1 Relay=1-2");
 
   /* We are not allowed to vote to require anything we don't have. */
   tor_assert(protover_all_supported(v3_out->required_relay_protocols, NULL));



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

[tor-commits] [tor/maint-0.3.4] Update the protocol versions recommendations to remove LinkAuth=1

2018-08-24 Thread nickm

commit 14be9cba4ee1c3ec96638f4870112848efad2503
Author: Nick Mathewson 
Date:   Thu Aug 23 11:24:39 2018 -0400

Update the protocol versions recommendations to remove LinkAuth=1

LinkAuth method 1 is the one where we pull the TLS master secrets
out of the OpenSSL data structures and authenticate them with
RSA. Right now we list method 1 as required for clients and relays.
That's a problem, since we can't reasonably support it with NSS. So
let's remove it as a requirement and a recommendation.

As for method 3: I'd like to recommend it it, but that would make
0.2.9 start warning.  Let's not do that till at least some time
after 0.3.5 (the next LTS) is stable.

Closes ticket 27286
---
 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/changes/27286 b/changes/27286
new file mode 100644
index 0..5f5f7a4ae
--- /dev/null
+++ b/changes/27286
@@ -0,0 +1,4 @@
+  o Minor features (directory authorities):
+- Authorities no longer vote to make the subprotocol version "LinkAuth=1"
+  a requirement: it is unsupportable with NSS, and hasn't been needed
+  since Tor 0.3.0.1-alpha. Closes ticket 27286.
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 08557a6a1..a1ccf03e9 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -3082,16 +3082,16 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t 
*private_key,
   /* These are hardwired, to avoid disaster. */
   v3_out->recommended_relay_protocols =
 tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2");
+   "Link=4 Microdesc=1-2 Relay=2");
   v3_out->recommended_client_protocols =
 tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2");
+   "Link=4 Microdesc=1-2 Relay=2");
   v3_out->required_client_protocols =
 tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2");
+   "Link=4 Microdesc=1-2 Relay=2");
   v3_out->required_relay_protocols =
 tor_strdup("Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=3-4 LinkAuth=1 Microdesc=1 Relay=1-2");
+   "Link=3-4 Microdesc=1 Relay=1-2");
 
   /* We are not allowed to vote to require anything we don't have. */
   tor_assert(protover_all_supported(v3_out->required_relay_protocols, NULL));



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

[tor-commits] [tor/release-0.3.2] Update the protocol versions recommendations to remove LinkAuth=1

2018-08-24 Thread nickm

commit 14be9cba4ee1c3ec96638f4870112848efad2503
Author: Nick Mathewson 
Date:   Thu Aug 23 11:24:39 2018 -0400

Update the protocol versions recommendations to remove LinkAuth=1

LinkAuth method 1 is the one where we pull the TLS master secrets
out of the OpenSSL data structures and authenticate them with
RSA. Right now we list method 1 as required for clients and relays.
That's a problem, since we can't reasonably support it with NSS. So
let's remove it as a requirement and a recommendation.

As for method 3: I'd like to recommend it it, but that would make
0.2.9 start warning.  Let's not do that till at least some time
after 0.3.5 (the next LTS) is stable.

Closes ticket 27286
---
 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/changes/27286 b/changes/27286
new file mode 100644
index 0..5f5f7a4ae
--- /dev/null
+++ b/changes/27286
@@ -0,0 +1,4 @@
+  o Minor features (directory authorities):
+- Authorities no longer vote to make the subprotocol version "LinkAuth=1"
+  a requirement: it is unsupportable with NSS, and hasn't been needed
+  since Tor 0.3.0.1-alpha. Closes ticket 27286.
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 08557a6a1..a1ccf03e9 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -3082,16 +3082,16 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t 
*private_key,
   /* These are hardwired, to avoid disaster. */
   v3_out->recommended_relay_protocols =
 tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2");
+   "Link=4 Microdesc=1-2 Relay=2");
   v3_out->recommended_client_protocols =
 tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2");
+   "Link=4 Microdesc=1-2 Relay=2");
   v3_out->required_client_protocols =
 tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2");
+   "Link=4 Microdesc=1-2 Relay=2");
   v3_out->required_relay_protocols =
 tor_strdup("Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=3-4 LinkAuth=1 Microdesc=1 Relay=1-2");
+   "Link=3-4 Microdesc=1 Relay=1-2");
 
   /* We are not allowed to vote to require anything we don't have. */
   tor_assert(protover_all_supported(v3_out->required_relay_protocols, NULL));



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

[tor-commits] [tor/master] Update the protocol versions recommendations to remove LinkAuth=1

2018-08-24 Thread nickm

commit 14be9cba4ee1c3ec96638f4870112848efad2503
Author: Nick Mathewson 
Date:   Thu Aug 23 11:24:39 2018 -0400

Update the protocol versions recommendations to remove LinkAuth=1

LinkAuth method 1 is the one where we pull the TLS master secrets
out of the OpenSSL data structures and authenticate them with
RSA. Right now we list method 1 as required for clients and relays.
That's a problem, since we can't reasonably support it with NSS. So
let's remove it as a requirement and a recommendation.

As for method 3: I'd like to recommend it it, but that would make
0.2.9 start warning.  Let's not do that till at least some time
after 0.3.5 (the next LTS) is stable.

Closes ticket 27286
---
 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/changes/27286 b/changes/27286
new file mode 100644
index 0..5f5f7a4ae
--- /dev/null
+++ b/changes/27286
@@ -0,0 +1,4 @@
+  o Minor features (directory authorities):
+- Authorities no longer vote to make the subprotocol version "LinkAuth=1"
+  a requirement: it is unsupportable with NSS, and hasn't been needed
+  since Tor 0.3.0.1-alpha. Closes ticket 27286.
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 08557a6a1..a1ccf03e9 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -3082,16 +3082,16 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t 
*private_key,
   /* These are hardwired, to avoid disaster. */
   v3_out->recommended_relay_protocols =
 tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2");
+   "Link=4 Microdesc=1-2 Relay=2");
   v3_out->recommended_client_protocols =
 tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2");
+   "Link=4 Microdesc=1-2 Relay=2");
   v3_out->required_client_protocols =
 tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2");
+   "Link=4 Microdesc=1-2 Relay=2");
   v3_out->required_relay_protocols =
 tor_strdup("Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=3-4 LinkAuth=1 Microdesc=1 Relay=1-2");
+   "Link=3-4 Microdesc=1 Relay=1-2");
 
   /* We are not allowed to vote to require anything we don't have. */
   tor_assert(protover_all_supported(v3_out->required_relay_protocols, NULL));



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

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

2018-08-24 Thread nickm

commit 98e1a1d106f9abe07d184bd4b0568bd50f91bf93
Merge: 36bb11a65 14be9cba4
Author: Nick Mathewson 
Date:   Fri Aug 24 12:32:06 2018 -0400

Merge branch 'ticket27286_032_v2' into maint-0.3.2

 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)



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

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

2018-08-24 Thread nickm

commit 33e4e30d0a0aa8717ca67cb82581e536b402f30b
Merge: e01ea64f0 98e1a1d10
Author: Nick Mathewson 
Date:   Fri Aug 24 12:32:10 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)




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

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

2018-08-24 Thread nickm

commit 98e1a1d106f9abe07d184bd4b0568bd50f91bf93
Merge: 36bb11a65 14be9cba4
Author: Nick Mathewson 
Date:   Fri Aug 24 12:32:06 2018 -0400

Merge branch 'ticket27286_032_v2' into maint-0.3.2

 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)

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

[tor-commits] [tor/maint-0.3.2] Update the protocol versions recommendations to remove LinkAuth=1

2018-08-24 Thread nickm

commit 14be9cba4ee1c3ec96638f4870112848efad2503
Author: Nick Mathewson 
Date:   Thu Aug 23 11:24:39 2018 -0400

Update the protocol versions recommendations to remove LinkAuth=1

LinkAuth method 1 is the one where we pull the TLS master secrets
out of the OpenSSL data structures and authenticate them with
RSA. Right now we list method 1 as required for clients and relays.
That's a problem, since we can't reasonably support it with NSS. So
let's remove it as a requirement and a recommendation.

As for method 3: I'd like to recommend it it, but that would make
0.2.9 start warning.  Let's not do that till at least some time
after 0.3.5 (the next LTS) is stable.

Closes ticket 27286
---
 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/changes/27286 b/changes/27286
new file mode 100644
index 0..5f5f7a4ae
--- /dev/null
+++ b/changes/27286
@@ -0,0 +1,4 @@
+  o Minor features (directory authorities):
+- Authorities no longer vote to make the subprotocol version "LinkAuth=1"
+  a requirement: it is unsupportable with NSS, and hasn't been needed
+  since Tor 0.3.0.1-alpha. Closes ticket 27286.
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 08557a6a1..a1ccf03e9 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -3082,16 +3082,16 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t 
*private_key,
   /* These are hardwired, to avoid disaster. */
   v3_out->recommended_relay_protocols =
 tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2");
+   "Link=4 Microdesc=1-2 Relay=2");
   v3_out->recommended_client_protocols =
 tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2");
+   "Link=4 Microdesc=1-2 Relay=2");
   v3_out->required_client_protocols =
 tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2");
+   "Link=4 Microdesc=1-2 Relay=2");
   v3_out->required_relay_protocols =
 tor_strdup("Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=3-4 LinkAuth=1 Microdesc=1 Relay=1-2");
+   "Link=3-4 Microdesc=1 Relay=1-2");
 
   /* We are not allowed to vote to require anything we don't have. */
   tor_assert(protover_all_supported(v3_out->required_relay_protocols, NULL));



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

[tor-commits] [tor/maint-0.3.3] Update the protocol versions recommendations to remove LinkAuth=1

2018-08-24 Thread nickm

commit 14be9cba4ee1c3ec96638f4870112848efad2503
Author: Nick Mathewson 
Date:   Thu Aug 23 11:24:39 2018 -0400

Update the protocol versions recommendations to remove LinkAuth=1

LinkAuth method 1 is the one where we pull the TLS master secrets
out of the OpenSSL data structures and authenticate them with
RSA. Right now we list method 1 as required for clients and relays.
That's a problem, since we can't reasonably support it with NSS. So
let's remove it as a requirement and a recommendation.

As for method 3: I'd like to recommend it it, but that would make
0.2.9 start warning.  Let's not do that till at least some time
after 0.3.5 (the next LTS) is stable.

Closes ticket 27286
---
 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/changes/27286 b/changes/27286
new file mode 100644
index 0..5f5f7a4ae
--- /dev/null
+++ b/changes/27286
@@ -0,0 +1,4 @@
+  o Minor features (directory authorities):
+- Authorities no longer vote to make the subprotocol version "LinkAuth=1"
+  a requirement: it is unsupportable with NSS, and hasn't been needed
+  since Tor 0.3.0.1-alpha. Closes ticket 27286.
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 08557a6a1..a1ccf03e9 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -3082,16 +3082,16 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t 
*private_key,
   /* These are hardwired, to avoid disaster. */
   v3_out->recommended_relay_protocols =
 tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2");
+   "Link=4 Microdesc=1-2 Relay=2");
   v3_out->recommended_client_protocols =
 tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2");
+   "Link=4 Microdesc=1-2 Relay=2");
   v3_out->required_client_protocols =
 tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=4 LinkAuth=1 Microdesc=1-2 Relay=2");
+   "Link=4 Microdesc=1-2 Relay=2");
   v3_out->required_relay_protocols =
 tor_strdup("Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 "
-   "Link=3-4 LinkAuth=1 Microdesc=1 Relay=1-2");
+   "Link=3-4 Microdesc=1 Relay=1-2");
 
   /* We are not allowed to vote to require anything we don't have. */
   tor_assert(protover_all_supported(v3_out->required_relay_protocols, NULL));



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

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

2018-08-24 Thread nickm

commit 98e1a1d106f9abe07d184bd4b0568bd50f91bf93
Merge: 36bb11a65 14be9cba4
Author: Nick Mathewson 
Date:   Fri Aug 24 12:32:06 2018 -0400

Merge branch 'ticket27286_032_v2' into maint-0.3.2

 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)



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

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

2018-08-24 Thread nickm

commit 33e4e30d0a0aa8717ca67cb82581e536b402f30b
Merge: e01ea64f0 98e1a1d10
Author: Nick Mathewson 
Date:   Fri Aug 24 12:32:10 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/27286| 4 
 src/or/dirserv.c | 8 
 2 files changed, 8 insertions(+), 4 deletions(-)

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

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

2018-08-24 Thread translation

commit 9a358b0ac1cba574d47e7104ce379f89b424248b
Author: Translation commit bot 
Date:   Fri Aug 24 16:19:00 2018 +

Update translations for support-portal
---
 contents+pt_BR.po | 34 +-
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/contents+pt_BR.po b/contents+pt_BR.po
index 4f495e185..99362e784 100644
--- a/contents+pt_BR.po
+++ b/contents+pt_BR.po
@@ -2343,6 +2343,8 @@ msgid ""
 "We are currently working on Tor Browser for Android, and you may see alpha "
 "releases appear over the coming months."
 msgstr ""
+"Atualmente estamos trabalhando em um navegador Tor para Android e vocÃª "
+"poderÃ¡ ver lanÃ§amentos de versÃµes alfa nos prÃ³ximos meses."
 
 #: http//localhost/tormobile/tormobile-5/
 #: (content/tormobile/tormobile-5/contents+en.lrquestion.description)
@@ -2351,6 +2353,9 @@ msgid ""
 "href=\"https://blog.torproject.org\";>blog for future "
 "announcements and details regarding this project."
 msgstr ""
+"Por favor acompanhe nosso https://blog.torproject.org\";>blog para anÃºncios futuros e"
+" detalhes relacionados a este projeto."
 
 #: http//localhost/tormobile/tormobile-5/
 #: (content/tormobile/tormobile-5/contents+en.lrquestion.seo_slug)
@@ -2373,6 +2378,9 @@ msgid ""
 "href=\"https://www.torproject.org\";>website, you can get a copy "
 "of Tor delivered to you via GetTor."
 msgstr ""
+"Se vocÃª nÃ£o consegue baixar o Tor atravÃ©s do nosso https://www.torproject.org\";>site, vocÃª pode obter uma "
+"cÃ³pia do Tor atravÃ©s do seu GetTor."
 
 #: http//localhost/gettor/gettor-1/
 #: (content/gettor/gettor-1/contents+en.lrquestion.description)
@@ -2727,7 +2735,7 @@ msgstr ""
 #: http//localhost/censorship/censorship-5/
 #: (content/censorship/censorship-5/contents+en.lrquestion.description)
 msgid "13-11-17 19:53:49.300 [WARN] 10 connections have failed:"
-msgstr ""
+msgstr "13-11-17 19:53:49.300 [WARN] 10 conexÃµes falharam:"
 
 #: http//localhost/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)
@@ -2798,6 +2806,8 @@ msgid ""
 "If you see lines like this in your Tor log, it means your system clock is "
 "incorrect."
 msgstr ""
+"Se vocÃª ver linhas como essas em seu log Tor, isto significa que o horÃ¡rio "
+"do seu sistema estÃ¡ incorreto."
 
 #: http//localhost/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)
@@ -2815,7 +2825,7 @@ msgstr ""
 #: http//localhost/censorship/censorship-5/
 #: (content/censorship/censorship-5/contents+en.lrquestion.seo_slug)
 msgid "having-trouble-connecting-to-tor"
-msgstr ""
+msgstr "tendo-problemas-conectando-ao-tor"
 
 #: http//localhost/connecting/connecting-3/
 #: (content/connecting/connecting-3/contents+en.lrquestion.title)
@@ -2833,6 +2843,9 @@ msgid ""
 "entered the 16-character onion address correctly: even a small mistake will "
 "stop Tor Browser from being able to reach the site."
 msgstr ""
+"Se vocÃª nÃ£o consegue acessar o serviÃ§o onion desejado, certifique-se que "
+"vocÃª digitou o endereÃ§o onion de 16 caracteres corretamente: atÃ© um 
pequeno "
+"erro farÃ¡ com que o navegador TOR seja incapaz de acessar o site."
 
 #: http//localhost/connecting/connecting-3/
 #: (content/connecting/connecting-3/contents+en.lrquestion.description)
@@ -2861,6 +2874,9 @@ msgid ""
 "connecting to http://3g2upl4pq6kufc4m.onion\";>DuckDuckGo's "
 "Onion Service."
 msgstr ""
+"VocÃª tambÃ©m podem se certificar de que estÃ¡ apto a acessar outros 
serviÃ§os "
+"onion conectando-se ao serviÃ§o onion http://3g2upl4pq6kufc4m.onion\";>DuckDuckGO."
 
 #: http//localhost/connecting/connecting-3/
 #: (content/connecting/connecting-3/contents+en.lrquestion.seo_slug)
@@ -2885,17 +2901,17 @@ msgstr ""
 #: http//localhost/censorship/censorship-2/
 #: (content/censorship/censorship-2/contents+en.lrquestion.seo_slug)
 msgid "website-is-blocking-access-over-tor"
-msgstr ""
+msgstr "webiste-estÃ¡-bloqueando-acesso-atravÃ©s-do-tor"
 
 #: http//localhost/censorship/censorship-3/
 #: (content/censorship/censorship-3/contents+en.lrquestion.seo_slug)
 msgid "how-do-i-download-tor-if-torproject-org-is-blocked"
-msgstr ""
+msgstr "como-eu-baixo-o-tor-se-torproject-org-estÃ¡-bloqueado"
 
 #: http//localhost/censorship/censorship-4/
 #: (content/censorship/censorship-4/contents+en.lrquestion.seo_slug)
 msgid "cant-connect-to-tor-browser"
-msgstr ""
+msgstr "nÃ£o-pode-conectar-se-ao-navegador-tor"
 
 #: http//localhost/censorship/censorship-6/
 #: (content/censorship/censorship-6/contents+en.lrquestion.seo_slug)
@@ -2947,6 +2963,8 @@ msgid ""
 "Several countries, including China and Iran, have found ways to detect and "
 "block connections to Tor bridges."
 msgstr ""
+"VÃ¡rios paÃses, incluindo China e IrÃ£, encontraram meios de detectar e "
+"bloquear conexÃµes para pontes Tor."
 
 #: http//localhost/censorship/censorship-7/
 #: (content/censorship/censorship-7/contents+en.lrquestion.description)
@@ -2969,6 +2987,9 @@ msgid ""
 "See our

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

2018-08-24 Thread translation

commit b942fd21d91d1f7d8971ad2b914983fbb174a97a
Author: Translation commit bot 
Date:   Fri Aug 24 16:15:53 2018 +

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

diff --git a/pt_BR.po b/pt_BR.po
index aeb99a3bc..54e7fb954 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -26,7 +26,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-16 07:57+0200\n"
-"PO-Revision-Date: 2018-08-23 14:38+\n"
+"PO-Revision-Date: 2018-08-24 15:53+\n"
 "Last-Translator: Reurison Silva Rodrigues\n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgstr ""
 
 #: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:151
 msgid "_Create persistent storage"
-msgstr ""
+msgstr "_Crie armazenamento persistente"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:57
 msgid "Persistence is disabled for Electrum"
@@ -216,7 +216,7 @@ msgstr ""
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:319
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:354
 msgid "The configuration of your additional software failed."
-msgstr ""
+msgstr "A configuraÃ§Ã£o do seu software adicional falhou."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:310
 msgid ""
@@ -281,7 +281,7 @@ msgstr "Software adicional instalado com sucesso"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:563
 msgid "The check for upgrades of your additional software failed"
-msgstr ""
+msgstr "A verificaÃ§Ã£o de atualizaÃ§Ãµes do seu software adicional falhou"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:565
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:573
@@ -308,7 +308,7 @@ msgstr ""
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:104
 #, python-brace-format
 msgid "Failed to remove {pkg}"
-msgstr ""
+msgstr "NÃ£o foi possÃvel remover {pkg}"
 
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:121
 msgid "Failed to read additional software configuration"
@@ -603,7 +603,7 @@ msgstr ""
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:137
 msgid "Error opening file"
-msgstr ""
+msgstr "Error na abertura de arquivo"
 
 #: 
config/chroot_local-includes/usr/local/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:159
 msgid "Not a VeraCrypt container"

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

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

2018-08-24 Thread nickm

commit eb75966720a15b89b0f6a814c4e1d8446479db08
Merge: 8a4b41f24 dd27e17cc
Author: Nick Mathewson 
Date:   Fri Aug 24 12:05:39 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

 src/or/nodelist.c | 52 
 1 file changed, 36 insertions(+), 16 deletions(-)

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

[tor-commits] [tor/release-0.3.4] Bootstrap: add some extra logging

2018-08-24 Thread nickm

commit dd27e17139d55433b313ffee1030cb0cba9f
Author: teor 
Date:   Sat Aug 25 01:11:44 2018 +1000

Bootstrap: add some extra logging

Diagnostics for 27236.
---
 src/or/nodelist.c | 42 +++---
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 392931d57..7540da7eb 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -2216,9 +2216,20 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
   count_usable_descriptors(num_present_out, num_usable_out,
mid, consensus, now, NULL,
USABLE_DESCRIPTOR_ALL);
+  log_debug(LD_NET,
+"%s: %d present, %d usable",
+"mid",
+np,
+nu);
+
   if (options->EntryNodes) {
 count_usable_descriptors(&np, &nu, guards, consensus, now,
  options->EntryNodes, USABLE_DESCRIPTOR_ALL);
+log_debug(LD_NET,
+  "%s: %d present, %d usable",
+  "guard",
+  np,
+  nu);
   } else {
 SMARTLIST_FOREACH(mid, const node_t *, node, {
   if (authdir) {
@@ -2229,6 +2240,10 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
   smartlist_add(guards, (node_t*)node);
   }
 });
+log_debug(LD_NET,
+  "%s: %d possible",
+  "guard",
+  smartlist_len(guards));
   }
 
   /* All nodes with exit policy and flag */
@@ -2248,17 +2263,22 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
  CONSENSUS_PATH_EXIT :
  CONSENSUS_PATH_INTERNAL);
 
-  if (have_consensus_path == CONSENSUS_PATH_INTERNAL
-  && old_have_consensus_path != have_consensus_path) {
-log_notice(LD_NET,
-   "The current consensus has no exit nodes. "
-   "Tor can only build internal paths, "
-   "such as paths to hidden services.");
-
-/* However, exit nodes can reachability self-test using this consensus,
- * join the network, and appear in a later consensus. This will allow
- * the network to build exit paths, such as paths for world wide web
- * browsing (as distinct from hidden service web browsing). */
+  if (old_have_consensus_path != have_consensus_path) {
+if (have_consensus_path == CONSENSUS_PATH_INTERNAL) {
+  log_notice(LD_NET,
+ "The current consensus has no exit nodes. "
+ "Tor can only build internal paths, "
+ "such as paths to onion services.");
+
+  /* However, exit nodes can reachability self-test using this consensus,
+   * join the network, and appear in a later consensus. This will allow
+   * the network to build exit paths, such as paths for world wide web
+   * browsing (as distinct from hidden service web browsing). */
+} else if (old_have_consensus_path == CONSENSUS_PATH_INTERNAL) {
+  log_notice(LD_NET,
+ "The current consensus contains exit nodes. "
+ "Tor can build exit and internal paths.");
+}
   }
 
   f_guard = frac_nodes_with_descriptors(guards, WEIGHT_FOR_GUARD);



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

[tor-commits] [tor/release-0.3.4] Bootstrap: allow internal-only onion service networks to bootstrap

2018-08-24 Thread nickm

commit 3ebbc1c84d2daf2853a496d0c997ea7ee883d5e8
Author: teor 
Date:   Sat Aug 25 01:08:53 2018 +1000

Bootstrap: allow internal-only onion service networks to bootstrap

This fix requires chutney's 27230 fix to bridge client bootstrap.

Part of 27236.
---
 src/or/nodelist.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 07632861d..392931d57 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -2240,11 +2240,11 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
 np,
 nu);
 
-  /* We need at least 1 exit usable in the consensus to consider
+  /* We need at least 1 exit (flag and policy) in the consensus to consider
* building exit paths */
   /* Update our understanding of whether the consensus has exits */
   consensus_path_type_t old_have_consensus_path = have_consensus_path;
-  have_consensus_path = ((nu > 0) ?
+  have_consensus_path = ((np > 0) ?
  CONSENSUS_PATH_EXIT :
  CONSENSUS_PATH_INTERNAL);
 
@@ -2342,14 +2342,14 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
 tor_asprintf(status_out,
  "%d%% of guards bw, "
  "%d%% of midpoint bw, and "
- "%d%% of exit bw%s = "
+ "%d%% of %s = "
  "%d%% of path bw",
  (int)(f_guard*100),
  (int)(f_mid*100),
  (int)(f_exit*100),
  (router_have_consensus_path() == CONSENSUS_PATH_EXIT ?
-  "" :
-  " (no exits in consensus)"),
+  "exit bw" :
+  "end bw (no exits in consensus)"),
  (int)(f_path*100));
 
   return f_path;



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

[tor-commits] [tor/maint-0.3.4] Bootstrap: allow internal-only onion service networks to bootstrap

2018-08-24 Thread nickm

commit 3ebbc1c84d2daf2853a496d0c997ea7ee883d5e8
Author: teor 
Date:   Sat Aug 25 01:08:53 2018 +1000

Bootstrap: allow internal-only onion service networks to bootstrap

This fix requires chutney's 27230 fix to bridge client bootstrap.

Part of 27236.
---
 src/or/nodelist.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 07632861d..392931d57 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -2240,11 +2240,11 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
 np,
 nu);
 
-  /* We need at least 1 exit usable in the consensus to consider
+  /* We need at least 1 exit (flag and policy) in the consensus to consider
* building exit paths */
   /* Update our understanding of whether the consensus has exits */
   consensus_path_type_t old_have_consensus_path = have_consensus_path;
-  have_consensus_path = ((nu > 0) ?
+  have_consensus_path = ((np > 0) ?
  CONSENSUS_PATH_EXIT :
  CONSENSUS_PATH_INTERNAL);
 
@@ -2342,14 +2342,14 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
 tor_asprintf(status_out,
  "%d%% of guards bw, "
  "%d%% of midpoint bw, and "
- "%d%% of exit bw%s = "
+ "%d%% of %s = "
  "%d%% of path bw",
  (int)(f_guard*100),
  (int)(f_mid*100),
  (int)(f_exit*100),
  (router_have_consensus_path() == CONSENSUS_PATH_EXIT ?
-  "" :
-  " (no exits in consensus)"),
+  "exit bw" :
+  "end bw (no exits in consensus)"),
  (int)(f_path*100));
 
   return f_path;



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

[tor-commits] [tor/master] Bootstrap: add some extra logging

2018-08-24 Thread nickm

commit dd27e17139d55433b313ffee1030cb0cba9f
Author: teor 
Date:   Sat Aug 25 01:11:44 2018 +1000

Bootstrap: add some extra logging

Diagnostics for 27236.
---
 src/or/nodelist.c | 42 +++---
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 392931d57..7540da7eb 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -2216,9 +2216,20 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
   count_usable_descriptors(num_present_out, num_usable_out,
mid, consensus, now, NULL,
USABLE_DESCRIPTOR_ALL);
+  log_debug(LD_NET,
+"%s: %d present, %d usable",
+"mid",
+np,
+nu);
+
   if (options->EntryNodes) {
 count_usable_descriptors(&np, &nu, guards, consensus, now,
  options->EntryNodes, USABLE_DESCRIPTOR_ALL);
+log_debug(LD_NET,
+  "%s: %d present, %d usable",
+  "guard",
+  np,
+  nu);
   } else {
 SMARTLIST_FOREACH(mid, const node_t *, node, {
   if (authdir) {
@@ -2229,6 +2240,10 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
   smartlist_add(guards, (node_t*)node);
   }
 });
+log_debug(LD_NET,
+  "%s: %d possible",
+  "guard",
+  smartlist_len(guards));
   }
 
   /* All nodes with exit policy and flag */
@@ -2248,17 +2263,22 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
  CONSENSUS_PATH_EXIT :
  CONSENSUS_PATH_INTERNAL);
 
-  if (have_consensus_path == CONSENSUS_PATH_INTERNAL
-  && old_have_consensus_path != have_consensus_path) {
-log_notice(LD_NET,
-   "The current consensus has no exit nodes. "
-   "Tor can only build internal paths, "
-   "such as paths to hidden services.");
-
-/* However, exit nodes can reachability self-test using this consensus,
- * join the network, and appear in a later consensus. This will allow
- * the network to build exit paths, such as paths for world wide web
- * browsing (as distinct from hidden service web browsing). */
+  if (old_have_consensus_path != have_consensus_path) {
+if (have_consensus_path == CONSENSUS_PATH_INTERNAL) {
+  log_notice(LD_NET,
+ "The current consensus has no exit nodes. "
+ "Tor can only build internal paths, "
+ "such as paths to onion services.");
+
+  /* However, exit nodes can reachability self-test using this consensus,
+   * join the network, and appear in a later consensus. This will allow
+   * the network to build exit paths, such as paths for world wide web
+   * browsing (as distinct from hidden service web browsing). */
+} else if (old_have_consensus_path == CONSENSUS_PATH_INTERNAL) {
+  log_notice(LD_NET,
+ "The current consensus contains exit nodes. "
+ "Tor can build exit and internal paths.");
+}
   }
 
   f_guard = frac_nodes_with_descriptors(guards, WEIGHT_FOR_GUARD);



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

[tor-commits] [tor/maint-0.3.4] Bootstrap: add some extra logging

2018-08-24 Thread nickm

commit dd27e17139d55433b313ffee1030cb0cba9f
Author: teor 
Date:   Sat Aug 25 01:11:44 2018 +1000

Bootstrap: add some extra logging

Diagnostics for 27236.
---
 src/or/nodelist.c | 42 +++---
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 392931d57..7540da7eb 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -2216,9 +2216,20 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
   count_usable_descriptors(num_present_out, num_usable_out,
mid, consensus, now, NULL,
USABLE_DESCRIPTOR_ALL);
+  log_debug(LD_NET,
+"%s: %d present, %d usable",
+"mid",
+np,
+nu);
+
   if (options->EntryNodes) {
 count_usable_descriptors(&np, &nu, guards, consensus, now,
  options->EntryNodes, USABLE_DESCRIPTOR_ALL);
+log_debug(LD_NET,
+  "%s: %d present, %d usable",
+  "guard",
+  np,
+  nu);
   } else {
 SMARTLIST_FOREACH(mid, const node_t *, node, {
   if (authdir) {
@@ -2229,6 +2240,10 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
   smartlist_add(guards, (node_t*)node);
   }
 });
+log_debug(LD_NET,
+  "%s: %d possible",
+  "guard",
+  smartlist_len(guards));
   }
 
   /* All nodes with exit policy and flag */
@@ -2248,17 +2263,22 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
  CONSENSUS_PATH_EXIT :
  CONSENSUS_PATH_INTERNAL);
 
-  if (have_consensus_path == CONSENSUS_PATH_INTERNAL
-  && old_have_consensus_path != have_consensus_path) {
-log_notice(LD_NET,
-   "The current consensus has no exit nodes. "
-   "Tor can only build internal paths, "
-   "such as paths to hidden services.");
-
-/* However, exit nodes can reachability self-test using this consensus,
- * join the network, and appear in a later consensus. This will allow
- * the network to build exit paths, such as paths for world wide web
- * browsing (as distinct from hidden service web browsing). */
+  if (old_have_consensus_path != have_consensus_path) {
+if (have_consensus_path == CONSENSUS_PATH_INTERNAL) {
+  log_notice(LD_NET,
+ "The current consensus has no exit nodes. "
+ "Tor can only build internal paths, "
+ "such as paths to onion services.");
+
+  /* However, exit nodes can reachability self-test using this consensus,
+   * join the network, and appear in a later consensus. This will allow
+   * the network to build exit paths, such as paths for world wide web
+   * browsing (as distinct from hidden service web browsing). */
+} else if (old_have_consensus_path == CONSENSUS_PATH_INTERNAL) {
+  log_notice(LD_NET,
+ "The current consensus contains exit nodes. "
+ "Tor can build exit and internal paths.");
+}
   }
 
   f_guard = frac_nodes_with_descriptors(guards, WEIGHT_FOR_GUARD);

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

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

2018-08-24 Thread nickm

commit 08a1619e7f2ba0abe20fcf1b07e3b7f3a050da37
Merge: 49fe7f24d dd27e17cc
Author: Nick Mathewson 
Date:   Fri Aug 24 12:05:39 2018 -0400

Merge branch 'maint-0.3.4'

 src/feature/nodelist/nodelist.c | 52 -
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --cc src/feature/nodelist/nodelist.c
index 4a0cb4fba,0..a0f068cf9
mode 100644,00..100644
--- a/src/feature/nodelist/nodelist.c
+++ b/src/feature/nodelist/nodelist.c
@@@ -1,2523 -1,0 +1,2543 @@@
 +/* Copyright (c) 2001 Matej Pfajfar.
 + * Copyright (c) 2001-2004, Roger Dingledine.
 + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
 + * Copyright (c) 2007-2018, The Tor Project, Inc. */
 +/* See LICENSE for licensing information */
 +
 +/**
 + * \file nodelist.c
 + *
 + * \brief Structures and functions for tracking what we know about the routers
 + *   on the Tor network, and correlating information from networkstatus,
 + *   routerinfo, and microdescs.
 + *
 + * The key structure here is node_t: that's the canonical way to refer
 + * to a Tor relay that we might want to build a circuit through.  Every
 + * node_t has either a routerinfo_t, or a routerstatus_t from the current
 + * networkstatus consensus.  If it has a routerstatus_t, it will also
 + * need to have a microdesc_t before you can use it for circuits.
 + *
 + * The nodelist_t is a global singleton that maps identities to node_t
 + * objects.  Access them with the node_get_*() functions.  The nodelist_t
 + * is maintained by calls throughout the codebase
 + *
 + * Generally, other code should not have to reach inside a node_t to
 + * see what information it has.  Instead, you should call one of the
 + * many accessor functions that works on a generic node_t.  If there
 + * isn't one that does what you need, it's better to make such a function,
 + * and then use it.
 + *
 + * For historical reasons, some of the functions that select a node_t
 + * from the list of all usable node_t objects are in the routerlist.c
 + * module, since they originally selected a routerinfo_t. (TODO: They
 + * should move!)
 + *
 + * (TODO: Perhaps someday we should abstract the remaining ways of
 + * talking about a relay to also be node_t instances. Those would be
 + * routerstatus_t as used for directory requests, and dir_server_t as
 + * used for authorities and fallback directories.)
 + */
 +
 +#define NODELIST_PRIVATE
 +
 +#include "core/or/or.h"
 +#include "lib/net/address.h"
 +#include "core/or/address_set.h"
 +#include "feature/client/bridges.h"
 +#include "app/config/config.h"
 +#include "feature/control/control.h"
 +#include "feature/dircache/dirserv.h"
 +#include "feature/client/entrynodes.h"
 +#include "feature/stats/geoip.h"
 +#include "feature/hs/hs_common.h"
 +#include "feature/hs/hs_client.h"
 +#include "core/mainloop/main.h"
 +#include "feature/nodelist/microdesc.h"
 +#include "feature/nodelist/networkstatus.h"
 +#include "feature/nodelist/nodelist.h"
 +#include "core/or/policies.h"
 +#include "core/or/protover.h"
 +#include "feature/rend/rendservice.h"
 +#include "feature/relay/router.h"
 +#include "feature/nodelist/routerlist.h"
 +#include "feature/nodelist/routerparse.h"
 +#include "feature/nodelist/routerset.h"
 +#include "feature/nodelist/torcert.h"
 +
 +#include 
 +
 +#include "feature/dirauth/mode.h"
 +
 +#include "feature/dirclient/dir_server_st.h"
 +#include "feature/nodelist/microdesc_st.h"
 +#include "feature/nodelist/networkstatus_st.h"
 +#include "feature/nodelist/node_st.h"
 +#include "feature/nodelist/routerinfo_st.h"
 +#include "feature/nodelist/routerlist_st.h"
 +#include "feature/nodelist/routerstatus_st.h"
 +
 +static void nodelist_drop_node(node_t *node, int remove_from_ht);
 +#define node_free(val) \
 +  FREE_AND_NULL(node_t, node_free_, (val))
 +static void node_free_(node_t *node);
 +
 +/** count_usable_descriptors counts descriptors with these flag(s)
 + */
 +typedef enum {
 +  /* All descriptors regardless of flags or exit policies */
 +  USABLE_DESCRIPTOR_ALL = 0U,
 +  /* Only count descriptors with an exit policy that allows at least one port
 +   */
 +  USABLE_DESCRIPTOR_EXIT_POLICY = 1U << 0,
 +  /* Only count descriptors for relays that have the exit flag in the
 +   * consensus */
 +  USABLE_DESCRIPTOR_EXIT_FLAG   = 1U << 1,
 +  /* Only count descriptors for relays that have the policy and the flag */
 +  USABLE_DESCRIPTOR_EXIT_POLICY_AND_FLAG = (USABLE_DESCRIPTOR_EXIT_POLICY |
 +USABLE_DESCRIPTOR_EXIT_FLAG)
 +} usable_descriptor_t;
 +static void count_usable_descriptors(int *num_present,
 + int *num_usable,
 + smartlist_t *descs_out,
 + const networkstatus_t *consensus,
 + time_t now,
 + routerset_t *in_set,
 + usable_descriptor_t

[tor-commits] [tor/master] Bootstrap: allow internal-only onion service networks to bootstrap

2018-08-24 Thread nickm

commit 3ebbc1c84d2daf2853a496d0c997ea7ee883d5e8
Author: teor 
Date:   Sat Aug 25 01:08:53 2018 +1000

Bootstrap: allow internal-only onion service networks to bootstrap

This fix requires chutney's 27230 fix to bridge client bootstrap.

Part of 27236.
---
 src/or/nodelist.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 07632861d..392931d57 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -2240,11 +2240,11 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
 np,
 nu);
 
-  /* We need at least 1 exit usable in the consensus to consider
+  /* We need at least 1 exit (flag and policy) in the consensus to consider
* building exit paths */
   /* Update our understanding of whether the consensus has exits */
   consensus_path_type_t old_have_consensus_path = have_consensus_path;
-  have_consensus_path = ((nu > 0) ?
+  have_consensus_path = ((np > 0) ?
  CONSENSUS_PATH_EXIT :
  CONSENSUS_PATH_INTERNAL);
 
@@ -2342,14 +2342,14 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
 tor_asprintf(status_out,
  "%d%% of guards bw, "
  "%d%% of midpoint bw, and "
- "%d%% of exit bw%s = "
+ "%d%% of %s = "
  "%d%% of path bw",
  (int)(f_guard*100),
  (int)(f_mid*100),
  (int)(f_exit*100),
  (router_have_consensus_path() == CONSENSUS_PATH_EXIT ?
-  "" :
-  " (no exits in consensus)"),
+  "exit bw" :
+  "end bw (no exits in consensus)"),
  (int)(f_path*100));
 
   return f_path;



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

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

2018-08-24 Thread translation

commit f8846475ef1c74131f6a1e7f8619044de8bbee4a
Author: Translation commit bot 
Date:   Fri Aug 24 15:49:00 2018 +

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

diff --git a/contents+pt_BR.po b/contents+pt_BR.po
index b5c3301d3..4f495e185 100644
--- a/contents+pt_BR.po
+++ b/contents+pt_BR.po
@@ -2988,7 +2988,7 @@ msgstr ""
 #: http//localhost/https/https-1/
 #: (content/https/https-1/contents+en.lrquestion.description)
 msgid "Tor protects eavesdroppers from learning sites that you visit."
-msgstr ""
+msgstr "Tor protege de bisbilhoteiros de aprender os sites que vocÃª visita."
 
 #: http//localhost/https/https-1/
 #: (content/https/https-1/contents+en.lrquestion.description)
@@ -3636,6 +3636,8 @@ msgid ""
 "Instead, consider running your exit relay in a commercial facility that is "
 "supportive of Tor."
 msgstr ""
+"Em vez disso, considere executar seu retransmissor de saÃda em uma "
+"instalaÃ§Ã£o comercial que Ã© solidÃ¡ria com Tor."
 
 #: http//localhost/operators/operators-7/
 #: (content/operators/operators-7/contents+en.lrquestion.description)

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

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

2018-08-24 Thread translation

commit c1342547ccdca410a2d42237b88fa44d890485a8
Author: Translation commit bot 
Date:   Fri Aug 24 15:46:22 2018 +

Update translations for tails-greeter-2_completed
---
 en_GB/en_GB.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po
index 0b304580b..27b880cf5 100644
--- a/en_GB/en_GB.po
+++ b/en_GB/en_GB.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-22 14:15+0100\n"
+"POT-Creation-Date: 2018-08-16 11:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Khanh Nguyen , 2017\n"
 "Language-Team: English (United Kingdom) 
(https://www.transifex.com/otf/teams/1519/en_GB/)\n"
@@ -28,8 +28,8 @@ msgid ""
 "tasks. Otherwise, the administration password is disabled for better "
 "security."
 msgstr ""
-"CÃ i Äáº·t má»t máºt kháº©u quáº£n trá» náº¿u báº¡n muá»n thá»±c thi 
cÃ¡c tÃ¡c vá»¥ quáº£n trá». Náº¿u"
-" khÃ´ng, máºt kháº©u quáº£n bá» vÃ´ hiá»u Äá» an ninh hÆ¡n."
+"Enter an administration password in case you need to perform administration 
tasks.\n"
+"Otherwise it will be disabled for better security."
 
 #: ../data/greeter.ui.h:3
 msgid "Enter an administration password"
@@ -293,7 +293,7 @@ msgstr "_Start Tails"
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../tailsgreeter/persistence.py:89
+#: ../tailsgreeter/persistence.py:91
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -302,7 +302,7 @@ msgstr ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#: ../tailsgreeter/persistence.py:124 ../tailsgreeter/persistence.py:141
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -313,7 +313,7 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:156
+#: ../tailsgreeter/persistence.py:158
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -324,7 +324,7 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:170
+#: ../tailsgreeter/persistence.py:172
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"

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

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

2018-08-24 Thread translation

commit 5230508cf20ffa5fd9a8d96c5e1c959ba138e99e
Author: Translation commit bot 
Date:   Fri Aug 24 15:46:16 2018 +

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

diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po
index 0b304580b..27b880cf5 100644
--- a/en_GB/en_GB.po
+++ b/en_GB/en_GB.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-22 14:15+0100\n"
+"POT-Creation-Date: 2018-08-16 11:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Khanh Nguyen , 2017\n"
 "Language-Team: English (United Kingdom) 
(https://www.transifex.com/otf/teams/1519/en_GB/)\n"
@@ -28,8 +28,8 @@ msgid ""
 "tasks. Otherwise, the administration password is disabled for better "
 "security."
 msgstr ""
-"CÃ i Äáº·t má»t máºt kháº©u quáº£n trá» náº¿u báº¡n muá»n thá»±c thi 
cÃ¡c tÃ¡c vá»¥ quáº£n trá». Náº¿u"
-" khÃ´ng, máºt kháº©u quáº£n bá» vÃ´ hiá»u Äá» an ninh hÆ¡n."
+"Enter an administration password in case you need to perform administration 
tasks.\n"
+"Otherwise it will be disabled for better security."
 
 #: ../data/greeter.ui.h:3
 msgid "Enter an administration password"
@@ -293,7 +293,7 @@ msgstr "_Start Tails"
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: ../tailsgreeter/persistence.py:89
+#: ../tailsgreeter/persistence.py:91
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -302,7 +302,7 @@ msgstr ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#: ../tailsgreeter/persistence.py:124 ../tailsgreeter/persistence.py:141
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -313,7 +313,7 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:156
+#: ../tailsgreeter/persistence.py:158
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -324,7 +324,7 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:170
+#: ../tailsgreeter/persistence.py:172
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"

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

[tor-commits] [chutney/master] Bootstrap: tidy comments

2018-08-24 Thread teor

commit 0ccad53329ae3edd85ad6619b26dc1112b3c33d9
Author: teor 
Date:   Sat Aug 25 01:15:18 2018 +1000

Bootstrap: tidy comments

Cleanup after 27230.
---
 torrc_templates/common.i | 12 +---
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/torrc_templates/common.i b/torrc_templates/common.i
index 88f0760..9f71fd3 100644
--- a/torrc_templates/common.i
+++ b/torrc_templates/common.i
@@ -1,17 +1,7 @@
 TestingTorNetwork 1
 
-## Comprehensive Bootstrap Testing Options ##
-# These typically launch a working minimal Tor network in 25s-30s,
-# and a working HS Tor network in 40-45s.
-# See authority.tmpl for a partial explanation
-#AssumeReachable 0
-#Default PathsNeededToBuildCircuits 0.6
-#Disable TestingDirAuthVoteExit
-#Disable TestingDirAuthVoteHSDir
-#Default V3AuthNIntervalsValid 3
-
 ## Rapid Bootstrap Testing Options ##
-# These typically launch a working minimal Tor network in 6s-10s
+# These typically launch a working minimal Tor network in ~20s
 # These parameters make tor networks bootstrap fast,
 # but can cause consensus instability and network unreliability
 # (Some are also bad for security.)

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

[tor-commits] [chutney/master] Bootstrap: allow Tor 0.3.4 bridges to bootstrap

2018-08-24 Thread teor

commit 364534a3d258b7362de2bb5063c1e543775106b4
Author: teor 
Date:   Sat Aug 25 01:13:54 2018 +1000

Bootstrap: allow Tor 0.3.4 bridges to bootstrap

Fixes 27230.
---
 torrc_templates/common.i | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/torrc_templates/common.i b/torrc_templates/common.i
index 884878b..88f0760 100644
--- a/torrc_templates/common.i
+++ b/torrc_templates/common.i
@@ -16,7 +16,10 @@ TestingTorNetwork 1
 # but can cause consensus instability and network unreliability
 # (Some are also bad for security.)
 AssumeReachable 1
-PathsNeededToBuildCircuits 0.25
+# We need at least 3 descriptors to build circuits.
+# In a 3 relay network, 0.67 > 2/3, so we try hard to get 3 descriptors.
+# In larger networks, 0.67 > 2/N, so we try hard to get >=3 descriptors.
+PathsNeededToBuildCircuits 0.67
 TestingDirAuthVoteExit *
 TestingDirAuthVoteHSDir *
 V3AuthNIntervalsValid 2



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

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

2018-08-24 Thread translation

commit 1f87d65d1dcbc47cf52e5980f010f914c8ee2ea5
Author: Translation commit bot 
Date:   Fri Aug 24 14:45:28 2018 +

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

diff --git a/ru/https-everywhere.dtd b/ru/https-everywhere.dtd
index 18ead9059..21242eb27 100644
--- a/ru/https-everywhere.dtd
+++ b/ru/https-everywhere.dtd
@@ -14,16 +14,16 @@
 
 
 
-
+
 
 
 
-
-
+
+
 
 
 
-
+
 
 
 

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

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

2018-08-24 Thread translation

commit 312cc31bd8e09f67b70fe9fb24c4c7da2734f849
Author: Translation commit bot 
Date:   Fri Aug 24 14:19:01 2018 +

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

diff --git a/contents+pt_BR.po b/contents+pt_BR.po
index 6fa6d15b2..b5c3301d3 100644
--- a/contents+pt_BR.po
+++ b/contents+pt_BR.po
@@ -3696,6 +3696,9 @@ msgid ""
 "The addresses must be shared with you by the website host, as onions are not"
 " indexed in search engines in the typical way that vanilla websites are."
 msgstr ""
+"Os endereÃ§os devem ser compartilhados com vocÃª por quem hospeda seu 
website,"
+" como onions nÃ£o sÃ£o indexados nos mecanismos de pesquisa na maneira 
tÃpica "
+"que os websites normais sÃ£o."
 
 #: http//localhost/onionservices/onionservices-1/
 #: (content/onionservices/onionservices-1/contents+en.lrquestion.seo_slug)

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

[tor-commits] [tor/master] Remove changes entries for stuff that is already in maint-0.3.4

2018-08-24 Thread nickm

commit 49fe7f24d6d22b0a898cdad75e84ec17a2bff051
Author: Nick Mathewson 
Date:   Fri Aug 24 09:15:34 2018 -0400

Remove changes entries for stuff that is already in maint-0.3.4
---
 changes/bug25440 | 5 -
 changes/bug26497 | 3 ---
 changes/bug26497-backport| 3 ---
 changes/bug26497-cd  | 4 
 changes/bug26779 | 4 
 changes/bug26873 | 4 
 changes/bug26932 | 3 ---
 changes/bug26948 | 4 
 changes/bug27081 | 4 
 changes/bug27088 | 5 -
 changes/bug27090 | 3 ---
 changes/bug27093 | 3 ---
 changes/bug27164 | 4 
 changes/bug27177 | 4 
 changes/bug27185 | 3 ---
 changes/bug27226 | 5 -
 changes/bug27236 | 5 -
 changes/geoip-2018-08-07 | 4 
 changes/ticket24629  | 3 ---
 changes/ticket24629-backport | 3 ---
 changes/ticket26952-cargo| 3 ---
 changes/ticket26952-ccache   | 3 ---
 changes/ticket27087  | 3 ---
 changes/ticket27275  | 3 ---
 24 files changed, 88 deletions(-)

diff --git a/changes/bug25440 b/changes/bug25440
deleted file mode 100644
index f8d9dd4fa..0
--- a/changes/bug25440
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (linux seccomp2 sandbox):
-- Fix a bug in out sandboxing rules for the openat() syscall.
-  Previously, no openat() call would be permitted, which would break
-  filesystem operations on recent glibc versions. Fixes bug 25440;
-  bugfix on 0.2.9.15. Diagnosis and patch from Daniel Pinto.
diff --git a/changes/bug26497 b/changes/bug26497
deleted file mode 100644
index d0c05ff3e..0
--- a/changes/bug26497
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (rust):
-- Stop setting $CARGO_HOME. cargo will use the user's $CARGO_HOME, or
-  $HOME/.cargo by default. Fixes bug 26497; bugfix on 0.3.1.5-alpha.
diff --git a/changes/bug26497-backport b/changes/bug26497-backport
deleted file mode 100644
index 1d86e01bf..0
--- a/changes/bug26497-backport
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (rust):
-- Backport test_rust.sh from master.
-  Fixes bug 26497; bugfix on 0.3.1.5-alpha.
diff --git a/changes/bug26497-cd b/changes/bug26497-cd
deleted file mode 100644
index 37bf1bc95..0
--- a/changes/bug26497-cd
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (rust):
-- cd to ${abs_top_builddir}/src/rust before running cargo in
-  src/test/test_rust.sh. This makes the working directory consistent
-  between builds and tests. Fixes bug 26497; bugfix on 0.3.3.2-alpha.
diff --git a/changes/bug26779 b/changes/bug26779
deleted file mode 100644
index fb7f6160e..0
--- a/changes/bug26779
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (bug workaround):
-- Compile correctly on systems that provide the C11 stdatomic.h header,
-  but where C11 atomic functions don't actually compile.
-  Closes ticket 26779; workaround for Debian issue 903709.
diff --git a/changes/bug26873 b/changes/bug26873
deleted file mode 100644
index 565f8bf0b..0
--- a/changes/bug26873
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (portability):
-- Fix compilation of the unit tests on GNU/Hurd, which does not
-  define PATH_MAX. Fixes bug 26873; bugfix on 0.3.3.1-alpha.
-  Patch from "paulusASol".
diff --git a/changes/bug26932 b/changes/bug26932
deleted file mode 100644
index 7d9481dcd..0
--- a/changes/bug26932
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (onion services):
-- Fix bug that causes services to not ever rotate their descriptors if they
-  were getting SIGHUPed often. Fixes bug 26932; bugfix on 0.3.2.1-alpha.
\ No newline at end of file
diff --git a/changes/bug26948 b/changes/bug26948
deleted file mode 100644
index 0f0728843..0
--- a/changes/bug26948
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (in-process restart):
-- Always call tor_free_all() when leaving tor_run_main(). When we
-  did not, restarting tor in-process would cause an assertion failure.
-  Fixes bug 26948; bugfix on 0.3.3.1-alpha.
diff --git a/changes/bug27081 b/changes/bug27081
deleted file mode 100644
index 74e0efbd2..0
--- a/changes/bug27081
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (compilation, windows):
-- Don't link or search for pthreads when building for Windows, even if we
-  are using build environment (like mingw) that provides a pthreads
-  library. Fixes bug 27081; bugfix on 0.1.0.1-rc.
diff --git a/changes/bug27088 b/changes/bug27088
deleted file mode 100644
index d4d3b292c..0
--- a/changes/bug27088
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (continuous integration):
-- Pass the module flags to distcheck configure, and
-  log the flags before running configure. (Backported
-  to 0.2.9 and later as a precaution.)
-  Fixes bug 27088; bugfix on 0.3.4.1-alpha.

[tor-commits] [tor/release-0.3.4] Start on a changelog for 0.3.4.7-rc

2018-08-24 Thread nickm

commit 8a4b41f24146b502bb85fcfc053a1240c7e79439
Author: Nick Mathewson 
Date:   Fri Aug 24 09:18:32 2018 -0400

Start on a changelog for 0.3.4.7-rc
---
 ChangeLog| 99 
 changes/bug25440 |  5 ---
 changes/bug26497 |  3 --
 changes/bug26497-backport|  3 --
 changes/bug26497-cd  |  4 --
 changes/bug26779 |  4 --
 changes/bug26873 |  4 --
 changes/bug26932 |  3 --
 changes/bug26948 |  4 --
 changes/bug26979 |  4 --
 changes/bug27081 |  4 --
 changes/bug27088 |  5 ---
 changes/bug27090 |  3 --
 changes/bug27093 |  3 --
 changes/bug27164 |  4 --
 changes/bug27177 |  4 --
 changes/bug27185 |  3 --
 changes/bug27226 |  5 ---
 changes/bug27236 |  5 ---
 changes/geoip-2018-08-07 |  4 --
 changes/ticket24629  |  3 --
 changes/ticket24629-backport |  3 --
 changes/ticket26560  |  3 --
 changes/ticket26952-cargo|  3 --
 changes/ticket26952-ccache   |  3 --
 changes/ticket27087  |  3 --
 changes/ticket27275  |  3 --
 27 files changed, 99 insertions(+), 95 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 84a3f1045..2012eb644 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,102 @@
+Changes in version 0.3.4.7-rc - 2018-08-2?
+  Tor 0.3.4.6-rc fixes several small compilation, portability, and
+  correctness issues in previous versions of Tor. This version is a
+  release candidate: if no serious bugs are found, we expect that the
+  stable 0.3.4 release will be (almost) the same as this release.
+
+  o Minor features (bug workaround):
+- Compile correctly on systems that provide the C11 stdatomic.h
+  header, but where C11 atomic functions don't actually compile.
+  Closes ticket 26779; workaround for Debian issue 903709.
+
+  o Minor features (continuous integration):
+- Backport Travis rust distcheck to 0.3.3. Closes ticket 24629.
+- Enable macOS builds in our Travis CI configuration. Closes
+  ticket 24629.
+- Install libcap-dev and libseccomp2-dev so these optional
+  dependencies get tested on Travis CI. Closes ticket 26560.
+- Only post Appveyor IRC notifications when the build fails.
+  Implements ticket 27275.
+- Run asciidoc during Travis CI. Implements ticket 27087.
+- Use ccache in our Travis CI configuration. Closes ticket 26952.
+
+  o Minor features (continuous integration, rust):
+- Use cargo cache in our Travis CI configuration. Closes
+  ticket 26952.
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the August 7 2018 Maxmind GeoLite2
+  Country database. Closes ticket 27089.
+
+  o Minor bugfixes (compilation, windows):
+- Don't link or search for pthreads when building for Windows, even
+  if we are using build environment (like mingw) that provides a
+  pthreads library. Fixes bug 27081; bugfix on 0.1.0.1-rc.
+
+  o Minor bugfixes (continuous integration):
+- Improve Appveyor CI IRC logging. Generate correct branches and
+  URLs for pull requests and tags. Use unambiguous short commits.
+  Fixes bug 26979; bugfix on master.
+- Build with zstd on macOS. Fixes bug 27090; bugfix on 0.3.1.5-alpha.
+- Pass the module flags to distcheck configure, and log the flags
+  before running configure. (Backported to 0.2.9 and later as a
+  precaution.) Fixes bug 27088; bugfix on 0.3.4.1-alpha.
+
+  o Minor bugfixes (in-process restart):
+- Always call tor_free_all() when leaving tor_run_main(). When we
+  did not, restarting tor in-process would cause an assertion
+  failure. Fixes bug 26948; bugfix on 0.3.3.1-alpha.
+
+  o Minor bugfixes (linux seccomp2 sandbox):
+- Fix a bug in out sandboxing rules for the openat() syscall.
+  Previously, no openat() call would be permitted, which would break
+  filesystem operations on recent glibc versions. Fixes bug 25440;
+  bugfix on 0.2.9.15. Diagnosis and patch from Daniel Pinto.
+
+  o Minor bugfixes (onion services):
+- Fix bug that causes services to not ever rotate their descriptors
+  if they were getting SIGHUPed often. Fixes bug 26932; bugfix
+  on 0.3.2.1-alpha.
+
+  o Minor bugfixes (portability):
+- Fix compilation of the unit tests on GNU/Hurd, which does not
+  define PATH_MAX. Fixes bug 26873; bugfix on 0.3.3.1-alpha. Patch
+  from "paulusASol".
+
+  o Minor bugfixes (rust):
+- Backport test_rust.sh from master. Fixes bug 26497; bugfix
+  on 0.3.1.5-alpha.
+- Consistently use ../../.. as a fallback for $abs_top_srcdir in
+  test_rust.sh. Fixes bug 27093; bugfix on 0.3.4.3-alpha.
+- Protover parsing was accepting the presence of whitespace in
+  version strings, which the C implementation would choke on, e.g.
+  "Desc=1\t,2". Fixes bug 27177; bugfix on 0.3.3.5

[tor-commits] [tor/maint-0.3.4] Bump to 0.3.4.7-rc

2018-08-24 Thread nickm

commit 4748fd23da9f833b50207915f605499b71b3f819
Author: Nick Mathewson 
Date:   Fri Aug 24 09:13:20 2018 -0400

Bump to 0.3.4.7-rc
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2d1390bae..b7f15a6f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.4.6-rc-dev])
+AC_INIT([tor],[0.3.4.7-rc])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index bbe5586e4..fad92b589 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.4.6-rc-dev"
+!define VERSION "0.3.4.7-rc"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/";
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 4b0522e47..c7f865f0f 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.4.6-rc-dev"
+#define VERSION "0.3.4.7-rc"
 
 
 

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

[tor-commits] [tor/master] Bump to 0.3.4.7-rc

2018-08-24 Thread nickm

commit 4748fd23da9f833b50207915f605499b71b3f819
Author: Nick Mathewson 
Date:   Fri Aug 24 09:13:20 2018 -0400

Bump to 0.3.4.7-rc
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2d1390bae..b7f15a6f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.4.6-rc-dev])
+AC_INIT([tor],[0.3.4.7-rc])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index bbe5586e4..fad92b589 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.4.6-rc-dev"
+!define VERSION "0.3.4.7-rc"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/";
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 4b0522e47..c7f865f0f 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.4.6-rc-dev"
+#define VERSION "0.3.4.7-rc"
 
 
 



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

[tor-commits] [tor/release-0.3.4] Bump to 0.3.4.7-rc

2018-08-24 Thread nickm

commit 4748fd23da9f833b50207915f605499b71b3f819
Author: Nick Mathewson 
Date:   Fri Aug 24 09:13:20 2018 -0400

Bump to 0.3.4.7-rc
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2d1390bae..b7f15a6f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.4.6-rc-dev])
+AC_INIT([tor],[0.3.4.7-rc])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index bbe5586e4..fad92b589 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.4.6-rc-dev"
+!define VERSION "0.3.4.7-rc"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/";
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 4b0522e47..c7f865f0f 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.4.6-rc-dev"
+#define VERSION "0.3.4.7-rc"
 
 
 



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

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

2018-08-24 Thread nickm

commit d911eb80f69dc6a63a85785e813bfd24290dc429
Merge: 49542ff72 4748fd23d
Author: Nick Mathewson 
Date:   Fri Aug 24 09:13:51 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)



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

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

2018-08-24 Thread nickm

commit 4c939f89ae583008e07071c822abaf55435cb5f1
Merge: f36b3faa7 4748fd23d
Author: Nick Mathewson 
Date:   Fri Aug 24 09:13:37 2018 -0400

Merge branch 'maint-0.3.4'

"ours" merge to avoid version bump.




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

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

2018-08-24 Thread translation

commit c6a022df2a3e4d8a0dc899212c310853df35aca0
Author: Translation commit bot 
Date:   Fri Aug 24 12:49:37 2018 +

Update translations for torbutton-browseronboardingproperties_completed
---
 en/browserOnboarding.properties | 16 
 1 file changed, 16 insertions(+)

diff --git a/en/browserOnboarding.properties b/en/browserOnboarding.properties
index 362eefead..49085fbaa 100644
--- a/en/browserOnboarding.properties
+++ b/en/browserOnboarding.properties
@@ -36,3 +36,19 @@ onboarding.tour-tor-onion-services=Onion Services
 onboarding.tour-tor-onion-services.title=Onion Services
 onboarding.tour-tor-onion-services.description=Finally we would like to 
introduce you to Onion services. For ultimate privacy and security, sites 
ending in .onion are configured using the Tor network. Onion services provide 
extra protections to publishers and visitors, including added safeguards 
against censorship. The same way our Browser allows you to browse the web 
anonymously our onion services allow people to provide content and services 
anonymously. You will notice a little onion icon in the URL bar when accessing 
these services. Click below to see the NYTimes onion services and how they work.
 onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=Next
+onboarding.tor-circuit-display.done=Done
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly 
assigned relays, which are computers around the world configured to forward Tor 
traffic. Circuits allow you to browse privately and to connect to onion 
services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that 
make up the circuit for this website. To prevent linking of activity across 
different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect 
to the website youâre trying to visit or it is not loading properly, then you 
can use this button to reload the site with a new circuit.

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

[tor-commits] [tor/master] Bootstrap: stop requiring descriptors to count exits as usable

2018-08-24 Thread nickm

commit 588c77677a84a4c7b7222bafd6fb6ad80826064a
Author: teor 
Date:   Fri Aug 24 11:55:41 2018 +1000

Bootstrap: stop requiring descriptors to count exits as usable

Instead, count exits as usable if they have the exit flag, and
present if they also have a non-reject exit policy.

Requiring a threshold of usable descriptors avoids directories trickling
exit descriptors to clients to discover their ExitNodes settings.

Part of 27236.
---
 src/or/nodelist.c | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 85e4ae38d..07632861d 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -2118,9 +2118,9 @@ get_dir_info_status_string(void)
  *
  * If in_set is non-NULL, only consider those routers in in_set.
  * If exit_only & USABLE_DESCRIPTOR_EXIT_POLICY, only consider nodes
- * with an exit policy that accepts at least one port.
+ * present if they have an exit policy that accepts at least one port.
  * If exit_only & USABLE_DESCRIPTOR_EXIT_FLAG, only consider nodes
- * with the exit flag in the consensus.
+ * usable if they have the exit flag in the consensus.
  *
  * If *descs_out is present, add a node_t for each usable descriptor
  * to it.
@@ -2147,12 +2147,6 @@ count_usable_descriptors(int *num_present, int 
*num_usable,
if (in_set && ! routerset_contains_routerstatus(in_set, rs, -1))
  continue;
if (client_would_use_router(rs, now)) {
- /* Do the policy check last, because it's potentially expensive */
- if ((exit_only & USABLE_DESCRIPTOR_EXIT_POLICY) &&
- node_has_preferred_descriptor(node, 0) &&
- node_exit_policy_rejects_all(node)) {
-   continue;
- }
  const char * const digest = rs->descriptor_digest;
  int present;
  ++*num_usable; /* the consensus says we want it. */
@@ -2161,7 +2155,14 @@ count_usable_descriptors(int *num_present, int 
*num_usable,
  else
present = NULL != router_get_by_descriptor_digest(digest);
  if (present) {
-   /* we have the descriptor listed in the consensus. */
+   /* Do the policy check last, because it requires a descriptor,
+* and is potentially expensive */
+   if ((exit_only & USABLE_DESCRIPTOR_EXIT_POLICY) &&
+   node_exit_policy_rejects_all(node)) {
+   continue;
+   }
+   /* we have the descriptor listed in the consensus, and it
+* satisfies our exit constraints (if any) */
++*num_present;
  }
  if (descs_out)
@@ -2239,7 +2240,7 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
 np,
 nu);
 
-  /* We need at least 1 exit present in the consensus to consider
+  /* We need at least 1 exit usable in the consensus to consider
* building exit paths */
   /* Update our understanding of whether the consensus has exits */
   consensus_path_type_t old_have_consensus_path = have_consensus_path;



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

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

2018-08-24 Thread nickm

commit f36b3faa754fd7c704fe9240bc1599c6311b5309
Merge: 677048fe9 588c77677
Author: Nick Mathewson 
Date:   Fri Aug 24 08:32:33 2018 -0400

Merge branch 'maint-0.3.4'

 src/feature/nodelist/nodelist.c | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --cc src/feature/nodelist/nodelist.c
index bf298337a,0..4a0cb4fba
mode 100644,00..100644
--- a/src/feature/nodelist/nodelist.c
+++ b/src/feature/nodelist/nodelist.c
@@@ -1,2522 -1,0 +1,2523 @@@
 +/* Copyright (c) 2001 Matej Pfajfar.
 + * Copyright (c) 2001-2004, Roger Dingledine.
 + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
 + * Copyright (c) 2007-2018, The Tor Project, Inc. */
 +/* See LICENSE for licensing information */
 +
 +/**
 + * \file nodelist.c
 + *
 + * \brief Structures and functions for tracking what we know about the routers
 + *   on the Tor network, and correlating information from networkstatus,
 + *   routerinfo, and microdescs.
 + *
 + * The key structure here is node_t: that's the canonical way to refer
 + * to a Tor relay that we might want to build a circuit through.  Every
 + * node_t has either a routerinfo_t, or a routerstatus_t from the current
 + * networkstatus consensus.  If it has a routerstatus_t, it will also
 + * need to have a microdesc_t before you can use it for circuits.
 + *
 + * The nodelist_t is a global singleton that maps identities to node_t
 + * objects.  Access them with the node_get_*() functions.  The nodelist_t
 + * is maintained by calls throughout the codebase
 + *
 + * Generally, other code should not have to reach inside a node_t to
 + * see what information it has.  Instead, you should call one of the
 + * many accessor functions that works on a generic node_t.  If there
 + * isn't one that does what you need, it's better to make such a function,
 + * and then use it.
 + *
 + * For historical reasons, some of the functions that select a node_t
 + * from the list of all usable node_t objects are in the routerlist.c
 + * module, since they originally selected a routerinfo_t. (TODO: They
 + * should move!)
 + *
 + * (TODO: Perhaps someday we should abstract the remaining ways of
 + * talking about a relay to also be node_t instances. Those would be
 + * routerstatus_t as used for directory requests, and dir_server_t as
 + * used for authorities and fallback directories.)
 + */
 +
 +#define NODELIST_PRIVATE
 +
 +#include "core/or/or.h"
 +#include "lib/net/address.h"
 +#include "core/or/address_set.h"
 +#include "feature/client/bridges.h"
 +#include "app/config/config.h"
 +#include "feature/control/control.h"
 +#include "feature/dircache/dirserv.h"
 +#include "feature/client/entrynodes.h"
 +#include "feature/stats/geoip.h"
 +#include "feature/hs/hs_common.h"
 +#include "feature/hs/hs_client.h"
 +#include "core/mainloop/main.h"
 +#include "feature/nodelist/microdesc.h"
 +#include "feature/nodelist/networkstatus.h"
 +#include "feature/nodelist/nodelist.h"
 +#include "core/or/policies.h"
 +#include "core/or/protover.h"
 +#include "feature/rend/rendservice.h"
 +#include "feature/relay/router.h"
 +#include "feature/nodelist/routerlist.h"
 +#include "feature/nodelist/routerparse.h"
 +#include "feature/nodelist/routerset.h"
 +#include "feature/nodelist/torcert.h"
 +
 +#include 
 +
 +#include "feature/dirauth/mode.h"
 +
 +#include "feature/dirclient/dir_server_st.h"
 +#include "feature/nodelist/microdesc_st.h"
 +#include "feature/nodelist/networkstatus_st.h"
 +#include "feature/nodelist/node_st.h"
 +#include "feature/nodelist/routerinfo_st.h"
 +#include "feature/nodelist/routerlist_st.h"
 +#include "feature/nodelist/routerstatus_st.h"
 +
 +static void nodelist_drop_node(node_t *node, int remove_from_ht);
 +#define node_free(val) \
 +  FREE_AND_NULL(node_t, node_free_, (val))
 +static void node_free_(node_t *node);
 +
 +/** count_usable_descriptors counts descriptors with these flag(s)
 + */
 +typedef enum {
 +  /* All descriptors regardless of flags or exit policies */
 +  USABLE_DESCRIPTOR_ALL = 0U,
 +  /* Only count descriptors with an exit policy that allows at least one port
 +   */
 +  USABLE_DESCRIPTOR_EXIT_POLICY = 1U << 0,
 +  /* Only count descriptors for relays that have the exit flag in the
 +   * consensus */
 +  USABLE_DESCRIPTOR_EXIT_FLAG   = 1U << 1,
 +  /* Only count descriptors for relays that have the policy and the flag */
 +  USABLE_DESCRIPTOR_EXIT_POLICY_AND_FLAG = (USABLE_DESCRIPTOR_EXIT_POLICY |
 +USABLE_DESCRIPTOR_EXIT_FLAG)
 +} usable_descriptor_t;
 +static void count_usable_descriptors(int *num_present,
 + int *num_usable,
 + smartlist_t *descs_out,
 + const networkstatus_t *consensus,
 + time_t now,
 + routerset_t *in_set,
 + usable_descriptor_t exit_only);
 +static

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

2018-08-24 Thread nickm

commit 49542ff72432b408aa1291d045b1deb5f6af139f
Merge: 5c3998a02 588c77677
Author: Nick Mathewson 
Date:   Fri Aug 24 08:32:33 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

 src/or/nodelist.c | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

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

[tor-commits] [tor/maint-0.3.4] Bootstrap: stop requiring descriptors to count exits as usable

2018-08-24 Thread nickm

commit 588c77677a84a4c7b7222bafd6fb6ad80826064a
Author: teor 
Date:   Fri Aug 24 11:55:41 2018 +1000

Bootstrap: stop requiring descriptors to count exits as usable

Instead, count exits as usable if they have the exit flag, and
present if they also have a non-reject exit policy.

Requiring a threshold of usable descriptors avoids directories trickling
exit descriptors to clients to discover their ExitNodes settings.

Part of 27236.
---
 src/or/nodelist.c | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 85e4ae38d..07632861d 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -2118,9 +2118,9 @@ get_dir_info_status_string(void)
  *
  * If in_set is non-NULL, only consider those routers in in_set.
  * If exit_only & USABLE_DESCRIPTOR_EXIT_POLICY, only consider nodes
- * with an exit policy that accepts at least one port.
+ * present if they have an exit policy that accepts at least one port.
  * If exit_only & USABLE_DESCRIPTOR_EXIT_FLAG, only consider nodes
- * with the exit flag in the consensus.
+ * usable if they have the exit flag in the consensus.
  *
  * If *descs_out is present, add a node_t for each usable descriptor
  * to it.
@@ -2147,12 +2147,6 @@ count_usable_descriptors(int *num_present, int 
*num_usable,
if (in_set && ! routerset_contains_routerstatus(in_set, rs, -1))
  continue;
if (client_would_use_router(rs, now)) {
- /* Do the policy check last, because it's potentially expensive */
- if ((exit_only & USABLE_DESCRIPTOR_EXIT_POLICY) &&
- node_has_preferred_descriptor(node, 0) &&
- node_exit_policy_rejects_all(node)) {
-   continue;
- }
  const char * const digest = rs->descriptor_digest;
  int present;
  ++*num_usable; /* the consensus says we want it. */
@@ -2161,7 +2155,14 @@ count_usable_descriptors(int *num_present, int 
*num_usable,
  else
present = NULL != router_get_by_descriptor_digest(digest);
  if (present) {
-   /* we have the descriptor listed in the consensus. */
+   /* Do the policy check last, because it requires a descriptor,
+* and is potentially expensive */
+   if ((exit_only & USABLE_DESCRIPTOR_EXIT_POLICY) &&
+   node_exit_policy_rejects_all(node)) {
+   continue;
+   }
+   /* we have the descriptor listed in the consensus, and it
+* satisfies our exit constraints (if any) */
++*num_present;
  }
  if (descs_out)
@@ -2239,7 +2240,7 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
 np,
 nu);
 
-  /* We need at least 1 exit present in the consensus to consider
+  /* We need at least 1 exit usable in the consensus to consider
* building exit paths */
   /* Update our understanding of whether the consensus has exits */
   consensus_path_type_t old_have_consensus_path = have_consensus_path;

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

[tor-commits] [tor/release-0.3.4] Bootstrap: stop requiring descriptors to count exits as usable

2018-08-24 Thread nickm

commit 588c77677a84a4c7b7222bafd6fb6ad80826064a
Author: teor 
Date:   Fri Aug 24 11:55:41 2018 +1000

Bootstrap: stop requiring descriptors to count exits as usable

Instead, count exits as usable if they have the exit flag, and
present if they also have a non-reject exit policy.

Requiring a threshold of usable descriptors avoids directories trickling
exit descriptors to clients to discover their ExitNodes settings.

Part of 27236.
---
 src/or/nodelist.c | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 85e4ae38d..07632861d 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -2118,9 +2118,9 @@ get_dir_info_status_string(void)
  *
  * If in_set is non-NULL, only consider those routers in in_set.
  * If exit_only & USABLE_DESCRIPTOR_EXIT_POLICY, only consider nodes
- * with an exit policy that accepts at least one port.
+ * present if they have an exit policy that accepts at least one port.
  * If exit_only & USABLE_DESCRIPTOR_EXIT_FLAG, only consider nodes
- * with the exit flag in the consensus.
+ * usable if they have the exit flag in the consensus.
  *
  * If *descs_out is present, add a node_t for each usable descriptor
  * to it.
@@ -2147,12 +2147,6 @@ count_usable_descriptors(int *num_present, int 
*num_usable,
if (in_set && ! routerset_contains_routerstatus(in_set, rs, -1))
  continue;
if (client_would_use_router(rs, now)) {
- /* Do the policy check last, because it's potentially expensive */
- if ((exit_only & USABLE_DESCRIPTOR_EXIT_POLICY) &&
- node_has_preferred_descriptor(node, 0) &&
- node_exit_policy_rejects_all(node)) {
-   continue;
- }
  const char * const digest = rs->descriptor_digest;
  int present;
  ++*num_usable; /* the consensus says we want it. */
@@ -2161,7 +2155,14 @@ count_usable_descriptors(int *num_present, int 
*num_usable,
  else
present = NULL != router_get_by_descriptor_digest(digest);
  if (present) {
-   /* we have the descriptor listed in the consensus. */
+   /* Do the policy check last, because it requires a descriptor,
+* and is potentially expensive */
+   if ((exit_only & USABLE_DESCRIPTOR_EXIT_POLICY) &&
+   node_exit_policy_rejects_all(node)) {
+   continue;
+   }
+   /* we have the descriptor listed in the consensus, and it
+* satisfies our exit constraints (if any) */
++*num_present;
  }
  if (descs_out)
@@ -2239,7 +2240,7 @@ compute_frac_paths_available(const networkstatus_t 
*consensus,
 np,
 nu);
 
-  /* We need at least 1 exit present in the consensus to consider
+  /* We need at least 1 exit usable in the consensus to consider
* building exit paths */
   /* Update our understanding of whether the consensus has exits */
   consensus_path_type_t old_have_consensus_path = have_consensus_path;



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

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

2018-08-24 Thread translation

commit 66bf2fa2d8b258ab94abe8a9793cdfd5ba03ac67
Author: Translation commit bot 
Date:   Fri Aug 24 11:48:54 2018 +

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

diff --git a/contents+bn_BD.po b/contents+bn_BD.po
index c1b719ad5..589cc988c 100644
--- a/contents+bn_BD.po
+++ b/contents+bn_BD.po
@@ -329,7 +329,7 @@ msgstr ""
 #: http//localhost/misc/misc-13/
 #: (content/misc/misc-13/contents+en.lrquestion.seo_slug)
 msgid "use-vpn-with-tor"
-msgstr "use-vpn-with-tor"
+msgstr "à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°-vpn-à¦à¦°"
 
 #: http//localhost/tbb/tbb-1/ (content/tbb/tbb-1/contents+en.lrquestion.title)
 msgid ""
@@ -372,7 +372,7 @@ msgstr ""
 #: http//localhost/tbb/tbb-1/
 #: (content/tbb/tbb-1/contents+en.lrquestion.seo_slug)
 msgid "most-common-issues-latest-stable-tor-browser"
-msgstr "most-common-issues-latest-stable-tor-browser"
+msgstr "à¦à¦¤à¦¿-à¦ªà§à¦°à¦à¦²à¦¿à¦¤ 
à¦¬à¦¿à¦·à¦¯à¦¼-à¦¸à¦°à§à¦¬à¦¶à§à¦·-à¦
à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¨à§à¦¯à¦¼-à¦à¦°-à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦°"
 
 #: http//localhost/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.title)
@@ -414,7 +414,7 @@ msgstr "* à¦à¦à¦¨à§à¦¡à§à¦ à¦à¦° à¦à¦¨à§à¦¯"
 #: http//localhost/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
 msgid "* firefox.exe"
-msgstr "* firefox.exe"
+msgstr "* à¦«à¦¾à¦¯à¦¼à¦¾à¦°à¦«à¦à§à¦¸.à¦à¦à§à¦¸à¦"
 
 #: http//localhost/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
@@ -434,12 +434,12 @@ msgstr "* OS X à¦à¦° à¦à¦¨à§à¦¯"
 #: http//localhost/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
 msgid "* TorBrowser"
-msgstr "* TorBrowser"
+msgstr "* à¦à¦°à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦°"
 
 #: http//localhost/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
 msgid "* tor.real"
-msgstr "* tor.real"
+msgstr "* à¦à¦°à¥¤à¦¬à¦¾à¦¸à§à¦¤à¦¬"
 
 #: http//localhost/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
@@ -565,7 +565,7 @@ msgstr ""
 #: http//localhost/tbb/tbb-12/
 #: (content/tbb/tbb-12/contents+en.lrquestion.seo_slug)
 msgid "using-flash-tor-browser"
-msgstr "using-flash-tor-browser"
+msgstr 
"à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°-à¦«à§à¦²à§à¦¯à¦¾à¦¶-à¦à¦°-à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦°"
 
 #: http//localhost/tbb/tbb-13/
 #: (content/tbb/tbb-13/contents+en.lrquestion.title)
@@ -610,12 +610,12 @@ msgstr ""
 #: http//localhost/tbb/tbb-13/
 #: (content/tbb/tbb-13/contents+en.lrquestion.seo_slug)
 msgid "tor-browser-protecting-other-apps"
-msgstr "tor-browser-protecting-other-apps"
+msgstr "à¦à¦°-à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦°-à¦à¦¨à§à¦¯à¦¾à¦¨à§à¦¯-à¦
à§à¦¯à¦¾à¦ª-à¦¸à§à¦°à¦à§à¦·à¦¾"
 
 #: http//localhost/tbb/tbb-14/
 #: (content/tbb/tbb-14/contents+en.lrquestion.seo_slug)
 msgid "installing-add-on-extensions-tor-browser"
-msgstr "installing-add-on-extensions-tor-browser"
+msgstr "à¦à¦¨à¦¸à§à¦à¦²-à¦à¦¡-à¦
à¦¨-à¦à¦à§à¦¸à¦à§à¦¨à¦¶à¦¨-à¦à¦°-à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦°"
 
 #: http//localhost/tbb/tbb-15/
 #: (content/tbb/tbb-15/contents+en.lrquestion.title)
@@ -680,7 +680,7 @@ msgstr ""
 #: http//localhost/tbb/tbb-16/
 #: (content/tbb/tbb-16/contents+en.lrquestion.seo_slug)
 msgid "pick-which-country-i-am-exiting"
-msgstr "pick-which-country-i-am-exiting"
+msgstr 
"à¦à¦®à¦¿-à¦à§à¦¨-à¦¦à§à¦¶-à¦¥à§à¦à§-à¦ªà§à¦°à¦¸à§à¦¥à¦¾à¦¨-à¦à¦°à¦à¦¿"
 
 #: http//localhost/tbb/tbb-17/
 #: (content/tbb/tbb-17/contents+en.lrquestion.title)
@@ -710,7 +710,7 @@ msgstr ""
 #: http//localhost/tbb/tbb-17/
 #: (content/tbb/tbb-17/contents+en.lrquestion.seo_slug)
 msgid "run-tor-browser-and-different-browser"
-msgstr "run-tor-browser-and-different-browser"
+msgstr 
"à¦à¦°-à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦°-à¦à¦¬à¦-à¦¬à¦¿à¦à¦¿à¦¨à§à¦¨-à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦°-à¦à¦¾à¦²à¦¾à¦¨"
 
 #: http//localhost/tbb/tbb-18/
 #: (content/tbb/tbb-18/contents+en.lrquestion.title)
@@ -738,7 +738,7 @@ msgstr ""
 #: http//localhost/tbb/tbb-18/
 #: (content/tbb/tbb-18/contents+en.lrquestion.seo_slug)
 msgid "is-there-support-for-bsd"
-msgstr "is-there-support-for-bsd"
+msgstr "à¦¬à¦¿à¦à¦¸à¦¡à¦¿-à¦à¦¨à§à¦¯-à¦¸à¦®à¦°à§à¦¥à¦¨-à¦à¦à§-à¦à¦¿"
 
 #: http//localhost/tbb/tbb-19/
 #: (content/tbb/tbb-19/contents+en.lrquestion.title)

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

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

2018-08-24 Thread translation

commit 7c8d69bf6a6e226c5959c3b37e4df135efcbd4a1
Author: Translation commit bot 
Date:   Fri Aug 24 11:48:59 2018 +

Update translations for support-portal_completed
---
 contents+bn_BD.po | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/contents+bn_BD.po b/contents+bn_BD.po
index c1b719ad5..589cc988c 100644
--- a/contents+bn_BD.po
+++ b/contents+bn_BD.po
@@ -329,7 +329,7 @@ msgstr ""
 #: http//localhost/misc/misc-13/
 #: (content/misc/misc-13/contents+en.lrquestion.seo_slug)
 msgid "use-vpn-with-tor"
-msgstr "use-vpn-with-tor"
+msgstr "à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°-vpn-à¦à¦°"
 
 #: http//localhost/tbb/tbb-1/ (content/tbb/tbb-1/contents+en.lrquestion.title)
 msgid ""
@@ -372,7 +372,7 @@ msgstr ""
 #: http//localhost/tbb/tbb-1/
 #: (content/tbb/tbb-1/contents+en.lrquestion.seo_slug)
 msgid "most-common-issues-latest-stable-tor-browser"
-msgstr "most-common-issues-latest-stable-tor-browser"
+msgstr "à¦à¦¤à¦¿-à¦ªà§à¦°à¦à¦²à¦¿à¦¤ 
à¦¬à¦¿à¦·à¦¯à¦¼-à¦¸à¦°à§à¦¬à¦¶à§à¦·-à¦
à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¨à§à¦¯à¦¼-à¦à¦°-à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦°"
 
 #: http//localhost/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.title)
@@ -414,7 +414,7 @@ msgstr "* à¦à¦à¦¨à§à¦¡à§à¦ à¦à¦° à¦à¦¨à§à¦¯"
 #: http//localhost/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
 msgid "* firefox.exe"
-msgstr "* firefox.exe"
+msgstr "* à¦«à¦¾à¦¯à¦¼à¦¾à¦°à¦«à¦à§à¦¸.à¦à¦à§à¦¸à¦"
 
 #: http//localhost/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
@@ -434,12 +434,12 @@ msgstr "* OS X à¦à¦° à¦à¦¨à§à¦¯"
 #: http//localhost/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
 msgid "* TorBrowser"
-msgstr "* TorBrowser"
+msgstr "* à¦à¦°à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦°"
 
 #: http//localhost/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
 msgid "* tor.real"
-msgstr "* tor.real"
+msgstr "* à¦à¦°à¥¤à¦¬à¦¾à¦¸à§à¦¤à¦¬"
 
 #: http//localhost/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
@@ -565,7 +565,7 @@ msgstr ""
 #: http//localhost/tbb/tbb-12/
 #: (content/tbb/tbb-12/contents+en.lrquestion.seo_slug)
 msgid "using-flash-tor-browser"
-msgstr "using-flash-tor-browser"
+msgstr 
"à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°-à¦«à§à¦²à§à¦¯à¦¾à¦¶-à¦à¦°-à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦°"
 
 #: http//localhost/tbb/tbb-13/
 #: (content/tbb/tbb-13/contents+en.lrquestion.title)
@@ -610,12 +610,12 @@ msgstr ""
 #: http//localhost/tbb/tbb-13/
 #: (content/tbb/tbb-13/contents+en.lrquestion.seo_slug)
 msgid "tor-browser-protecting-other-apps"
-msgstr "tor-browser-protecting-other-apps"
+msgstr "à¦à¦°-à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦°-à¦à¦¨à§à¦¯à¦¾à¦¨à§à¦¯-à¦
à§à¦¯à¦¾à¦ª-à¦¸à§à¦°à¦à§à¦·à¦¾"
 
 #: http//localhost/tbb/tbb-14/
 #: (content/tbb/tbb-14/contents+en.lrquestion.seo_slug)
 msgid "installing-add-on-extensions-tor-browser"
-msgstr "installing-add-on-extensions-tor-browser"
+msgstr "à¦à¦¨à¦¸à§à¦à¦²-à¦à¦¡-à¦
à¦¨-à¦à¦à§à¦¸à¦à§à¦¨à¦¶à¦¨-à¦à¦°-à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦°"
 
 #: http//localhost/tbb/tbb-15/
 #: (content/tbb/tbb-15/contents+en.lrquestion.title)
@@ -680,7 +680,7 @@ msgstr ""
 #: http//localhost/tbb/tbb-16/
 #: (content/tbb/tbb-16/contents+en.lrquestion.seo_slug)
 msgid "pick-which-country-i-am-exiting"
-msgstr "pick-which-country-i-am-exiting"
+msgstr 
"à¦à¦®à¦¿-à¦à§à¦¨-à¦¦à§à¦¶-à¦¥à§à¦à§-à¦ªà§à¦°à¦¸à§à¦¥à¦¾à¦¨-à¦à¦°à¦à¦¿"
 
 #: http//localhost/tbb/tbb-17/
 #: (content/tbb/tbb-17/contents+en.lrquestion.title)
@@ -710,7 +710,7 @@ msgstr ""
 #: http//localhost/tbb/tbb-17/
 #: (content/tbb/tbb-17/contents+en.lrquestion.seo_slug)
 msgid "run-tor-browser-and-different-browser"
-msgstr "run-tor-browser-and-different-browser"
+msgstr 
"à¦à¦°-à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦°-à¦à¦¬à¦-à¦¬à¦¿à¦à¦¿à¦¨à§à¦¨-à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦°-à¦à¦¾à¦²à¦¾à¦¨"
 
 #: http//localhost/tbb/tbb-18/
 #: (content/tbb/tbb-18/contents+en.lrquestion.title)
@@ -738,7 +738,7 @@ msgstr ""
 #: http//localhost/tbb/tbb-18/
 #: (content/tbb/tbb-18/contents+en.lrquestion.seo_slug)
 msgid "is-there-support-for-bsd"
-msgstr "is-there-support-for-bsd"
+msgstr "à¦¬à¦¿à¦à¦¸à¦¡à¦¿-à¦à¦¨à§à¦¯-à¦¸à¦®à¦°à§à¦¥à¦¨-à¦à¦à§-à¦à¦¿"
 
 #: http//localhost/tbb/tbb-19/
 #: (content/tbb/tbb-19/contents+en.lrquestion.title)

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

[tor-commits] [chutney/master] Remove unused code for setting TestingV3AuthVotingStartOffset

2018-08-24 Thread teor

commit 1641c18991bbd58b39c27aae33088bc66b6b5c61
Author: teor 
Date:   Fri Aug 24 21:20:33 2018 +1000

Remove unused code for setting TestingV3AuthVotingStartOffset

Chutney has used TestingV3AuthVotingStartOffset 0 for a few years now.

Implements 27298.
---
 tools/bootstrap-network.sh  | 9 -
 torrc_templates/authority.i | 2 --
 2 files changed, 11 deletions(-)

diff --git a/tools/bootstrap-network.sh b/tools/bootstrap-network.sh
index 49afbd8..b18165e 100755
--- a/tools/bootstrap-network.sh
+++ b/tools/bootstrap-network.sh
@@ -54,15 +54,6 @@ export 
CHUTNEY_NETWORK="$CHUTNEY_PATH/networks/$NETWORK_FLAVOUR"
 echo "$myname: bootstrapping network: $flavour"
 "$CHUTNEY" configure "$CHUTNEY_NETWORK"
 
-# TODO: Make 'chutney configure' take an optional offset argument and
-# use the templating system in Chutney to set this instead of editing
-# files like this.
-offset=$(expr \( $(date +%s) + $VOTING_OFFSET \) % 300)
-CONFOPT="TestingV3AuthVotingStartOffset"
-for file in "$CHUTNEY_DATA_DIR"/nodes/*a/torrc ; do
-sed -i.bak -e "s/^${CONFOPT}.*$/${CONFOPT} $offset/1" $file
-done
-
 "$CHUTNEY" start "$CHUTNEY_NETWORK"
 sleep 1
 "$CHUTNEY" status "$CHUTNEY_NETWORK"
diff --git a/torrc_templates/authority.i b/torrc_templates/authority.i
index c2a425f..81c6c9d 100644
--- a/torrc_templates/authority.i
+++ b/torrc_templates/authority.i
@@ -17,5 +17,3 @@ TestingV3AuthInitialVoteDelay 2
 V3AuthVoteDelay 2
 TestingV3AuthInitialDistDelay 2
 V3AuthDistDelay 2
-# This is autoconfigured by chutney, so you probably don't want to use it
-#TestingV3AuthVotingStartOffset 0

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

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

2018-08-24 Thread translation

commit 2cb2146eb577fdd34d7ca42a587715c7e5fc8104
Author: Translation commit bot 
Date:   Fri Aug 24 11:19:05 2018 +

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

diff --git a/contents+bn_BD.po b/contents+bn_BD.po
index 54a16d1c5..c1b719ad5 100644
--- a/contents+bn_BD.po
+++ b/contents+bn_BD.po
@@ -44,15 +44,15 @@ msgstr "Tor Messenger"
 #: http//localhost/tormessenger/
 #: (content/tormessenger/contents+en.lrtopic.seo_slug)
 msgid "tor-messenger"
-msgstr "tor-messenger"
+msgstr "à¦à¦°à§à¦-à¦ªà§à¦°à§à¦°à¦"
 
 #: http//localhost/tormobile/ (content/tormobile/contents+en.lrtopic.title)
 msgid "Tor Mobile"
-msgstr "Tor Mobile"
+msgstr "à¦à¦° à¦®à§à¦¬à¦¾à¦à¦²"
 
 #: http//localhost/tormobile/ (content/tormobile/contents+en.lrtopic.seo_slug)
 msgid "tor-mobile"
-msgstr "tor-mobile"
+msgstr "à¦à¦°-à¦®à§à¦¬à¦¾à¦à¦²"
 
 #: http//localhost/gettor/ (content/gettor/contents+en.lrtopic.title)
 #: (content/gettor/contents+en.lrtopic.seo_slug)
@@ -75,7 +75,7 @@ msgstr "à¦¸à§à¦¨à§à¦¸à¦°à¦¶à¦¿à¦ª"
 #: http//localhost/censorship/
 #: (content/censorship/contents+en.lrtopic.seo_slug)
 msgid "censorship"
-msgstr "censorship"
+msgstr "à¦¸à§à¦¨à§à¦¸à¦°à¦¶à¦¿à¦ª"
 
 #: http//localhost/https/ (content/https/contents+en.lrtopic.title)
 msgid "HTTPS"
@@ -87,29 +87,29 @@ msgstr "https"
 
 #: http//localhost/operators/ (content/operators/contents+en.lrtopic.title)
 msgid "Operators"
-msgstr "Operators"
+msgstr "à¦à¦ªà¦¾à¦°à§à¦à¦°"
 
 #: http//localhost/operators/ (content/operators/contents+en.lrtopic.seo_slug)
 msgid "operators"
-msgstr "operators"
+msgstr "à¦à¦ªà¦¾à¦°à§à¦à¦°"
 
 #: http//localhost/onionservices/
 #: (content/onionservices/contents+en.lrtopic.title)
 msgid "Onion Services"
-msgstr "Onion à¦¸à§à¦¬à¦¾"
+msgstr "à¦à¦¨à¦¿à¦à¦¨ à¦¸à§à¦¬à¦¾"
 
 #: http//localhost/onionservices/
 #: (content/onionservices/contents+en.lrtopic.seo_slug)
 msgid "onion-services"
-msgstr "onion-services"
+msgstr "à¦à¦¨à¦¿à¦à¦¨-à¦¸à§à¦¬à¦¾"
 
 #: http//localhost/misc/ (content/misc/contents+en.lrtopic.title)
 msgid "Misc"
-msgstr "Misc"
+msgstr "à¦¬à¦¿à¦¬à¦¿à¦§"
 
 #: http//localhost/misc/ (content/misc/contents+en.lrtopic.seo_slug)
 msgid "misc"
-msgstr "misc"
+msgstr "à¦¬à¦¿à¦¬à¦¿à¦§"
 
 #: http//localhost/faq/faq-1/ (content/faq/faq-1/contents+en.lrquestion.title)
 #: http//localhost/tbb/tbb-3/ (content/tbb/tbb-3/contents+en.lrquestion.title)
@@ -142,7 +142,7 @@ msgstr ""
 #: http//localhost/faq/faq-1/
 #: (content/faq/faq-1/contents+en.lrquestion.seo_slug)
 msgid "will-anyone-be-able-to-tell-which-website-i-visit"
-msgstr "will-anyone-be-able-to-tell-which-website-i-visit"
+msgstr 
"à¦¯à§-à¦à§à¦-à¦à¦¿-à¦à¦¾à¦¨à¦¾à¦¤à§-à¦ªà¦¾à¦°à¦¬à§à¦¨-à¦à¦®à¦¿-à¦à§à¦¨-à¦à¦¯à¦¼à§à¦¬à¦¸à¦¾à¦à¦-à¦à¦®à¦¿-à¦ªà¦°à¦¿à¦¦à¦°à§à¦¶à¦¨-à¦à¦°à¦¿"
 
 #: http//localhost/faq/faq-2/ (content/faq/faq-2/contents+en.lrquestion.title)
 #: http//localhost/tbb/tbb-8/ (content/tbb/tbb-8/contents+en.lrquestion.title)
@@ -257,7 +257,7 @@ msgstr ""
 #: http//localhost/faq/faq-3/
 #: (content/faq/faq-3/contents+en.lrquestion.seo_slug)
 msgid "install-add-on-extension-tor-browser"
-msgstr "install-add-on-extension-tor-browser"
+msgstr "à¦à¦¨à¦¸à§à¦à¦²-à¦à¦¡-à¦
à¦¨-à¦à¦à§à¦¸à¦à§à¦¨à¦¶à¦¨-à¦à¦°-à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦°"
 
 #: http//localhost/faq/faq-4/ (content/faq/faq-4/contents+en.lrquestion.title)
 #: http//localhost/tbb/tbb-31/
@@ -2564,7 +2564,7 @@ msgstr "# # # # # à¦¸à¦¾à¦§à¦¾à¦°à¦£ à¦²à¦-à¦à¦¨ 
à¦¤à§à¦°à§à¦à¦¿ #1: à¦ªà§
 msgid ""
 "2017-10-29 09:23:40.800 [NOTICE] Opening Socks listener on 127.0.0.1:9150"
 msgstr ""
-"2017-10-29 à§¦à§¯:à§¨à§©:40.800 [à¦¬à¦¿à¦à§à¦à¦ªà§à¦¤à¦¿] 
127.0.0.1-à¦à¦° à¦à¦¦à§à¦¬à§à¦§à¦¨à§ à¦®à§à¦à¦¾ à¦¶à§à¦¨à§à¦¨: 9150"
+"2017-10-29 09:23:40.800 [à¦¬à¦¿à¦à§à¦à¦ªà§à¦¤à¦¿] 127.0.0.1-à¦à¦° 
à¦à¦¦à§à¦¬à§à¦§à¦¨à§ à¦®à§à¦à¦¾ à¦¶à§à¦¨à§à¦¨: 9150"
 
 #: http//localhost/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)
@@ -2880,7 +2880,7 @@ msgid ""
 "entered the 16-character onion address correctly: even a small mistake will "
 "stop Tor Browser from being able to reach the site."
 msgstr ""
-"à¦à¦ªà¦¨à¦¿ à¦¯à¦¦à¦¿ à¦ªà§à¦à¦¯à¦¼à¦¾à¦à§à¦° à¦¸à§à¦¬à¦¾à¦¯à¦¼ 
à¦ªà§à¦à¦à¦¾à¦¤à§ à¦¨à¦¾ à¦ªà¦¾à¦°à§à¦¨, à¦¤à¦¾à¦¹à¦²à§ 
à¦¨à¦¿à¦¶à§à¦à¦¿à¦¤ à¦à¦°à§à¦¨ à¦¯à§ à¦à¦ªà¦¨à¦¿ à§§à§¬ "
+"à¦à¦ªà¦¨à¦¿ à¦¯à¦¦à¦¿ à¦ªà§à¦à¦¯à¦¼à¦¾à¦à§à¦° à¦¸à§à¦¬à¦¾à¦¯à¦¼ 
à¦ªà§à¦à¦à¦¾à¦¤à§ à¦¨à¦¾ à¦ªà¦¾à¦°à§à¦¨, à¦¤à¦¾à¦¹à¦²à§ 
à¦¨à¦¿à¦¶à§à¦à¦¿à¦¤ à¦à¦°à§à¦¨ à¦¯à§ à¦à¦ªà¦¨à¦¿ 16 "
 "à¦à¦à§à¦·à¦°à§à¦° à¦ªà§à¦à¦¯à¦¼à¦¾à¦à§à¦° à¦ à¦¿à¦à¦¾à¦¨à¦¾ à¦¸à¦ 
à¦¿à¦à¦à¦¾à¦¬à§ à¦ªà§à¦°à¦¬à§à¦¶ à¦à¦°à¦¿à¦¯à¦¼à§à¦à§à¦¨: 
à¦à¦®à¦¨à¦à¦¿ à¦à¦à¦à¦¿ à¦à§à¦ à¦à§à¦² à¦à¦ "
 "à¦¸à¦¾à¦à¦à§ à¦ªà§à¦à¦à§ à¦¯à¦¾à¦à¦¯à¦¼à¦¾ à¦¥à§à¦à§ à¦à¦° 
à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦° à¦¬à¦¨à§à¦§ à¦à¦°à§ à¦¦à§à¦¬à§

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

2018-08-24 Thread translation

commit 75112448efad51f514d178fa6ade8373e1b1aa2c
Author: Translation commit bot 
Date:   Fri Aug 24 11:18:59 2018 +

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

diff --git a/contents+bn_BD.po b/contents+bn_BD.po
index 54a16d1c5..c1b719ad5 100644
--- a/contents+bn_BD.po
+++ b/contents+bn_BD.po
@@ -44,15 +44,15 @@ msgstr "Tor Messenger"
 #: http//localhost/tormessenger/
 #: (content/tormessenger/contents+en.lrtopic.seo_slug)
 msgid "tor-messenger"
-msgstr "tor-messenger"
+msgstr "à¦à¦°à§à¦-à¦ªà§à¦°à§à¦°à¦"
 
 #: http//localhost/tormobile/ (content/tormobile/contents+en.lrtopic.title)
 msgid "Tor Mobile"
-msgstr "Tor Mobile"
+msgstr "à¦à¦° à¦®à§à¦¬à¦¾à¦à¦²"
 
 #: http//localhost/tormobile/ (content/tormobile/contents+en.lrtopic.seo_slug)
 msgid "tor-mobile"
-msgstr "tor-mobile"
+msgstr "à¦à¦°-à¦®à§à¦¬à¦¾à¦à¦²"
 
 #: http//localhost/gettor/ (content/gettor/contents+en.lrtopic.title)
 #: (content/gettor/contents+en.lrtopic.seo_slug)
@@ -75,7 +75,7 @@ msgstr "à¦¸à§à¦¨à§à¦¸à¦°à¦¶à¦¿à¦ª"
 #: http//localhost/censorship/
 #: (content/censorship/contents+en.lrtopic.seo_slug)
 msgid "censorship"
-msgstr "censorship"
+msgstr "à¦¸à§à¦¨à§à¦¸à¦°à¦¶à¦¿à¦ª"
 
 #: http//localhost/https/ (content/https/contents+en.lrtopic.title)
 msgid "HTTPS"
@@ -87,29 +87,29 @@ msgstr "https"
 
 #: http//localhost/operators/ (content/operators/contents+en.lrtopic.title)
 msgid "Operators"
-msgstr "Operators"
+msgstr "à¦à¦ªà¦¾à¦°à§à¦à¦°"
 
 #: http//localhost/operators/ (content/operators/contents+en.lrtopic.seo_slug)
 msgid "operators"
-msgstr "operators"
+msgstr "à¦à¦ªà¦¾à¦°à§à¦à¦°"
 
 #: http//localhost/onionservices/
 #: (content/onionservices/contents+en.lrtopic.title)
 msgid "Onion Services"
-msgstr "Onion à¦¸à§à¦¬à¦¾"
+msgstr "à¦à¦¨à¦¿à¦à¦¨ à¦¸à§à¦¬à¦¾"
 
 #: http//localhost/onionservices/
 #: (content/onionservices/contents+en.lrtopic.seo_slug)
 msgid "onion-services"
-msgstr "onion-services"
+msgstr "à¦à¦¨à¦¿à¦à¦¨-à¦¸à§à¦¬à¦¾"
 
 #: http//localhost/misc/ (content/misc/contents+en.lrtopic.title)
 msgid "Misc"
-msgstr "Misc"
+msgstr "à¦¬à¦¿à¦¬à¦¿à¦§"
 
 #: http//localhost/misc/ (content/misc/contents+en.lrtopic.seo_slug)
 msgid "misc"
-msgstr "misc"
+msgstr "à¦¬à¦¿à¦¬à¦¿à¦§"
 
 #: http//localhost/faq/faq-1/ (content/faq/faq-1/contents+en.lrquestion.title)
 #: http//localhost/tbb/tbb-3/ (content/tbb/tbb-3/contents+en.lrquestion.title)
@@ -142,7 +142,7 @@ msgstr ""
 #: http//localhost/faq/faq-1/
 #: (content/faq/faq-1/contents+en.lrquestion.seo_slug)
 msgid "will-anyone-be-able-to-tell-which-website-i-visit"
-msgstr "will-anyone-be-able-to-tell-which-website-i-visit"
+msgstr 
"à¦¯à§-à¦à§à¦-à¦à¦¿-à¦à¦¾à¦¨à¦¾à¦¤à§-à¦ªà¦¾à¦°à¦¬à§à¦¨-à¦à¦®à¦¿-à¦à§à¦¨-à¦à¦¯à¦¼à§à¦¬à¦¸à¦¾à¦à¦-à¦à¦®à¦¿-à¦ªà¦°à¦¿à¦¦à¦°à§à¦¶à¦¨-à¦à¦°à¦¿"
 
 #: http//localhost/faq/faq-2/ (content/faq/faq-2/contents+en.lrquestion.title)
 #: http//localhost/tbb/tbb-8/ (content/tbb/tbb-8/contents+en.lrquestion.title)
@@ -257,7 +257,7 @@ msgstr ""
 #: http//localhost/faq/faq-3/
 #: (content/faq/faq-3/contents+en.lrquestion.seo_slug)
 msgid "install-add-on-extension-tor-browser"
-msgstr "install-add-on-extension-tor-browser"
+msgstr "à¦à¦¨à¦¸à§à¦à¦²-à¦à¦¡-à¦
à¦¨-à¦à¦à§à¦¸à¦à§à¦¨à¦¶à¦¨-à¦à¦°-à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦°"
 
 #: http//localhost/faq/faq-4/ (content/faq/faq-4/contents+en.lrquestion.title)
 #: http//localhost/tbb/tbb-31/
@@ -2564,7 +2564,7 @@ msgstr "# # # # # à¦¸à¦¾à¦§à¦¾à¦°à¦£ à¦²à¦-à¦à¦¨ 
à¦¤à§à¦°à§à¦à¦¿ #1: à¦ªà§
 msgid ""
 "2017-10-29 09:23:40.800 [NOTICE] Opening Socks listener on 127.0.0.1:9150"
 msgstr ""
-"2017-10-29 à§¦à§¯:à§¨à§©:40.800 [à¦¬à¦¿à¦à§à¦à¦ªà§à¦¤à¦¿] 
127.0.0.1-à¦à¦° à¦à¦¦à§à¦¬à§à¦§à¦¨à§ à¦®à§à¦à¦¾ à¦¶à§à¦¨à§à¦¨: 9150"
+"2017-10-29 09:23:40.800 [à¦¬à¦¿à¦à§à¦à¦ªà§à¦¤à¦¿] 127.0.0.1-à¦à¦° 
à¦à¦¦à§à¦¬à§à¦§à¦¨à§ à¦®à§à¦à¦¾ à¦¶à§à¦¨à§à¦¨: 9150"
 
 #: http//localhost/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)
@@ -2880,7 +2880,7 @@ msgid ""
 "entered the 16-character onion address correctly: even a small mistake will "
 "stop Tor Browser from being able to reach the site."
 msgstr ""
-"à¦à¦ªà¦¨à¦¿ à¦¯à¦¦à¦¿ à¦ªà§à¦à¦¯à¦¼à¦¾à¦à§à¦° à¦¸à§à¦¬à¦¾à¦¯à¦¼ 
à¦ªà§à¦à¦à¦¾à¦¤à§ à¦¨à¦¾ à¦ªà¦¾à¦°à§à¦¨, à¦¤à¦¾à¦¹à¦²à§ 
à¦¨à¦¿à¦¶à§à¦à¦¿à¦¤ à¦à¦°à§à¦¨ à¦¯à§ à¦à¦ªà¦¨à¦¿ à§§à§¬ "
+"à¦à¦ªà¦¨à¦¿ à¦¯à¦¦à¦¿ à¦ªà§à¦à¦¯à¦¼à¦¾à¦à§à¦° à¦¸à§à¦¬à¦¾à¦¯à¦¼ 
à¦ªà§à¦à¦à¦¾à¦¤à§ à¦¨à¦¾ à¦ªà¦¾à¦°à§à¦¨, à¦¤à¦¾à¦¹à¦²à§ 
à¦¨à¦¿à¦¶à§à¦à¦¿à¦¤ à¦à¦°à§à¦¨ à¦¯à§ à¦à¦ªà¦¨à¦¿ 16 "
 "à¦à¦à§à¦·à¦°à§à¦° à¦ªà§à¦à¦¯à¦¼à¦¾à¦à§à¦° à¦ à¦¿à¦à¦¾à¦¨à¦¾ à¦¸à¦ 
à¦¿à¦à¦à¦¾à¦¬à§ à¦ªà§à¦°à¦¬à§à¦¶ à¦à¦°à¦¿à¦¯à¦¼à§à¦à§à¦¨: 
à¦à¦®à¦¨à¦à¦¿ à¦à¦à¦à¦¿ à¦à§à¦ à¦à§à¦² à¦à¦ "
 "à¦¸à¦¾à¦à¦à§ à¦ªà§à¦à¦à§ à¦¯à¦¾à¦à¦¯à¦¼à¦¾ à¦¥à§à¦à§ à¦à¦° 
à¦¬à§à¦°à¦¾à¦à¦à¦¾à¦° à¦¬à¦¨à§à¦§ à¦à¦°à§ à¦¦à§à¦¬à§ à¥¤"

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

2018-08-24 Thread translation

commit dd464154e69ad4552d9b488fcb3cb3749ddf9f15
Author: Translation commit bot 
Date:   Fri Aug 24 11:16:46 2018 +

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

diff --git a/fi/android_strings.dtd b/fi/android_strings.dtd
index dc70535d4..a6386e9c6 100644
--- a/fi/android_strings.dtd
+++ b/fi/android_strings.dtd
@@ -380,7 +380,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [torbutton/master] Bug 26962: Circuit display onboarding

2018-08-24 Thread gk

commit dca195a191bf897680dde1363d12f7262dd26910
Author: Kathy Brade 
Date:   Thu Aug 23 10:26:10 2018 -0400

Bug 26962: Circuit display onboarding

Add strings needed for circuit display onboarding.
---
 src/chrome/locale/en/browserOnboarding.properties | 16 
 1 file changed, 16 insertions(+)

diff --git a/src/chrome/locale/en/browserOnboarding.properties 
b/src/chrome/locale/en/browserOnboarding.properties
index 362eefea..49085fba 100644
--- a/src/chrome/locale/en/browserOnboarding.properties
+++ b/src/chrome/locale/en/browserOnboarding.properties
@@ -36,3 +36,19 @@ onboarding.tour-tor-onion-services=Onion Services
 onboarding.tour-tor-onion-services.title=Onion Services
 onboarding.tour-tor-onion-services.description=Finally we would like to 
introduce you to Onion services. For ultimate privacy and security, sites 
ending in .onion are configured using the Tor network. Onion services provide 
extra protections to publishers and visitors, including added safeguards 
against censorship. The same way our Browser allows you to browse the web 
anonymously our onion services allow people to provide content and services 
anonymously. You will notice a little onion icon in the URL bar when accessing 
these services. Click below to see the NYTimes onion services and how they work.
 onboarding.tour-tor-onion-services.button=Visit an Onion
+
+# Circuit Display onboarding.
+onboarding.tor-circuit-display.next=Next
+onboarding.tor-circuit-display.done=Done
+onboarding.tor-circuit-display.one-of-three=1 of 3
+onboarding.tor-circuit-display.two-of-three=2 of 3
+onboarding.tor-circuit-display.three-of-three=3 of 3
+
+onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly 
assigned relays, which are computers around the world configured to forward Tor 
traffic. Circuits allow you to browse privately and to connect to onion 
services.
+
+onboarding.tor-circuit-display.diagram.title=Circuit Display
+onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that 
make up the circuit for this website. To prevent linking of activity across 
different sites, each website gets a different circuit.
+
+onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
+onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect 
to the website youâre trying to visit or it is not loading properly, then you 
can use this button to reload the site with a new circuit.

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

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

2018-08-24 Thread translation

commit 617c28042212f960567acb7df4f9771c1b570c20
Author: Translation commit bot 
Date:   Fri Aug 24 10:18:06 2018 +

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

diff --git a/it/abouttor.properties b/it/abouttor.properties
index 360dba0cf..fcaa329d2 100644
--- a/it/abouttor.properties
+++ b/it/abouttor.properties
@@ -2,9 +2,9 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.donationBanner.donate=Dona adesso!
+aboutTor.donationBanner.donate=Dona Adesso!
 
-aboutTor.donationBanner.slogan=Tor: alimentiamo la resistenza digitale
+aboutTor.donationBanner.slogan=Tor: Alimentiamo la Resistenza Digitale
 aboutTor.donationBanner.mozilla=Dona oggi e Mozilla ricambierÃ  il regalo!
 
 aboutTor.donationBanner.tagline1=Proteggiamo giornalisti, informatori e 
attivisti dal 2006
@@ -12,3 +12,6 @@ aboutTor.donationBanner.tagline2=Rendiamo la rete libera nel 
mondo
 aboutTor.donationBanner.tagline3=LibertÃ  online
 aboutTor.donationBanner.tagline4=Promuoviamo la libertÃ  di parola nel mondo
 aboutTor.donationBanner.tagline5=Proteggiamo la privacy di milioni di persone 
ogni giorno
+
+aboutTor.newsletter.tagline=Ottieni le ultime info da Tor direttamente nella 
tua casella di posta elettronica.
+aboutTor.newsletter.link_text=Registrati alle Tor News.

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

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

2018-08-24 Thread translation

commit a48a9ea4cb396e7fc00080fa0d3918f36f7ac07a
Author: Translation commit bot 
Date:   Fri Aug 24 10:18:00 2018 +

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

diff --git a/it/abouttor.properties b/it/abouttor.properties
index 65aa5fd37..fcaa329d2 100644
--- a/it/abouttor.properties
+++ b/it/abouttor.properties
@@ -2,9 +2,9 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.donationBanner.donate=Dona adesso!
+aboutTor.donationBanner.donate=Dona Adesso!
 
-aboutTor.donationBanner.slogan=Tor: alimentiamo la resistenza digitale
+aboutTor.donationBanner.slogan=Tor: Alimentiamo la Resistenza Digitale
 aboutTor.donationBanner.mozilla=Dona oggi e Mozilla ricambierÃ  il regalo!
 
 aboutTor.donationBanner.tagline1=Proteggiamo giornalisti, informatori e 
attivisti dal 2006
@@ -13,5 +13,5 @@ aboutTor.donationBanner.tagline3=LibertÃ  online
 aboutTor.donationBanner.tagline4=Promuoviamo la libertÃ  di parola nel mondo
 aboutTor.donationBanner.tagline5=Proteggiamo la privacy di milioni di persone 
ogni giorno
 
-aboutTor.newsletter.tagline=Get the latest news from Tor straight to your 
inbox.
-aboutTor.newsletter.link_text=Sign up for Tor News.
+aboutTor.newsletter.tagline=Ottieni le ultime info da Tor direttamente nella 
tua casella di posta elettronica.
+aboutTor.newsletter.link_text=Registrati alle Tor News.

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

1 2 >

1 - 100 of 124 matches

Mail list logo