date:20191017

[tor-commits] [tor/master] core: tabify a line in include.am

2019-10-17 Thread teor

commit 1697019d5f4b7306f4c7ffb54178530461a54a52
Author: teor 
Date:   Fri Oct 18 13:42:22 2019 +1000

core: tabify a line in include.am
---
 src/core/include.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/include.am b/src/core/include.am
index f6ae3f2b5..a5d11c24f 100644
--- a/src/core/include.am
+++ b/src/core/include.am
@@ -323,7 +323,7 @@ noinst_HEADERS +=   \
src/feature/control/fmt_serverstatus.h  \
src/feature/control/getinfo_geoip.h \
src/feature/dirauth/authmode.h  \
-src/feature/dirauth/bridgeauth.h   \
+   src/feature/dirauth/bridgeauth.h\
src/feature/dirauth/bwauth.h\
src/feature/dirauth/dirauth_periodic.h  \
src/feature/dirauth/dirauth_sys.h   \

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

[tor-commits] [onionoo/master] Always clear old reverse DNS lookups.

2019-10-17 Thread karsten

commit 6faa1ab757f16263f7925dbe4c49d6dfb698f265
Author: Karsten Loesing 
Date:   Thu Oct 3 16:43:21 2019 +0200

Always clear old reverse DNS lookups.

The fix is to distinguish between lookup results being null for a
given fingerprint (because we didn't have enough time to look up an
address) and the empty set (because we received 0 verified or 0
unverified host names in response).

Fixes #31941.
---
 CHANGELOG.md   |  9 -
 .../metrics/onionoo/updater/NodeDetailsStatusUpdater.java  |  4 ++--
 .../metrics/onionoo/updater/RdnsLookupRequest.java | 14 +++---
 .../metrics/onionoo/updater/RdnsLookupWorker.java  |  4 ++--
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 696b33d..3ab6329 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,11 @@
-# Changes in version 7.0-1.20.0 - 2019-0?-??
+# Changes in version 7.0-1.21.0 - 2019-1?-??
+
+ * Medium changes
+   - Fix a bug where old reverse DNS lookups were sometimes not
+ cleared properly.
+
+
+# Changes in version 7.0-1.20.0 - 2019-10-04
 
  * Medium changes
- Use Ivy for resolving external dependencies rather than relying
diff --git 
a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java
 
b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java
index 2bdf03f..a5f16e4 100644
--- 
a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java
+++ 
b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java
@@ -771,10 +771,10 @@ public class NodeDetailsStatusUpdater implements 
DescriptorListener,
   verifiedLookupResults.get(nodeStatus.getAddress());
   SortedSet unverifiedHostNames =
   unverifiedLookupResults.get(nodeStatus.getAddress());
-  if (null != verifiedHostNames && !verifiedHostNames.isEmpty()) {
+  if (null != verifiedHostNames) {
 this.rdnsVerifiedLookupResults.put(fingerprint, verifiedHostNames);
   }
-  if (null != unverifiedHostNames && !unverifiedHostNames.isEmpty()) {
+  if (null != unverifiedHostNames) {
 this.rdnsUnverifiedLookupResults.put(fingerprint, unverifiedHostNames);
   }
 }
diff --git 
a/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupRequest.java 
b/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupRequest.java
index 2f598a4..53e3fa9 100644
--- 
a/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupRequest.java
+++ 
b/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupRequest.java
@@ -39,9 +39,9 @@ class RdnsLookupRequest extends Thread {
   @Override
   public void run() {
 this.lookupStartedMillis = System.currentTimeMillis();
+final SortedSet verifiedResults = new TreeSet<>();
+final SortedSet unverifiedResults = new TreeSet<>();
 try {
-  final SortedSet verifiedResults = new TreeSet<>();
-  final SortedSet unverifiedResults = new TreeSet<>();
   final String[] bytes = this.address.split("\\.");
   if (bytes.length == 4) {
 final String reverseDnsDomain =
@@ -69,15 +69,15 @@ class RdnsLookupRequest extends Thread {
   }
 }
   }
-  synchronized (this) {
-this.verifiedHostNames = verifiedResults;
-this.unverifiedHostNames = unverifiedResults;
-  }
 } catch (NamingException e) {
   /* The Onionoo field is omitted for both lookup failure and absence of
* a host name. We'll try again the next time. */
 }
-this.lookupCompletedMillis = System.currentTimeMillis();
+synchronized (this) {
+  this.verifiedHostNames = verifiedResults;
+  this.unverifiedHostNames = unverifiedResults;
+  this.lookupCompletedMillis = System.currentTimeMillis();
+}
 this.parent.interrupt();
   }
 
diff --git 
a/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupWorker.java 
b/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupWorker.java
index ab5360e..6353daa 100644
--- a/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupWorker.java
+++ b/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupWorker.java
@@ -40,7 +40,7 @@ class RdnsLookupWorker extends Thread {
 /* Getting interrupted should be the default case. */
   }
   SortedSet verifiedHostNames = request.getVerifiedHostNames();
-  if (null != verifiedHostNames && !verifiedHostNames.isEmpty()) {
+  if (null != verifiedHostNames) {
 synchronized (this.reverseDomainNameResolver
 .rdnsVerifiedLookupResults) {
   this.reverseDomainNameResolver.rdnsVerifiedLookupResults.put(
@@ -48,7 +48,7 @@ class RdnsLookupWorker extends Thread {
 }
   }
   SortedSet unverifiedHostNames = request.getUnverifiedHostNames();
-  if (null != unverifiedHostNames && !unverifiedHostNames.isEmpty())

[tor-commits] [tor-browser/tor-browser-68.1.0esr-9.0-3] Bug 31144 - Do not switching apps from CustomTabs without consent

2019-10-17 Thread gk

commit d5123da897516717e62db98dccbcabd70162dcb3
Author: Matthew Finkel 
Date:   Fri Oct 18 00:57:00 2019 +

Bug 31144 - Do not switching apps from CustomTabs without consent
---
 .../base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java 
b/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java
index 230773cd1292..872fe9723001 100644
--- 
a/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java
+++ 
b/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java
@@ -621,7 +621,8 @@ public class CustomTabsActivity extends AppCompatActivity
 final Intent intent = new Intent(Intent.ACTION_VIEW);
 intent.setData(uri);
 try {
-startActivity(intent);
+// Bug 31144 - Don't know how to handle this case.
+//startActivity(intent);
 } catch (ActivityNotFoundException e) {
 Log.w(LOGTAG, "No activity handler found for: " + request.uri);
 }

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

[tor-commits] [translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed

2019-10-17 Thread translation

commit aae3212e393bb4be15947a1b0ed7229c0d6f4ffd
Author: Translation commit bot 
Date:   Fri Oct 18 02:15:24 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
---
 ru/LC_MESSAGES/bridgedb.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ru/LC_MESSAGES/bridgedb.po b/ru/LC_MESSAGES/bridgedb.po
index a5f47426a..69cca74bc 100644
--- a/ru/LC_MESSAGES/bridgedb.po
+++ b/ru/LC_MESSAGES/bridgedb.po
@@ -19,6 +19,7 @@
 # Oleg, 2014
 # Roberto Brigante, 2017
 # Sergey Briskin, 2014
+# Sergey Smirnov , 2019
 # solokot , 2019
 # solokot , 2018
 # Valid Olov, 2014
@@ -31,8 +32,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-06 10:47+\n"
-"Last-Translator: solokot \n"
+"PO-Revision-Date: 2019-10-18 01:48+\n"
+"Last-Translator: Sergey Smirnov \n"
 "Language-Team: Russian 
(http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb

2019-10-17 Thread translation

commit e7a352b0632e0100b97bde917ebe4cace8f5869f
Author: Translation commit bot 
Date:   Fri Oct 18 02:15:16 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
---
 ru/LC_MESSAGES/bridgedb.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ru/LC_MESSAGES/bridgedb.po b/ru/LC_MESSAGES/bridgedb.po
index f8a0f22c5..81d746326 100644
--- a/ru/LC_MESSAGES/bridgedb.po
+++ b/ru/LC_MESSAGES/bridgedb.po
@@ -19,6 +19,7 @@
 # Oleg, 2014
 # Roberto Brigante, 2017
 # Sergey Briskin, 2014
+# Sergey Smirnov , 2019
 # solokot , 2019
 # solokot , 2018
 # Valid Olov, 2014
@@ -31,8 +32,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-06 10:47+\n"
-"Last-Translator: solokot \n"
+"PO-Revision-Date: 2019-10-18 01:48+\n"
+"Last-Translator: Sergey Smirnov \n"
 "Language-Team: Russian 
(http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -127,7 +128,7 @@ msgstr "ÐÐ° Ð´Ð°Ð½Ð½ÑÐ¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ Ð½ÐµÑ 
Ð´Ð¾ÑÑÑÐ¿Ð½ÑÑ Ð¼Ð¾ÑÑÐ¾Ð²...
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
-msgstr "ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ð²Ð°Ð¼ ÑÑÐ¾Ð¸Ñ Ð¿Ð¾Ð¿ÑÐ¾Ð±Ð¾Ð²Ð°ÑÑ %s 
Ð²ÐµÑÐ½ÑÑÑÑÑ%s Ð¸ Ð²ÑÐ±ÑÐ°ÑÑ Ð´ÑÑÐ³Ð¾Ð¹ ÑÐ¸Ð¿ Ð¼Ð¾ÑÑÐ°!"
+msgstr "ÐÐ¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ð²Ð°Ð¼ ÑÑÐ¾Ð¸Ñ Ð¿Ð¾Ð¿ÑÐ¾Ð±Ð¾Ð²Ð°ÑÑ %s 
Ð²ÐµÑÐ½ÑÑÑÑÑ %s Ð¸ Ð²ÑÐ±ÑÐ°ÑÑ Ð´ÑÑÐ³Ð¾Ð¹ ÑÐ¸Ð¿ Ð¼Ð¾ÑÑÐ°!"
 
 #: bridgedb/distributors/https/templates/index.html:11
 #, python-format

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

[tor-commits] [tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1407' into maint-0.4.2

2019-10-17 Thread teor

commit f73c8bd7865a8a64d46c126ca7e206204510ace8
Merge: 8ac9af233 09e6c0f7c
Author: teor 
Date:   Fri Oct 18 12:05:07 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1407' into maint-0.4.2

 changes/ticket32063  |  3 +++
 src/feature/hs/hs_cell.c | 13 +
 2 files changed, 12 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.4.2] hs-v3: Fix possible memory leak in error code path

2019-10-17 Thread teor

commit 09e6c0f7c7b91a73c73df197e45072a96240ea8d
Author: David Goulet 
Date:   Tue Oct 15 08:54:11 2019 -0400

hs-v3: Fix possible memory leak in error code path

Found by coverity CID 1454769.

There were a second possible leak that is also fixed in this commit.

Fixes #32063

Signed-off-by: David Goulet 
---
 changes/ticket32063  |  3 +++
 src/feature/hs/hs_cell.c | 13 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/changes/ticket32063 b/changes/ticket32063
new file mode 100644
index 0..2c0246917
--- /dev/null
+++ b/changes/ticket32063
@@ -0,0 +1,3 @@
+  o Minor bugfixes (hs-v3, memory leak):
+- Fix memory leak in unlikely error code path when encoding HS DoS 
establish
+  intro extension cell. Fixes bug 32063; bugfix on 0.4.2.1-alpha.
diff --git a/src/feature/hs/hs_cell.c b/src/feature/hs/hs_cell.c
index d691a1b00..df59f73c1 100644
--- a/src/feature/hs/hs_cell.c
+++ b/src/feature/hs/hs_cell.c
@@ -503,8 +503,8 @@ build_establish_intro_dos_extension(const 
hs_service_config_t *service_config,
   ssize_t ret;
   size_t dos_ext_encoded_len;
   uint8_t *field_array;
-  trn_cell_extension_field_t *field;
-  trn_cell_extension_dos_t *dos_ext;
+  trn_cell_extension_field_t *field = NULL;
+  trn_cell_extension_dos_t *dos_ext = NULL;
 
   tor_assert(service_config);
   tor_assert(extensions);
@@ -530,7 +530,7 @@ build_establish_intro_dos_extension(const 
hs_service_config_t *service_config,
   /* Set the field with the encoded DoS extension. */
   ret = trn_cell_extension_dos_encoded_len(dos_ext);
   if (BUG(ret <= 0)) {
-return -1;
+goto err;
   }
   dos_ext_encoded_len = ret;
   /* Set length field and the field array size length. */
@@ -541,7 +541,7 @@ build_establish_intro_dos_extension(const 
hs_service_config_t *service_config,
   ret = trn_cell_extension_dos_encode(field_array,
  trn_cell_extension_field_getlen_field(field), dos_ext);
   if (BUG(ret <= 0)) {
-return -1;
+goto err;
   }
   tor_assert(ret == (ssize_t) dos_ext_encoded_len);
 
@@ -557,6 +557,11 @@ build_establish_intro_dos_extension(const 
hs_service_config_t *service_config,
   trn_cell_extension_dos_free(dos_ext);
 
   return 0;
+
+ err:
+  trn_cell_extension_field_free(field);
+  trn_cell_extension_dos_free(dos_ext);
+  return -1;
 }
 
 /* == */



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

[tor-commits] [tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1407' into maint-0.4.2

2019-10-17 Thread teor

commit f73c8bd7865a8a64d46c126ca7e206204510ace8
Merge: 8ac9af233 09e6c0f7c
Author: teor 
Date:   Fri Oct 18 12:05:07 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1407' into maint-0.4.2

 changes/ticket32063  |  3 +++
 src/feature/hs/hs_cell.c | 13 +
 2 files changed, 12 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.4.2] hs-v3: Fix possible memory leak in error code path

2019-10-17 Thread teor

commit 09e6c0f7c7b91a73c73df197e45072a96240ea8d
Author: David Goulet 
Date:   Tue Oct 15 08:54:11 2019 -0400

hs-v3: Fix possible memory leak in error code path

Found by coverity CID 1454769.

There were a second possible leak that is also fixed in this commit.

Fixes #32063

Signed-off-by: David Goulet 
---
 changes/ticket32063  |  3 +++
 src/feature/hs/hs_cell.c | 13 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/changes/ticket32063 b/changes/ticket32063
new file mode 100644
index 0..2c0246917
--- /dev/null
+++ b/changes/ticket32063
@@ -0,0 +1,3 @@
+  o Minor bugfixes (hs-v3, memory leak):
+- Fix memory leak in unlikely error code path when encoding HS DoS 
establish
+  intro extension cell. Fixes bug 32063; bugfix on 0.4.2.1-alpha.
diff --git a/src/feature/hs/hs_cell.c b/src/feature/hs/hs_cell.c
index d691a1b00..df59f73c1 100644
--- a/src/feature/hs/hs_cell.c
+++ b/src/feature/hs/hs_cell.c
@@ -503,8 +503,8 @@ build_establish_intro_dos_extension(const 
hs_service_config_t *service_config,
   ssize_t ret;
   size_t dos_ext_encoded_len;
   uint8_t *field_array;
-  trn_cell_extension_field_t *field;
-  trn_cell_extension_dos_t *dos_ext;
+  trn_cell_extension_field_t *field = NULL;
+  trn_cell_extension_dos_t *dos_ext = NULL;
 
   tor_assert(service_config);
   tor_assert(extensions);
@@ -530,7 +530,7 @@ build_establish_intro_dos_extension(const 
hs_service_config_t *service_config,
   /* Set the field with the encoded DoS extension. */
   ret = trn_cell_extension_dos_encoded_len(dos_ext);
   if (BUG(ret <= 0)) {
-return -1;
+goto err;
   }
   dos_ext_encoded_len = ret;
   /* Set length field and the field array size length. */
@@ -541,7 +541,7 @@ build_establish_intro_dos_extension(const 
hs_service_config_t *service_config,
   ret = trn_cell_extension_dos_encode(field_array,
  trn_cell_extension_field_getlen_field(field), dos_ext);
   if (BUG(ret <= 0)) {
-return -1;
+goto err;
   }
   tor_assert(ret == (ssize_t) dos_ext_encoded_len);
 
@@ -557,6 +557,11 @@ build_establish_intro_dos_extension(const 
hs_service_config_t *service_config,
   trn_cell_extension_dos_free(dos_ext);
 
   return 0;
+
+ err:
+  trn_cell_extension_field_free(field);
+  trn_cell_extension_dos_free(dos_ext);
+  return -1;
 }
 
 /* == */



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

[tor-commits] [tor/master] hs-v3: Fix possible memory leak in error code path

2019-10-17 Thread teor

commit 09e6c0f7c7b91a73c73df197e45072a96240ea8d
Author: David Goulet 
Date:   Tue Oct 15 08:54:11 2019 -0400

hs-v3: Fix possible memory leak in error code path

Found by coverity CID 1454769.

There were a second possible leak that is also fixed in this commit.

Fixes #32063

Signed-off-by: David Goulet 
---
 changes/ticket32063  |  3 +++
 src/feature/hs/hs_cell.c | 13 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/changes/ticket32063 b/changes/ticket32063
new file mode 100644
index 0..2c0246917
--- /dev/null
+++ b/changes/ticket32063
@@ -0,0 +1,3 @@
+  o Minor bugfixes (hs-v3, memory leak):
+- Fix memory leak in unlikely error code path when encoding HS DoS 
establish
+  intro extension cell. Fixes bug 32063; bugfix on 0.4.2.1-alpha.
diff --git a/src/feature/hs/hs_cell.c b/src/feature/hs/hs_cell.c
index d691a1b00..df59f73c1 100644
--- a/src/feature/hs/hs_cell.c
+++ b/src/feature/hs/hs_cell.c
@@ -503,8 +503,8 @@ build_establish_intro_dos_extension(const 
hs_service_config_t *service_config,
   ssize_t ret;
   size_t dos_ext_encoded_len;
   uint8_t *field_array;
-  trn_cell_extension_field_t *field;
-  trn_cell_extension_dos_t *dos_ext;
+  trn_cell_extension_field_t *field = NULL;
+  trn_cell_extension_dos_t *dos_ext = NULL;
 
   tor_assert(service_config);
   tor_assert(extensions);
@@ -530,7 +530,7 @@ build_establish_intro_dos_extension(const 
hs_service_config_t *service_config,
   /* Set the field with the encoded DoS extension. */
   ret = trn_cell_extension_dos_encoded_len(dos_ext);
   if (BUG(ret <= 0)) {
-return -1;
+goto err;
   }
   dos_ext_encoded_len = ret;
   /* Set length field and the field array size length. */
@@ -541,7 +541,7 @@ build_establish_intro_dos_extension(const 
hs_service_config_t *service_config,
   ret = trn_cell_extension_dos_encode(field_array,
  trn_cell_extension_field_getlen_field(field), dos_ext);
   if (BUG(ret <= 0)) {
-return -1;
+goto err;
   }
   tor_assert(ret == (ssize_t) dos_ext_encoded_len);
 
@@ -557,6 +557,11 @@ build_establish_intro_dos_extension(const 
hs_service_config_t *service_config,
   trn_cell_extension_dos_free(dos_ext);
 
   return 0;
+
+ err:
+  trn_cell_extension_field_free(field);
+  trn_cell_extension_dos_free(dos_ext);
+  return -1;
 }
 
 /* == */



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

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

2019-10-17 Thread teor

commit d616214e474084fd6fc0af122f699e9dd2ad02d1
Merge: 800b823c2 f73c8bd78
Author: teor 
Date:   Fri Oct 18 12:05:20 2019 +1000

Merge branch 'maint-0.4.2'

 changes/ticket32063  |  3 +++
 src/feature/hs/hs_cell.c | 13 +
 2 files changed, 12 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 remote-tracking branch 'tor-github/pr/1407' into maint-0.4.2

2019-10-17 Thread teor

commit f73c8bd7865a8a64d46c126ca7e206204510ace8
Merge: 8ac9af233 09e6c0f7c
Author: teor 
Date:   Fri Oct 18 12:05:07 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1407' into maint-0.4.2

 changes/ticket32063  |  3 +++
 src/feature/hs/hs_cell.c | 13 +
 2 files changed, 12 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/snowflakeaddon-messages.json_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed

2019-10-17 Thread translation

commit b11d360c1ea50260451a6eba02886b58cdd447d6
Author: Translation commit bot 
Date:   Thu Oct 17 23:47:10 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed
---
 da/messages.json | 48 
 1 file changed, 48 insertions(+)

diff --git a/da/messages.json b/da/messages.json
index e83a0fdd3..0d638c7d4 100644
--- a/da/messages.json
+++ b/da/messages.json
@@ -28,5 +28,53 @@
   },
   "badgeCookiesOff": {
 "message": "Cookies are not enabled."
+  },
+  "websiteIntro": {
+"message": "Snowflake is a system to defeat internet censorship. People 
who are censored can use Snowflake to access the internet. Their connection 
goes through Snowflake proxies, which are run by volunteers. For more detailed 
information about how Snowflake works see our https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\"; 
data-msgid=\"__MSG_docWiki__\">documentation wiki."
+  },
+  "docWiki": {
+"message": "documentation wiki"
+  },
+  "browser": {
+"message": "Browser"
+  },
+  "censoredUsers": {
+"message": "If your internet access is censored, you should download https://www.torproject.org/download/\";>Tor Browser."
+  },
+  "extension": {
+"message": "Extension"
+  },
+  "installExtension": {
+"message": "If your internet access is not censored, you 
should consider installing the Snowflake extension to help users in censored 
networks. There is no need to worry about which websites people are accessing 
through your proxy. Their visible browsing IP address will match their Tor exit 
node, not yours."
+  },
+  "installFirefox": {
+"message": "Install in Firefox"
+  },
+  "installChrome": {
+"message": "Install in Chrome"
+  },
+  "reportingBugs": {
+"message": "Reporting Bugs"
+  },
+  "fileBug": {
+"message": "If you encounter problems with Snowflake as a client or a 
proxy, please consider filing a bug.  To do so, you will have to,"
+  },
+  "sharedAccount": {
+"message": "Either https://trac.torproject.org/projects/tor/register\";>create an 
account or https://trac.torproject.org/projects/tor/login\";>log 
in using the shared cypherpunks account with password 
writecode."
+  },
+  "bugTracker": {
+"message": "https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake\";>File
 a ticket using our bug tracker."
+  },
+  "descriptive": {
+"message": "Please try to be as descriptive as possible with your ticket 
and if possible include log messages that will help us reproduce the bug. 
Consider adding keywords snowflake-webextension or 
snowflake-client to let us know how which part of the Snowflake system 
is experiencing problems."
+  },
+  "embed": {
+"message": "Embed"
+  },
+  "possible": {
+"message": "It is now possible to embed the Snowflake badge on any 
website:"
+  },
+  "looksLike": {
+"message": "Which looks like this:"
   }
 }

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

[tor-commits] [translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json

2019-10-17 Thread translation

commit 0159b416c9927975f8a30b80c2637e7d0a1a8e4d
Author: Translation commit bot 
Date:   Thu Oct 17 23:47:05 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
---
 da/messages.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/da/messages.json b/da/messages.json
index 7a013ccc0..1b437c6de 100644
--- a/da/messages.json
+++ b/da/messages.json
@@ -30,7 +30,7 @@
 "message": "Cookies er ikke aktiveret."
   },
   "websiteIntro": {
-"message": "Snowflake is a system to defeat internet censorship. People 
who are censored can use Snowflake to access the internet. Their connection 
goes through Snowflake proxies, which are run by volunteers. For more detailed 
information about how Snowflake works see our https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\"; 
data-msgid=\"__MSG_docWiki__\">documentation wiki."
+"message": "Snowflake er et system til at bekÃ¦mpe internetcensur. 
Personer som er udsat for censur kan bruge Snowflake til at tilgÃ¥ internettet. 
Deres forbindelse gÃ¥r gennem Snowflake-proxier, som kÃ¸res af frivillige. Se 
vores https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\"; 
data-msgid=\"__MSG_docWiki__\">dokumentationswiki for mere information om 
hvordan Snowflake virker."
   },
   "docWiki": {
 "message": "dokumentationswiki"
@@ -45,7 +45,7 @@
 "message": "Udvidelse"
   },
   "installExtension": {
-"message": "If your internet access is not censored, you 
should consider installing the Snowflake extension to help users in censored 
networks. There is no need to worry about which websites people are accessing 
through your proxy. Their visible browsing IP address will match their Tor exit 
node, not yours."
+"message": "Hvis din internetadgang ikke er censureret, 
sÃ¥ bÃ¸r du overveje at installere Snowflake-udvidelsen for at hjÃ¦lpe brugere 
i censureret netvÃ¦rk. Du behÃ¸ver ikke bekymre dig om hvilke websteder folk 
tilgÃ¥r gennem din proxy. Deres synlige browsing IP-adresse vil matche deres 
Tor-afslutningsknudepunkt, ikke dit."
   },
   "installFirefox": {
 "message": "Installer i Firefox"
@@ -66,7 +66,7 @@
 "message": "https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake\";>Udfyld
 en ticket med vores bug tracker."
   },
   "descriptive": {
-"message": "Please try to be as descriptive as possible with your ticket 
and if possible include log messages that will help us reproduce the bug. 
Consider adding keywords snowflake-webextension or 
snowflake-client to let us know how which part of the Snowflake system 
is experiencing problems."
+"message": "VÃ¦r venligst sÃ¥ beskrivende som muligt i din ticket og 
medtag logmeddelelser hvis det er muligt for at hjÃ¦lpe os med at reproducere 
fejlen. Overvej at tilfÃ¸je nÃ¸gleordene snowflake-webextension eller 
snowflake-client sÃ¥ vi ved hvilken del af Snowflake-systemet der er 
problemer med."
   },
   "embed": {
 "message": "Indlejr"

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

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2019-10-17 Thread translation

commit 9209459bb0d37bc8b9f855f79d0313009e9fc230
Author: Translation commit bot 
Date:   Thu Oct 17 23:23:31 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+ka.po | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/contents+ka.po b/contents+ka.po
index d3ec63b7b..1102ebf39 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -2809,6 +2809,13 @@ msgid ""
 "relay you happened to pick) as somebody trying to \"crawl\" their website, "
 "so it slows down traffic from that IP address for a short time."
 msgstr ""
+"á ááªá Tor-áá á¡áá ááááááá, áá¥ááá 
áááááááá áááá®áááááá¡ 
áááá¡ááááá á¬áá á¢áááá¡ "
+"ááá¨áááááá, á ááááá¡ááª 
á¨áá¡áá«ááá áááá¡áááá á¡á®áá 
áááá®ááá ááááááª áá§ááááááá¡. Tor-áá¡ 
"
+"ááá®ááá áááá¡áá¡ áá 
á¨áá¢á§áááááááá¡ ááá¨áá áá®ááááá, á 
ááªá Tor-áá¡ áááá á áááá®ááá ááááá "
+"ááá£ááááááá¡ Google-á¡ áááá®áááááá¡ 
ááªáá á áá áá¨á. Google áááááªáááá áááá 
ááá "
+"áááªá£ááááá¡ áá áá IP-ááá¡áááá 
ááááá (áá áááá¡ááááá á¬áá á¢áááá¡, 
á ááááááª ááááááááá) "
+"áááá©áááá¡ ááá¡ á¡ááá¢áá ááá¢áááá 
âááá áá¨ááâ, á áá¡ áááááª áá ááááá 
ááááááá¡ áááá¨áá áá¡ "
+"ááªáááááááá¡ áá IP-ááá¡áááá 
ááááá."
 
 #: https//support.torproject.org/tbb/tbb-44/
 #: (content/tbb/tbb-44/contents+en.lrquestion.description)
@@ -2819,6 +2826,12 @@ msgid ""
 "they are Tor exit relays), and tries to warn any connections coming from "
 "those IP addresses that recent queries indicate an infection."
 msgstr ""
+"ááááá áá áá áá®á¡ááá, á áá Google 
áªáááááá¡ áá¦áááá©áááá¡ ááá 
áááá£áá á¡áá®áá¡ ááááááá§á£á á "
+"áá ááááá áá ááá ááááá, á 
áááááááª áááááááá¡ áªááááá£á 
áááá®áááááá¡ Google-áá¡ "
+"á¡áá«ááááá¨á. ááá áááá¨áááá¡ áá 
IP-ááá¡áááá áááá¡, á áááááááááááª 
áá¦ááá¡ áá¡áá "
+"áááá®áááááá¡ (áá  ááªáá¡ á áá Tor-áá¡ 
áááá¡ááááá á¬áá á¢áááááá) áá 
áªáááááá¡ "
+"ááááá¤á áá®áááá, á áá áá 
IP-ááá¡áááá ááááááá áááááááá 
áááá¨áá á ááá£áááááá¡ "
+"ááá¤ááªáá ááááá."
 
 #: https//support.torproject.org/tbb/tbb-44/
 #: (content/tbb/tbb-44/contents+en.lrquestion.description)
@@ -2827,6 +2840,8 @@ msgid ""
 " deter or block Tor use. The error message about an infected machine should "
 "clear up again after a short time."
 msgstr ""
+"á©áááá áªááááááá, Google áá  áªáááááá¡ 
áá¦ááá©áááá¡ áá ááááá áá® 
á¨ááá¦á£áááá¡ Tor-áá¡ "
+"ááááá§áááááá¡. á¨áá¢á§ááááááááá 
ááá¤ááªáá ááá£áááááá á¬á§áááá 
áááááá áá ááá¡ á¨ááááá."
 
 #: https//support.torproject.org/tbb/tbb-45/
 #: (content/tbb/tbb-45/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/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings

2019-10-17 Thread translation

commit a61209871cce7faa17d831fa271580d5c17927e5
Author: Translation commit bot 
Date:   Thu Oct 17 23:22:41 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
---
 da/network-settings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/da/network-settings.dtd b/da/network-settings.dtd
index 80b68428d..f7d7111b1 100644
--- a/da/network-settings.dtd
+++ b/da/network-settings.dtd
@@ -67,7 +67,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [translation/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed

2019-10-17 Thread translation

commit 9a9ab1d6347a27961eadc3a9014ff3abfb188cb2
Author: Translation commit bot 
Date:   Thu Oct 17 23:22:47 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
---
 da/network-settings.dtd | 125 
 1 file changed, 73 insertions(+), 52 deletions(-)

diff --git a/da/network-settings.dtd b/da/network-settings.dtd
index 52f89becf..b0d38062a 100644
--- a/da/network-settings.dtd
+++ b/da/network-settings.dtd
@@ -1,62 +1,83 @@
-
-
-
-
+
+
+
+
 
 
-
-
+
+
 
 
 
-
-
-
-
+
+
+
+
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

[tor-commits] [translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere

2019-10-17 Thread translation

commit 85df5067f67bfa520786adff1568be4e63097423
Author: Translation commit bot 
Date:   Thu Oct 17 23:16:01 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
---
 da/https-everywhere.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/da/https-everywhere.dtd b/da/https-everywhere.dtd
index c7b689228..e0ef19b07 100644
--- a/da/https-everywhere.dtd
+++ b/da/https-everywhere.dtd
@@ -11,11 +11,11 @@
 
 
 
-
-
+
+
 
 
-
+
 
 
 

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

[tor-commits] [translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed

2019-10-17 Thread translation

commit d8ef691e025fb813a3ed5a7946431025b5ec4947
Author: Translation commit bot 
Date:   Thu Oct 17 23:16:08 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
---
 da/https-everywhere.dtd | 124 
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/da/https-everywhere.dtd b/da/https-everywhere.dtd
index c7b689228..0ebba6778 100644
--- a/da/https-everywhere.dtd
+++ b/da/https-everywhere.dtd
@@ -1,67 +1,67 @@
-
-
-
-
-
-
+
+
+
+
+
+
 
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-
-
-
+
+
+
 
-
-
-
+
+
+
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

[tor-commits] [translation/exoneratorproperties] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties

2019-10-17 Thread translation

commit 67a0e2cda94feecd47535250ce71233c67e332e4
Author: Translation commit bot 
Date:   Thu Oct 17 23:15:48 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties
---
 da/exonerator.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/da/exonerator.properties b/da/exonerator.properties
index 99b6e1a4f..306ea1204 100644
--- a/da/exonerator.properties
+++ b/da/exonerator.properties
@@ -30,7 +30,7 @@ summary.positive.title=Resultatet er positivt
 summary.positive.body=Vi fandt en eller flere Tor-relÃ¦er pÃ¥ IP-adressen %s 
pÃ¥ datoen eller inden for en dag for %s som Tor-klienter kunne kende
 summary.negative.title=Resultatet er negativt
 summary.negative.body=Vi kunne ikke finde IP-adressen %s indenfor en dag for 
%s.
-summary.missingdata=Databasen mangler dog flere timers data for den specifikke 
forespÃ¸rgsel, sÃ¥ resultatet skal fortolkes med forsigtighed.
+summary.missingdata=Databasen mangler dog flere timers data for den specifikke 
anmodning, sÃ¥ resultatet skal fortolkes med forsigtighed.
 technicaldetails.heading=Tekniske detaljer
 technicaldetails.pre=UndersÃ¸ger tilgÃ¦ngeligheden af IP-adressen %s pÃ¥ 
datoen eller inden for en dag for %s. Tor-klienter kan have valgt denne eller 
disse Tor-relÃ¦er til at opbygge et kredslÃ¸b.
 technicaldetails.colheader.timestamp=Tidsstempel (UTC)

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

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2019-10-17 Thread translation

commit 42db459831ef38ac655de005c3b1c74611c42570
Author: Translation commit bot 
Date:   Thu Oct 17 22:53:38 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+ka.po | 27 +--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/contents+ka.po b/contents+ka.po
index dc3fd1baf..d3ec63b7b 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -951,6 +951,8 @@ msgstr ""
 msgid ""
 "Tor Browser can't do anything about text that you type into forms, though."
 msgstr ""
+"áá£ááªá, Tor-áá áá£ááá á ááá áá¤áá á¡ 
áááá¬á§ááá¡ áááááá¨á áá¥ááá áááá  
á¨áá§ááááá "
+"áááááªááááááá."
 
 #: https//support.torproject.org/about/what-is-tor/
 #: (content/about/what-is-tor/contents+en.lrquestion.title)
@@ -1116,6 +1118,8 @@ msgid ""
 "For example, `torbrowser-install-win64-8.5.5_en-US.exe` is accompanied by "
 "`torbrowser-install-win64-8.5.5_en-US.exe.asc`."
 msgstr ""
+"ááááááááá, `torbrowser-install-win64-8.5.5_en-US.exe` 
á¤áááá¡ ááá áá®áááá¡ "
+"`torbrowser-install-win64-8.5.5_en-US.exe.asc`."
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -2364,6 +2368,8 @@ msgid ""
 "it would load in another browser. This type of behavior can be dangerous and"
 " break anonymity."
 msgstr ""
+"á¨áááááá, á¡ááá¢á á¨áá¡áá«ááá á®áá 
Tor-áá áá£ááá á¨á áááá®á¡ááá¡, á®áá áá 
á¡á®áá áá áá£ááá á¨á, "
+"á ááª ááá¢áá á¡áá®áá¤ááá áá 
á®áááá¡á¨ááá¨ááááá áááááááá¡ 
áááá®áááá¡ááá áááªááá¡áááá¡."
 
 #: https//support.torproject.org/tbb/tbb-33/
 #: (content/tbb/tbb-33/contents+en.lrquestion.title)
@@ -2723,7 +2729,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-43/
 #: (content/tbb/tbb-43/contents+en.lrquestion.title)
 msgid "Why does Google show up in foreign languages?"
-msgstr ""
+msgstr "á áá¢áááá Google á£áªá®á ááááá?"
 
 #: https//support.torproject.org/tbb/tbb-43/
 #: (content/tbb/tbb-43/contents+en.lrquestion.description)
@@ -2733,6 +2739,9 @@ msgid ""
 "thinks you prefer, and it also includes giving you different results on your"
 " queries."
 msgstr ""
+"Google áá§ááááá¡ âááááááááªááá¡â 
áááá®ááá ááááá¡ ááááááááááá 
ááááá¡ ááá¡ááááááá, á áá "
+"áá¥ááááá ááá áááá£áá áááá¡áá®á£á 
ááá á¨ááááááááááá. ááá á¨áá áá¡áá 
ááá, á ááááá¡ááª "
+"áááá©áááá¡ áá¥ááááááá¡ 
á£áá¯áááá¡áá áá ááá áááá 
áááá¡á®áááááá£áá á¡áá®áá¡ 
á¨ááááááá."
 
 #: https//support.torproject.org/tbb/tbb-43/
 #: (content/tbb/tbb-43/contents+en.lrquestion.description)
@@ -2742,6 +2751,11 @@ msgid ""
 "Internet is not flat, and it in fact does look different depending on where "
 "you are. This feature reminds people of this fact."
 msgstr ""
+"áá£ áá¡á£á á Google áá®áááá áááááá¡á£á 
áá, ááá¬ááááá áááªááá£á ááá£ááá. 
áá£ááªá á©ááá "
+"áááááá©ááá á áá áá¡ Tor-áá¡ á£ááá 
áá¢áá¡á á¨áá¡áá«áááááááá áá áá á 
ááááá --- ááá¢áá ááá¢á "
+"áá áá áá ááááá ááááá, 
á¡áááááááááá¨á ááá 
áááá¡á®áááááá£ááá áááááá§á£á ááá, 
áááá¡áá "
+"ááá®ááááá, áá£ á¡áá ááá§áá¤áááá. 
áá¡ á¨áá¡áá«ááááááá áá á®ááá®á¡, áá 
ááá¨ááá áá¢áááá¡ "
+"áá®á¡ááááá¡."
 
 #: https//support.torproject.org/tbb/tbb-43/
 #: (content/tbb/tbb-43/contents+en.lrquestion.description)
@@ -2751,11 +2765,15 @@ msgid ""
 "search results in English regardless of what Google server you have been "
 "sent to. On a query this looks like:"
 msgstr ""
+"á¨áááá¨áááááá, á áá Google á«ááááá¡áá¡ 
ááá¡áááá ááá ááááá¡áªááá¡ 
á¡áá®ááá/áááá¨áááááááá¡ "
+"á¬á§áááá¡ áªáááááááá 
ááá¡áá®áááááá âhlâ. áá£ ááá£áááááá 
á áá âhlâ áá§áá¡ âenâ, ááá¨áá "
+"Google á«ááááá¡ á¨ááááááá¡ ááááá 
á£áááá¡ áááááá¡á£á áá, ááá£á®ááááá

[tor-commits] [translation/torbutton-browseronboardingproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseronboardingproperties_completed

2019-10-17 Thread translation

commit 1c866402ced2bf7c4b07d8200b37d0db2e39873b
Author: Translation commit bot 
Date:   Thu Oct 17 22:52:11 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseronboardingproperties_completed
---
 da/browserOnboarding.properties | 109 
 1 file changed, 55 insertions(+), 54 deletions(-)

diff --git a/da/browserOnboarding.properties b/da/browserOnboarding.properties
index 6c1e1f307..04a6c0a67 100644
--- a/da/browserOnboarding.properties
+++ b/da/browserOnboarding.properties
@@ -2,70 +2,71 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-onboarding.tour-tor-welcome=Velkommen
-onboarding.tour-tor-welcome.title=Du er klar.
-onboarding.tour-tor-welcome.description=Tor Browser tilbyder den hÃ¸jeste 
standard indenfor privatliv og sikkerhed pÃ¥ webbet. Du er nu beskyttet mod 
sporing, overvÃ¥gning og censur. Denne hurtige introduktion viser dig hvordan.
-onboarding.tour-tor-welcome.next-button=GÃ¥ til privatliv
+# onboarding.tour-tor-welcome=Welcome
+# onboarding.tour-tor-welcome.title=Youâre ready.
+# onboarding.tour-tor-welcome.description=Tor Browser offers the highest 
standard of privacy and security while browsing the web. Youâre now protected 
against tracking, surveillance, and censorship. This quick onboarding will show 
you how.
+# onboarding.tour-tor-welcome.next-button=Go to Privacy
 
-onboarding.tour-tor-privacy=Privatliv
-onboarding.tour-tor-privacy.title=SÃ¦t en stopper for trackere og snoopers.
-onboarding.tour-tor-privacy.description=Tor Browser isolerer cookies og 
sletter din browserhistorik efter din session. Ãndringerne sikre dit 
privatliv, og sikkerheden beskyttes i browseren. Klik pÃ¥ âTor-netvÃ¦rkâ 
for at lÃ¦re hvordan vi beskytter dig pÃ¥ netvÃ¦rksniveauet.
-onboarding.tour-tor-privacy.button=GÃ¥ til Tor-netvÃ¦rk
+# onboarding.tour-tor-privacy=Privacy
+# onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+# onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and 
deletes your browser history after your session. These modifications ensure 
your privacy and security are protected in the browser. Click âTor Networkâ 
to learn how we protect you on the network level.
+# onboarding.tour-tor-privacy.button=Go to Tor Network
 
-onboarding.tour-tor-network=Tor-netvÃ¦rk
-onboarding.tour-tor-network.title=Rejs pÃ¥ et decentraliseret netvÃ¦rk.
-onboarding.tour-tor-network.description=Tor Browser opretter forbindelse for 
dig til Tor-netvÃ¦rket, som kÃ¸res af tusindvis af frivillige verden over. I 
modsÃ¦tning til en VPN, er der ikke Ã©t punkt som kan fÃ¥ det til at fejle, 
eller centraliseret indgang som du skal have tillid til for at bruge 
internettet privat.
-onboarding.tour-tor-network.button=GÃ¥ til kredslÃ¸b-visning
+# onboarding.tour-tor-network=Tor Network
+# onboarding.tour-tor-network.title=Travel a decentralized network.
+# onboarding.tour-tor-network.description=Tor Browser connects you to the Tor 
network run by thousands of volunteers around the world. Unlike a VPN, 
thereâs no one point of failure or centralized entity you need to trust in 
order to enjoy the internet privately.
+# onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, 
including the ability to request bridges where Tor is blocked, can now be found 
in Preferences.
+# onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings
+# onboarding.tour-tor-network.button=Go to Circuit Display
 
-onboarding.tour-tor-circuit-display=KredslÃ¸b-visning
-onboarding.tour-tor-circuit-display.title=Se din sti.
-onboarding.tour-tor-circuit-display.description=Hver gang du besÃ¸ger et 
domÃ¦ne, videresendes og krypteres din trafik i et kredslÃ¸b hen over tre 
Tor-relÃ¦ verden over. Webstederne kan ikke se hvor du opretter forbindelse 
fra. Du kan anmode om et nyt kredslÃ¸b ved at klikke pÃ¥ âNyt kredslÃ¸b til 
dette stedâ pÃ¥ vores kredslÃ¸b-display.
-onboarding.tour-tor-circuit-display.button=Se min sti
-onboarding.tour-tor-circuit-display.next-button=GÃ¥ til sikkerhed
+# onboarding.tour-tor-circuit-display=Circuit Display
+# onboarding.tour-tor-circuit-display.title=See your path.
+# onboarding.tour-tor-circuit-display.description=For each domain you visit, 
your traffic is relayed and encrypted in a circuit across three Tor relays 
around the world. No website knows where you are connecting from. You can 
request a new circuit by clicking âNew Circuit for this Siteâ on our 
Circuit Display.
+# onboarding.tour-tor-circuit-display.button=See My Path
+# onboarding.tour-tor-circuit-display.next-button=Go to Security
 
-onboarding.tour-tor-security=Sikkerhed
-onboarding.tour-tor-security.title=VÃ¦lg din oplevelse.
-onboarding.tour-tor-security.description=Vi giver dig ogsÃ¥ yderligere 
sikkerhedsindstillinger for at Ã¸ge din browsersikkerhed. Vores 
sikkerhedsindstillinger giver dig mulighed for at blokere elementer der kan 
bruges til at angribe

[tor-commits] [translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings

2019-10-17 Thread translation

commit d4c1d9a07ccdcc186daa58bb5bf6a3db6449c239
Author: Translation commit bot 
Date:   Thu Oct 17 22:52:50 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
---
 da/network-settings.dtd | 24 
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/da/network-settings.dtd b/da/network-settings.dtd
index 3c986a6f6..80b68428d 100644
--- a/da/network-settings.dtd
+++ b/da/network-settings.dtd
@@ -37,7 +37,7 @@
 
 
 
-
+
 
 
 
@@ -63,21 +63,21 @@
 
 
 
-
-
+
+
 
 
 
-
+
 
-
+
 
-
-
-
-
+
+
+
+
 
 
-
-
-
+
+
+

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

[tor-commits] [translation/torbutton-browseronboardingproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseronboardingproperties

2019-10-17 Thread translation

commit 437249936617e0d2cb61fed8b8f75063f01a9afb
Author: Translation commit bot 
Date:   Thu Oct 17 22:52:04 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseronboardingproperties
---
 da/browserOnboarding.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/da/browserOnboarding.properties b/da/browserOnboarding.properties
index 0b6f4ddc9..a11136379 100644
--- a/da/browserOnboarding.properties
+++ b/da/browserOnboarding.properties
@@ -15,7 +15,7 @@ onboarding.tour-tor-privacy.button=GÃ¥ til Tor-netvÃ¦rk
 onboarding.tour-tor-network=Tor-netvÃ¦rk
 onboarding.tour-tor-network.title=Rejs pÃ¥ et decentraliseret netvÃ¦rk.
 onboarding.tour-tor-network.description=Tor Browser opretter forbindelse for 
dig til Tor-netvÃ¦rket, som kÃ¸res af tusindvis af frivillige verden over. I 
modsÃ¦tning til en VPN, er der ikke Ã©t punkt som kan fÃ¥ det til at fejle, 
eller centraliseret indgang som du skal have tillid til for at bruge 
internettet privat.
-onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, 
including the ability to request bridges where Tor is blocked, can now be found 
in Preferences.
+onboarding.tour-tor-network.description-para2=NYT: Tor-netvÃ¦rksindstillinger 
som indeholder muligheden for at anmode om broer hvor Tor er blokeret, kan nu 
findes i PrÃ¦ferencer.
 onboarding.tour-tor-network.action-button=Juster dine 
Tor-netvÃ¦rksindstillinger
 onboarding.tour-tor-network.button=GÃ¥ til kredslÃ¸b-visning
 
@@ -50,9 +50,9 @@ onboarding.tour-tor-update.prefix-updated=Opdateret
 
 onboarding.tour-tor-toolbar=VÃ¦rktÃ¸jslinje
 onboarding.tour-tor-toolbar-update-9.0.title=Farvel Onion-knap.
-onboarding.tour-tor-toolbar-update-9.0.description=We want your experience 
using Tor to be fully integrated within Tor Browser.
-onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, 
rather than using the onion button, you can see your Tor Circuit via the [i] in 
the URL bar and request a New Identity using the toolbar button or the [â¡] 
menu.
-onboarding.tour-tor-toolbar-update-9.0.button=ForespÃ¸rg en ny identitet
+onboarding.tour-tor-toolbar-update-9.0.description=Vil Ã¸nsker at din 
oplevelse med Tor skal vÃ¦re fuldt integreret i Tor Browser.
+onboarding.tour-tor-toolbar-update-9.0.description-para2=Derfor kan du nu, i 
stedet for at bruge onion-knappen, se dine Tor-kredslÃ¸b via [i] pÃ¥ 
adresselinjen og anmod om en ny identitet med vÃ¦rktÃ¸jslinjeknappen eller 
[â¡]-menuen.
+onboarding.tour-tor-toolbar-update-9.0.button=Anmod om en ny identitet
 onboarding.tour-tor-toolbar-update-9.0.next-button=GÃ¥ til Tor-netvÃ¦rk
 
 # Circuit Display onboarding.

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

[tor-commits] [translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot

2019-10-17 Thread translation

commit d329287331bddd9871d4ffc0bbfde9f1c18aea0d
Author: Translation commit bot 
Date:   Thu Oct 17 22:47:01 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
---
 code_of_conduct+ka.po | 5 +
 1 file changed, 5 insertions(+)

diff --git a/code_of_conduct+ka.po b/code_of_conduct+ka.po
index b49b1cfe8..24a8dff52 100644
--- a/code_of_conduct+ka.po
+++ b/code_of_conduct+ka.po
@@ -767,6 +767,11 @@ msgid ""
 "this Code while we are working on Tor, and take care not to undermine it in "
 "the rest of our time."
 msgstr ""
+"áááááá¡ ááááá¥á¡á áá ááá¡ááá 
áááááá¨áá ááá£áá áá ááªááá£á ááá 
ááá áááá áá®ááá ááá£á¦áááá "
+"á¥áªáááá¡, á ááááááª áá¦áááá¨áááá 
áá ááááá¡ ááá¦áá, áá£ááªá á¡áá¤á áá®áá¡ 
á£á¥áááá¡ áá ááááá¡ "
+"á ááááááá á¬ááá áá¡ á£á¡áá¤á 
áá®ááááá¡ áá ááááááá¦ááááá¡. á 
áááá áª Tor-áá¡ áá ááááá¡ á¬ááá ááá,"
+" á©ááá áá®áá á¡ áá£ááá á áá 
áááá§ááááá áá ááááá¥á¡ Tor-á¨á 
áá£á¨ááááá¡áá¡, áááá¡ááá áááªááá "
+"áááááá¡ááá ááááá á©áá áá áá¡."
 
 #. type: Plain text
 #: ../code_of_conduct.txt:280

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

[tor-commits] [translation/exoneratorproperties] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties

2019-10-17 Thread translation

commit f29f1afea7ca1ccd5fcbfad348c5026c5e0ee112
Author: Translation commit bot 
Date:   Thu Oct 17 22:45:53 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties
---
 da/exonerator.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/da/exonerator.properties b/da/exonerator.properties
index c226e0788..99b6e1a4f 100644
--- a/da/exonerator.properties
+++ b/da/exonerator.properties
@@ -30,7 +30,7 @@ summary.positive.title=Resultatet er positivt
 summary.positive.body=Vi fandt en eller flere Tor-relÃ¦er pÃ¥ IP-adressen %s 
pÃ¥ datoen eller inden for en dag for %s som Tor-klienter kunne kende
 summary.negative.title=Resultatet er negativt
 summary.negative.body=Vi kunne ikke finde IP-adressen %s indenfor en dag for 
%s.
-summary.missingdata=However, the database is missing several hours of data for 
this specific request, so that this result must be interpreted carefully.
+summary.missingdata=Databasen mangler dog flere timers data for den specifikke 
forespÃ¸rgsel, sÃ¥ resultatet skal fortolkes med forsigtighed.
 technicaldetails.heading=Tekniske detaljer
 technicaldetails.pre=UndersÃ¸ger tilgÃ¦ngeligheden af IP-adressen %s pÃ¥ 
datoen eller inden for en dag for %s. Tor-klienter kan have valgt denne eller 
disse Tor-relÃ¦er til at opbygge et kredslÃ¸b.
 technicaldetails.colheader.timestamp=Tidsstempel (UTC)

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

[tor-commits] [translation/exoneratorproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties_completed

2019-10-17 Thread translation

commit 4e5e9801203d6ebd8406ded48de00b87e8e1996e
Author: Translation commit bot 
Date:   Thu Oct 17 22:45:59 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties_completed
---
 da/exonerator.properties | 105 ---
 1 file changed, 53 insertions(+), 52 deletions(-)

diff --git a/da/exonerator.properties b/da/exonerator.properties
index 4e0f99a04..cba9dbfd5 100644
--- a/da/exonerator.properties
+++ b/da/exonerator.properties
@@ -1,53 +1,54 @@
-form.explanation=Indtast en IP-adresse og en dato, for at finde ud af om 
adressen har vÃ¦ret brugt som Tor-relÃ¦:
-form.ip.label=IP-adresse
-form.timestamp.label=Dato
-form.search.label=SÃ¸g
-summary.heading=Opsummering
-summary.serverproblem.dbnoconnect.title=Serverproblem
-summary.serverproblem.dbnoconnect.body.text=Kan ikke oprette forbindelse til 
datakilden. PrÃ¸v igen senere. Hvis problemet ikke forsvinder, bedes du 
venligst %s!
-summary.serverproblem.dbnoconnect.body.link=FortÃ¦lle os om det
-summary.serverproblem.dbempty.title=Serverproblem
-summary.serverproblem.dbempty.body.text=Datakilden virker tom. PrÃ¸v igen 
senere. Hvis problemet ikke forsvinder, bedes du venligst %s!
-summary.serverproblem.dbempty.body.link=FortÃ¦lle os om det
-summary.invalidparams.notimestamp.title=Der er ikke oplyst dato som parameter
-summary.invalidparams.notimestamp.body=Beklager. Du skal ogsÃ¥ angive en 
date-parameter.
-summary.invalidparams.noip.title=Der er ikke angivet en IP-adresse
-summary.invalidparams.noip.body=Beklager. Du skal ogsÃ¥ angive en 
IP-adresse-parameter.
-summary.invalidparams.timestamprange.title=Ugyldig dato
-summary.invalidparams.timestamprange.body=Datakilden indeholder desvÃ¦rre ikke 
data fra %s. VÃ¦lg venligst en dato mellem %s og %s.
-summary.invalidparams.invalidip.title=Ugyldig IP-adresse-parameter
-summary.invalidparams.invalidip.body=%s er desvÃ¦rre ikke en gyldig 
IP-adresse. De forventede IP-adresseformater er %s eller %s.
-summary.invalidparams.invalidtimestamp.title=Ugyldig dato
-summary.invalidparams.invalidtimestamp.body=%s er desvÃ¦rre ikke en gyldig 
dato. Det forventede datoformat er %s.
-summary.invalidparams.timestamptoorecent.title=Dato-parameter er for nylig
-summary.invalidparams.timestamptoorecent.body=Databasen har muligvis ikke nok 
data til at svare korrekt pÃ¥ anmodningen. Den seneste accepterede data er fra 
i gÃ¥r. Gentag venligst din sÃ¸gning pÃ¥ en anden dag.
-summary.serverproblem.nodata.title=Serverproblem
-summary.serverproblem.nodata.body.text=Datakilden indeholder ingen data for 
den valgte dato. PrÃ¸v venligst igen senere. Hvis problemet ikke forsvinder, 
bedes du venligst %s!
-summary.serverproblem.nodata.body.link=FortÃ¦lle os om det
-summary.negativesamenetwork.title=Resultatet er negativt
-summary.negativesamenetwork.body=Vi kunne ikke finde IP-adressen %s pÃ¥ datoen 
eller indenfor en dag for %s. Men vi fandt andre IP-adresser pÃ¥ Tor-relÃ¦er i 
det samme /%d netvÃ¦rk i tidsrummet:
-summary.positive.title=Resultatet er positivt
-summary.positive.body=Vi fandt en eller flere Tor-relÃ¦er pÃ¥ IP-adressen %s 
pÃ¥ datoen eller inden for en dag for %s som Tor-klienter kunne kende
-summary.negative.title=Resultatet er negativt
-summary.negative.body=Vi kunne ikke finde IP-adressen %s indenfor en dag for 
%s.
-technicaldetails.heading=Tekniske detaljer
-technicaldetails.pre=UndersÃ¸ger tilgÃ¦ngeligheden af IP-adressen %s pÃ¥ 
datoen eller inden for en dag for %s. Tor-klienter kan have valgt denne eller 
disse Tor-relÃ¦er til at opbygge et kredslÃ¸b.
-technicaldetails.colheader.timestamp=Tidsstempel (UTC)
-technicaldetails.colheader.ip=IP-adresse(r)
-technicaldetails.colheader.fingerprint=Identitets fingeraftryk
-technicaldetails.colheader.nickname=Kaldenavn
-technicaldetails.colheader.exit=Forlad relÃ¦et
-technicaldetails.nickname.unknown=Ukendt
-technicaldetails.exit.unknown=Ukendt
-technicaldetails.exit.yes=Ja
-technicaldetails.exit.no=Nej
-permanentlink.heading=Permanent link
-footer.abouttor.heading=Om Tor
-footer.abouttor.body.text=Tor er et internationalt softwareprojekt til at 
anonymisere internettrafik, ved at kryptere pakker og sende dem gennem en serie 
ringe, inden de nÃ¥r deres destination.  Hvis du ser trafik fra et 
Tor-relÃ¦ stammer denne trafik typisk fra nogen som bruger Tor, fremfor fra 
relÃ¦ets operatÃ¸r.  Tor-projektet og Tor-relÃ¦operatÃ¸rer har ingen 
records af trafikken som passere over netvÃ¦rket og kan derfor ikke levere 
nogen information om dets oprindelse.  SÃ¸rg for at %s, og tÃ¸v ikke med 
at %s for mere information.
-footer.abouttor.body.link1=Finde mere information om Tor
-footer.abouttor.body.link2=kontakt Tor Project, Inc.
-footer.aboutexonerator.heading=Information om Exonera Tor
-footer.aboutexonerator.body=ExoneraTor-tjenesten vedligeholder en database af 
IP-adresser som har vÃ¦ret del af Tor-netvÃ¦rket.  Det besvarer 
spÃ¸rgsmÃ¥let om hvorvidt der kÃ¸rte et Tor-relÃ¦ pÃ¥ en given IP-adresse pÃ¥ 
e

[tor-commits] [translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot

2019-10-17 Thread translation

commit d1eabd98550dfdba63288a213db15147db3f6c5b
Author: Translation commit bot 
Date:   Thu Oct 17 22:45:41 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/ka/LC_MESSAGES/messages.po | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/locale/ka/LC_MESSAGES/messages.po 
b/locale/ka/LC_MESSAGES/messages.po
index fcb24d759..8ce69da3b 100644
--- a/locale/ka/LC_MESSAGES/messages.po
+++ b/locale/ka/LC_MESSAGES/messages.po
@@ -662,11 +662,11 @@ msgstr "á¨áááá¬áá á£áááá"
 
 #: 
tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:479
 msgid "State/Province/Region"
-msgstr ""
+msgstr "á¨á¢áá¢á/áá®áá á/á áááááá"
 
 #: 
tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:483
 msgid "Gift Selected:"
-msgstr ""
+msgstr "á¨áá á©áá£áá á¡áá©á£á¥áá á:"
 
 #: 
tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:487
 msgid "No Gift Selected"
@@ -2278,6 +2278,9 @@ msgid ""
 "As a Champion of Privacy, you'll receive exclusive gifts and invitations to "
 "online events that will give you insider access to what's happening at Tor."
 msgstr ""
+"á áááá áª ááá ááá£ááááá¡ 
ááááªáááá, áá¥ááá áááá¦ááá 
áá¥á¡ááá£ááá£á  á¡áá©á£á¥á ááá¡ áá 
ááá¬áááááá¡"
+" ááá¢áá ááá¢-á¦áááá¡á«ááááááá, á áá¡ 
á¨ááááááááª ááá¥ááááá á¬ááááá, 
Tor-áá¡ á§áááá á¨ááá "
+"ááá¤áá áááªáááá."
 
 #: 
tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:91
 msgid ""
@@ -2306,6 +2309,8 @@ msgstr ""
 #: 
tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:99
 msgid "We're standing up for the universal human right to privacy."
 msgstr ""
+"áá ááá, á©ááá á¨ááá«áááá á£áá 
á£áááááá§áá ááááááááá¡ ááá ááá 
áªá®ááá áááá¡ áááªááá¡ á«áá áá£áá "
+"á£á¤áááá."
 
 #: 
tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:101
 msgid "Join us by becoming a Champion of Privacy today."

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

[tor-commits] [translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot

2019-10-17 Thread translation

commit 6480f5edbf16c30600a7dc91831e6a57f724afc7
Author: Translation commit bot 
Date:   Thu Oct 17 22:16:52 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
---
 code_of_conduct+ka.po | 24 +++-
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/code_of_conduct+ka.po b/code_of_conduct+ka.po
index 09223ec76..b49b1cfe8 100644
--- a/code_of_conduct+ka.po
+++ b/code_of_conduct+ka.po
@@ -676,12 +676,12 @@ msgid ""
 "format. The next steps in an incident response will vary on a case-by-case "
 "basis."
 msgstr ""
-"áá ááááá¡ á¬áá ááááááááááá á£ááá 
áá¢áá¡áááá¡ ááááááá¡ ááá áá¡ á£á¡áá¤á 
áá®ááááá¡á áá "
-"á¯áááá ááááááá¡, ááááª áááá¡ áá 
á«áááá¡ ááááá ááááá£ááá áá á¡áá¤á 
áá®áá¡ á¥ááá¨. ááááá¡áááá áá "
-"áááá®á¡áááááááá á£ááá ááªáááá¡, á 
áá ááá¡á á¡áá©áááá á á¡áá áááá£ááá 
áá¥áááá áááá®ááá£áá. "
-"ááá®á¡ááááá á¨ááá«áááá áá§áá¡ 
á¡áá¢á§áááá á áá á¬áá ááááááá. áá£ 
á¨áááá®áááá áá  á¡áááá áááá¡ "
-"ááá£á§áááááááá ááááá¬á§ááá¢áá¡, 
á¬áá ááááááá ááá®á¡ááááá 
á¨ááá«áááá ááááááªáá¡ áá ááááá¡ "
-"á¬áá ááááááááááá¡ ááá¨áá¤á á£áá 
á¡áá®áá. á¨áááááá ááááá¯ááá 
ááááá®ááá£á áááá¡áá¡, "
+"áá ááááá¡ á¬áá ááááááááááá á£ááá 
áá¢áá¡áááá¡ ááááááá¡ á£á¡áá¤á 
áá®ááááá¡á áá ááááááá¦ááááá¡ "
+"ááááá¡áááá á áá ááá áá¡, á ááááááª 
áááá¡ áá á«áááá¡ ááááá ááááá£ááá 
áá á¡áá¤á áá®áá¡ á¥ááá¨. "
+"áááááá£ááá áááá®á¡áááááááá 
á£ááá ááªáááá¡, á áá ááá¡á á¡áá©áááá 
á á¡áá áááá£ááá áá¥áááá "
+"áááá®ááá£áá. ááá®á¡ááááá 
á¨ááá«áááá áá§áá¡ á¡áá¢á§áááá á áá 
á¬áá ááááááá. áá£ á¨áááá®áááá áá  "
+"á¡áááá áááá¡ ááá£á§áááááááá 
ááááá¬á§ááá¢áá¡, á¬áá ááááááá 
ááá®á¡ááááá á¨ááá«áááá ááááááªáá¡ "
+"áá ááááá¡ á¬áá ááááááááááá¡ 
ááá¨áá¤á á£áá á¡áá®áá. á¨áááááá 
ááááá¯ááá ááááá®ááá£á áááá¡áá¡, "
 "áááááááááá£ááá á¨áááá®ááááá¡ 
á¡áá®ááá."
 
 #. type: Plain text
@@ -704,6 +704,12 @@ msgid ""
 "appealed by following the appeals process in the Community Council "
 "Guidelines [1]."
 msgstr ""
+"áá£ áá áááá¡ á¬ááá á á¨ááá©ááá£ááá 
ááá£á¦áááá á¥áªáááá¨á, áá ááááá¡ á¬áá 
ááááááááááá¡ á¨áá£á«ááá "
+"áááá¢áá áá¡ ááááá¡áááá á á¡áá®áá¡ 
áááááá, á áá¡ááª á¡áááá áá 
áááá©áááá¡, ááá á¨áá áá¡á "
+"ááá¤á áá®ááááá, ááá ááááá, áá 
áááááá á¨ááá¦á£ááá áá á¡ááá£áááá 
ááá«ááááá áá ááááááá. "
+"á¬áá ááááááááááá¡ ááááá¡áááá á 
ááá¥áááááá áá ááááá¬á§ááá¢ááááá 
á¨ááá«áááá ááá¡áá©ááá ááá¡ "
+"áá ááªááá£á áááá, á áááááááª 
áááªááá£ááá áá ááááá¡ á¬áá 
ááááááááááá¡ 
á¡áá®áááá«á¦ááááááá¨á "
+"[1]."
 
 #. type: Plain text
 #: ../code_of_conduct.txt:255
@@ -739,17 +745,17 @@ msgstr "á¡á®áá ááá¬ááá£áá 
á¡á¢á£áá ááá"
 #. type: Plain text
 #: ../code_of_conduct.txt:266
 msgid "when interacting:"
-msgstr ""
+msgstr "á©áá áá£áá:"
 
 #. type: Bullet: '  - '
 #: ../code_of_conduct.txt:268
 msgid "in all online and in-person community venues"
-msgstr ""
+msgstr "áá ááááá¡ á§áááá á áááá£á  áá 
ááá¢áá ááá¢-á¨áá®áááá ááá¨á"
 
 #. type: Bullet: '  - '
 #: ../code_of_conduct.txt:270
 msgid "in one-on-one communications that r

[tor-commits] [translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot

2019-10-17 Thread translation

commit 638c97cb26d278b91a15fbe95db6000ae4e8a864
Author: Translation commit bot 
Date:   Thu Oct 17 21:46:54 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
---
 code_of_conduct+ka.po | 21 +
 1 file changed, 21 insertions(+)

diff --git a/code_of_conduct+ka.po b/code_of_conduct+ka.po
index c4ceca407..09223ec76 100644
--- a/code_of_conduct+ka.po
+++ b/code_of_conduct+ka.po
@@ -641,6 +641,18 @@ msgid ""
 "danger or harm to anyone. More information about the Community Council's "
 "incident reporting and response policies can be found on their wiki [1]."
 msgstr ""
+"áá£ áá¡á®ááá ááá á®áá á áá á¨ááá¡á¬áá 
áá ááá£á¦áááá á¥áªáááá¡, áá á ááá 
á¡á®áá á¡ááááá®á "
+"ááá¬á£á®ááá, ááá®ááá 
ááá£á§áááááááá á¨ááá¢á§áááááá áá 
ááááá¡ á¬áá ááááááááááá¡. 
á¨áááá«áááá "
+"áá ááááá¡ á¬áá ááááááááááá¡ ááá 
ááááá  ááááá ááá áá áááááá§áááá 
tor-community-"
+"coun...@lists.torproject.org. ááá¥áááá á¬áá 
ááááááááááááá¡ á¡áá áááªááá£ááá 
ááááá¨á "
+"[1]. á¬áá ááááááááááá¡ ááááá®ááá£á 
ááá áááááááááá£ááá 
á¨áááá®ááááá¡ á¡áá®ááá. ááá "
+"á¨áááªáááá á ááª á¨ááá«áááá áááá 
áááááá®ááá£á áá¡ á¨áááá®ááááá¡. ááá 
ááá á ááá¨á áááá¨ááááááá"
+" ááááááá ááááá ááááá£ááá¡ á£á¡áá¤á 
áá®ááááá¡ áá ááá¡ááááááá á¡áá¤á 
áá®áá¡. ááááá ááááá£á áá "
+"á¡áá¤á áá®áá¡ á¥ááá¨ áá§áá¤ ááá (áá)á¡, 
á¨áá£á«ááá ááá®á¡áááááá¡ ááá£á¥áááá 
ááááá¡áááá  áá áá¡. "
+"á©ááá áá áá¤áá á¡ ááááááá¥áááááá 
á¡áá¤á áá®áá¡ á¥ááá¨ áá§áá¤ ááá ááá 
á¨áá£áááá®áááááá, ááá áá áá"
+" á¨áááá®ááááá¡á, á ááªá á¡áá¨áá¨á 
ááááá¡ áááá®ááááá áá áááááá¡ 
ááááááááá áá¨ááá á áá "
+"ááá ááá£ááááá. áá áªááá, áá ááááá¡ 
á¬áá ááááááááááá¡áááá¡ 
á¨áááá®ááááááá¡ ááá®á¡áááááá¡á áá "
+"ááááá®ááá£á áááá¡ á¨áá¡áá®áá, 
áá®ááááá á¨áá¡áááááá¡ ááááá¨á [1]."
 
 #. type: Plain text
 #: ../code_of_conduct.txt:233
@@ -649,6 +661,8 @@ msgid ""
 "7. What the person reporting a violation can expect\n"
 "\n"
 msgstr ""
+"7. á á á¨ááááá¡ á£ááá áááááá¡ ááá á, 
ááá á¦ááááá¡ á¨áá¡áá®áá 
ááá®á¡áááááá¡áá¡\n"
+"\n"
 
 #. type: Plain text
 #: ../code_of_conduct.txt:242
@@ -662,6 +676,13 @@ msgid ""
 "format. The next steps in an incident response will vary on a case-by-case "
 "basis."
 msgstr ""
+"áá ááááá¡ á¬áá ááááááááááá á£ááá 
áá¢áá¡áááá¡ ááááááá¡ ááá áá¡ á£á¡áá¤á 
áá®ááááá¡á áá "
+"á¯áááá ááááááá¡, ááááª áááá¡ áá 
á«áááá¡ ááááá ááááá£ááá áá á¡áá¤á 
áá®áá¡ á¥ááá¨. ááááá¡áááá áá "
+"áááá®á¡áááááááá á£ááá ááªáááá¡, á 
áá ááá¡á á¡áá©áááá á á¡áá áááá£ááá 
áá¥áááá áááá®ááá£áá. "
+"ááá®á¡ááááá á¨ááá«áááá áá§áá¡ 
á¡áá¢á§áááá á áá á¬áá ááááááá. áá£ 
á¨áááá®áááá áá  á¡áááá áááá¡ "
+"ááá£á§áááááááá ááááá¬á§ááá¢áá¡, 
á¬áá ááááááá ááá®á¡ááááá 
á¨ááá«áááá ááááááªáá¡ áá ááááá¡ "
+"á¬áá ááááááááááá¡ ááá¨áá¤á á£áá 
á¡áá®áá. á¨áááááá ááááá¯ááá 
ááááá®ááá£á áááá¡áá¡, "
+"áááááááááá£ááá á¨áááá®ááááá¡ 
á¡áá®ááá."
 
 #. type: Plain text
 #: ../code_of_conduct.txt:245

___

[tor-commits] [tor-browser/tor-browser-68.1.0esr-9.0-3] fixup! Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.

2019-10-17 Thread gk

commit db19bbcd9c34c933ad7fc84693ed8a5ad3bac3cf
Author: Matthew Finkel 
Date:   Thu Oct 17 19:30:13 2019 +

fixup! Orfox: Centralized proxy applied to AbstractCommunicator and 
BaseResources.
---
 .../gecko/customtabs/CustomTabsActivity.java   | 21 ---
 .../mozilla/gecko/widget/GeckoActionProvider.java  | 10 +++-
 .../main/java/org/mozilla/gecko/GeckoAppShell.java | 68 +++---
 3 files changed, 54 insertions(+), 45 deletions(-)

diff --git 
a/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java 
b/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java
index c75962da35a7..230773cd1292 100644
--- 
a/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java
+++ 
b/mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java
@@ -359,16 +359,19 @@ public class CustomTabsActivity extends AppCompatActivity
 }
 
 private void performPendingIntent(@NonNull PendingIntent pendingIntent) {
+// Bug 31144 - Fail and return early, prevent potential proxy-bypass.
+return;
+
 // bug 1337771: If intent-creator haven't set data url, call send() 
directly won't work.
-final Intent additional = new Intent();
-if (!TextUtils.isEmpty(mCurrentUrl)) {
-additional.setData(Uri.parse(mCurrentUrl));
-}
-try {
-pendingIntent.send(this, 0, additional);
-} catch (PendingIntent.CanceledException e) {
-Log.w(LOGTAG, "Performing a canceled pending intent", e);
-}
+//final Intent additional = new Intent();
+//if (!TextUtils.isEmpty(mCurrentUrl)) {
+//additional.setData(Uri.parse(mCurrentUrl));
+//}
+//try {
+//pendingIntent.send(this, 0, additional);
+//} catch (PendingIntent.CanceledException e) {
+//Log.w(LOGTAG, "Performing a canceled pending intent", e);
+//}
 }
 
 /**
diff --git 
a/mobile/android/base/java/org/mozilla/gecko/widget/GeckoActionProvider.java 
b/mobile/android/base/java/org/mozilla/gecko/widget/GeckoActionProvider.java
index 79854e2931bc..9b81d5636e93 100644
--- a/mobile/android/base/java/org/mozilla/gecko/widget/GeckoActionProvider.java
+++ b/mobile/android/base/java/org/mozilla/gecko/widget/GeckoActionProvider.java
@@ -22,6 +22,7 @@ import org.mozilla.gecko.overlays.ui.ShareDialog;
 import org.mozilla.gecko.menu.MenuItemSwitcherLayout;
 import org.mozilla.gecko.util.IOUtils;
 import org.mozilla.gecko.util.IntentUtils;
+import org.mozilla.gecko.util.ProxySelector;
 import org.mozilla.gecko.util.ThreadUtils;
 
 import android.content.Context;
@@ -42,7 +43,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.HashMap;
 
@@ -335,9 +337,9 @@ public class GeckoActionProvider {
 InputStream is = null;
 try {
 final byte[] buf = new byte[2048];
-final URL url = new URL(src);
+final URI uri = new URI(src);
 final String filename = URLUtil.guessFileName(src, null, 
type);
-is = url.openStream();
+is = 
ProxySelector.openConnectionWithProxy(uri).getInputStream();
 
 final File imageFile = new File(dir, filename);
 os = new FileOutputStream(imageFile);
@@ -353,6 +355,8 @@ public class GeckoActionProvider {
 IOUtils.safeStreamClose(is);
 }
 }
+} catch (URISyntaxException ex) {
+// Handle this the same way as IOException
 } catch (IOException ex) {
 // If something went wrong, we'll just leave the intent un-changed
 } finally {
diff --git 
a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java 
b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java
index 03486a12c22e..c38e31dc3b0e 100644
--- 
a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java
+++ 
b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java
@@ -1810,39 +1810,41 @@ public class GeckoAppShell {
 
 @WrapForJNI
 private static URLConnection getConnection(final String url) {
-try {
-String spec;
-if (url.startsWith("android://")) {
-spec = url.substring(10);
-} else {
-spec = url.substring(8);
-}
-
-// Check if we are loading a package icon.
-try {
-if (spec.startsWith("icon/")) {
-String[] splits = spec.split("/");
-if (splits.length != 2) {
-return null;
-}
-

[tor-commits] [tor-browser/tor-browser-68.1.0esr-9.0-3] fixup! Bug 25741 - TBA: Add mozconfig for Android and pertinent branding files.

2019-10-17 Thread gk

commit dfdef56ec12ace37d08e2df516430427d0e08d7a
Author: Matthew Finkel 
Date:   Thu Oct 17 19:38:32 2019 +

fixup! Bug 25741 - TBA: Add mozconfig for Android and pertinent branding 
files.
---
 browser/app/profile/000-tor-browser.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/browser/app/profile/000-tor-browser.js 
b/browser/app/profile/000-tor-browser.js
index 974f8c31af17..1501edf47b90 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -375,6 +375,9 @@ pref("dom.presentation.receiver.enabled", false);
 pref("dom.audiochannel.audioCompeting", false);
 pref("dom.audiochannel.mediaControl", false);
 
+// Bug 31144 - Avoid proxy-bypass using the Android native download manager.
+pref("browser.download.forward_oma_android_download_manager", false);
+
 #expand pref("torbrowser.version", __TOR_BROWSER_VERSION_QUOTED__);
 
 // If we are bundling fonts, whitelist those bundled fonts, and restrict 
system fonts to a selection.



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

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2019-10-17 Thread translation

commit 8cdb6667ae18e923dbc191a5d9413c43d908a809
Author: Translation commit bot 
Date:   Thu Oct 17 21:18:36 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 ka.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ka.po b/ka.po
index a66027b99..38748efd7 100644
--- a/ka.po
+++ b/ka.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-10-05 16:50+0200\n"
-"PO-Revision-Date: 2019-10-06 02:05+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-10-17 20:49+\n"
+"Last-Translator: Georgianization\n"
 "Language-Team: Georgian 
(http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

2019-10-17 Thread translation

commit 57207965d4a570e897819b5bb873cc7966e45703
Author: Translation commit bot 
Date:   Thu Oct 17 21:17:27 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 ka.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ka.po b/ka.po
index e621e2c81..5aa989714 100644
--- a/ka.po
+++ b/ka.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-10-05 16:50+0200\n"
-"PO-Revision-Date: 2019-10-06 02:05+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-10-17 20:49+\n"
+"Last-Translator: Georgianization\n"
 "Language-Team: Georgian 
(http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,7 +82,7 @@ msgstr "áá£ááááá ááá®á¡ááá ááá 
ááááá á
 msgid ""
 "When you reboot Tails, all of Electrum's data will be lost, including your 
Bitcoin wallet.\n"
 "It is strongly recommended to only run Electrum when its persistence feature 
is activated."
-msgstr ""
+msgstr "á áááá¡ááª á®áááá®áá áááá¨áááá 
Tails, Electrum-áá¡ á§áááá áááááªááá 
áááááá áááá, ááá á¨áá áá¡ áá¥áááá 
Bitcoin-á¡áá¤á£áá.\nááááá¯áááááá ááá 
á©ááá ááá£á¨ááá Electrum áá®áááá áá 
á¨áááá®ááááá¨á, áá£ ááá¡á áá£ááááá 
ááá®á¡ááá áááá¡ á¡ááªááá á©áá áá£ááá."
 
 #: config/chroot_local-includes/usr/local/bin/electrum:65
 msgid "Do you want to start Electrum anyway?"

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

[tor-commits] [translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot

2019-10-17 Thread translation

commit 1c26b1c379b04b3da2e8a19ba357cce031ad8e0a
Author: Translation commit bot 
Date:   Thu Oct 17 21:16:57 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
---
 code_of_conduct+fr.po | 4 ++--
 code_of_conduct+ka.po | 7 +++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/code_of_conduct+fr.po b/code_of_conduct+fr.po
index 97a5ce810..f5d91aeda 100644
--- a/code_of_conduct+fr.po
+++ b/code_of_conduct+fr.po
@@ -706,8 +706,8 @@ msgid ""
 "8. How the Community Council responds to incidents\n"
 "\n"
 msgstr ""
-"8. La rÃ©ponse du conseil communautaire aux incidents\n"
-"=== ==\n"
+"8. La rÃ©action du conseil communautaire aux incidents\n"
+"\n"
 
 #. type: Plain text
 #: ../code_of_conduct.txt:252
diff --git a/code_of_conduct+ka.po b/code_of_conduct+ka.po
index e2df515b6..c4ceca407 100644
--- a/code_of_conduct+ka.po
+++ b/code_of_conduct+ka.po
@@ -606,6 +606,13 @@ msgid ""
 "involved in any discussion or documentation of the incident. More about the "
 "Community Council can be found in the guidelines [2]."
 msgstr ""
+"áá£ ááááá©áááá, á áá áááááá áá¥áá¡ 
ááá¢áá áá¡áá á¬ááááá¦áááááááá¡ á 
ááááááá "
+"á¬áá ááááááááááá¡ á¨áááá®ááááá¨á, 
á¨áááá«áááá áªááááá£á á¬ááá á¡ 
ááááá ááá. á¬áá ááááááááááá"
+" á¬ááá áááá¡ GPG-ááá¡áá¦ááááá áá¦á 
ááªá®á£ááá áá ááááá¡ á¬áá 
ááááááááááá¡ ááááá¨á. ááá¢áá 
áá¡áá"
+" á¬ááááá¦áááááááá¡ 
á¨áááá®ááááá¨á, áá¦ááá¨áá£áá á¬áá 
ááááááááááá á¬ááá ááá 
áááááªá®áááááá "
+"ááááááªáááááá¡. áá¡ááá áá  á©ááá 
ááááááá áááá®ááááá¨á áá 
á¨áááá®ááááá¡ ááá¡ááá£ááááá¨á. "
+"áá ááááá¡ á¬áá ááááááááááá¡ 
á¨áá¡áá®áá áá áªááá, á¨áááá«áááá 
áá®áááá á¡áá®áááá«á¦ááááááá¨á "
+"[2]."
 
 #. type: Plain text
 #: ../code_of_conduct.txt:215

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

[tor-commits] [torbutton/master] Bug 31730: Revert aarch64 fixes for esr60

2019-10-17 Thread gk

commit 9d744c6adc5ee3608e519c5db49528cd6ee6fe54
Author: Alex Catarineu 
Date:   Tue Oct 15 14:18:30 2019 +0200

Bug 31730: Revert aarch64 fixes for esr60
---
 modules/security-prefs.js | 28 ++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/modules/security-prefs.js b/modules/security-prefs.js
index 8701a3b8..f61f24aa 100644
--- a/modules/security-prefs.js
+++ b/modules/security-prefs.js
@@ -4,6 +4,11 @@
 
 let { getBoolPref, setBoolPref, getIntPref, setIntPref } =
 ChromeUtils.import("resource://gre/modules/Services.jsm", 
{}).Services.prefs;
+
+// Used for detecting the current system architecture
+let { XPCOMABI } =
+Cu.import("resource://gre/modules/Services.jsm", {}).Services.appinfo;
+
 let { bindPref, bindPrefAndInit } =
 ChromeUtils.import("resource://torbutton/modules/utils.js", {});
 let logger = Cc["@torproject.org/torbutton-logger;1"]
@@ -33,6 +38,7 @@ const kSecuritySettings = {
 // The Security Settings prefs in question.
 const kSliderPref = "extensions.torbutton.security_slider";
 const kCustomPref = "extensions.torbutton.security_custom";
+const kSliderMigration = "extensions.torbutton.security_slider_migration";
 
 // ### Prefs
 
@@ -48,8 +54,8 @@ var write_setting_to_prefs = function (settingIndex) {
 // __read_setting_from_prefs()__.
 // Read the current pref values, and decide if any of our
 // security settings matches. Otherwise return null.
-var read_setting_from_prefs = function () {
-  let prefNames = Object.keys(kSecuritySettings);
+var read_setting_from_prefs = function (prefNames) {
+  prefNames = prefNames || Object.keys(kSecuritySettings);
   for (let settingIndex of [1, 2, 3, 4]) {
 let possibleSetting = true;
 // For the given settingIndex, check if all current pref values
@@ -128,6 +134,24 @@ var initialize = function () {
 setIntPref("extensions.torbutton.security_slider", 2);
 write_setting_to_prefs(2);
   }
+
+  // Revert #31616 and #31140 fixes
+  if (getIntPref(kSliderMigration, 0) < 1) {
+// If the security settings level and the prefs that we did not change
+// have the default value, reset to default security level.
+const prefNames = [
+  "media.webaudio.enabled",
+  "mathml.disabled",
+  "gfx.font_rendering.opentype_svg.enabled",
+  "svg.disabled"
+];
+if (getBoolPref(kCustomPref) && XPCOMABI.split("-")[0] == "aarch64" &&
+getIntPref(kSliderPref) === 4 &&
+read_setting_from_prefs(prefNames) === 4) {
+  setBoolPref(kCustomPref, false);
+}
+setIntPref(kSliderMigration, 1);
+  }
   log(4, "security-prefs.js initialization complete");
 };
 

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

[tor-commits] [translation/exoneratorproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties_completed

2019-10-17 Thread translation

commit 94175e7137a917aded9e4991bb058b2f2f384998
Author: Translation commit bot 
Date:   Thu Oct 17 21:15:55 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties_completed
---
 ka/exonerator.properties | 105 ---
 1 file changed, 53 insertions(+), 52 deletions(-)

diff --git a/ka/exonerator.properties b/ka/exonerator.properties
index 0b303b839..cba9dbfd5 100644
--- a/ka/exonerator.properties
+++ b/ka/exonerator.properties
@@ -1,53 +1,54 @@
-form.explanation=á¨ááá§ááááá IP-ááá¡áááá áá 
áá ááá áá¦á áááá¡ ááááá¡áá áááááá, 
ááááá§ááááá£áá áá§á áá£ áá á áá¡ 
ááá¡áááá áá, Tor-ááááááªáááá:
-form.ip.label=IP-ááá¡áááá áá
-form.timestamp.label=ááá áá¦á
-form.search.label=á«áááá
-summary.heading=á¨áá¯ááááá
-summary.serverproblem.dbnoconnect.title=á¡áá ááá áá¡ á®áá 
áááá
-summary.serverproblem.dbnoconnect.body.text=áááááªáááá 
ááááá¡ááá áááááá¨áá ááá ááá  á®áá 
á®áááá. ááá®ááá, á¡áªáááá 
ááááááááááá. áá£ á®áá áááá ááááá 
ááá á¡ááááá¡, ááá®ááá %s!
-summary.serverproblem.dbnoconnect.body.link=ááááªááááá
-summary.serverproblem.dbempty.title=á¡áá ááá áá¡ á®áá 
áááá
-summary.serverproblem.dbempty.body.text=á©ááá¡, 
áááááªáááá áááá áªáá ááááá. 
ááá®ááá, á¡áªáááá ááááááááááá. 
áá£ á®áá áááá áá  ááááá¡á¬áá áááá, 
ááá®ááá %s!
-summary.serverproblem.dbempty.body.link=ááááªááááá
-summary.invalidparams.notimestamp.title=ááá áá¦áá¡ ááá 
áááá¢á á áá  áá áá¡ áááªááá£áá
-summary.invalidparams.notimestamp.body=áá¬á£á®ááá á, 
áá¡ááá áá£áªáááááááá ááá áá¦áá¡ 
ááá áááá¢á áá¡ áááááááááª.
-summary.invalidparams.noip.title=IP-ááá¡áááá ááá¡ ááá 
áááá¢á á áá áá áááªááá£áá
-summary.invalidparams.noip.body=áá¬á£á®ááá á, áá¡ááá 
áá£áªáááááááá IP-ááá¡áááá ááá¡ ááá 
áááá¢á áá¡ áááááááááª.
-summary.invalidparams.timestamprange.title=ááá áá¦áá¡ ááá 
áááá¢á á á¡ááá¦áá ááá¡ áªáááá
-summary.invalidparams.timestamprange.body=á¡ááá¬á£á®áá áá, 
áááááªáááá ááááá¨á áá áá¤áá á 
áááá«áááá %s ááá áá¦áá. ááá®ááá, 
á¨ááá á©ááá %s áá %s á¨á£ááááá¨á.
-summary.invalidparams.invalidip.title=IP-ááá¡áááá ááá¡ áá 
áá¡á¬áá á ááá áááá¢á á
-summary.invalidparams.invalidip.body=á¡ááá¬á£á®áá áá %s áá  
á¬áá áááááááá¡ ááá áááá£á 
IP-ááá¡áááá áá¡. ááá¡áááááááá 
IP-ááá¡áááá ááá¡ á£ááá áá§áá¡ %s áá %s 
á¡áá®áá¡.
-summary.invalidparams.invalidtimestamp.title=áá áá¡á¬áá á ááá 
áá¦áá¡ ááá áááá¢á á
-summary.invalidparams.invalidtimestamp.body=á¡ááá¬á£á®áá áá %s 
áá áááá áááá£áá ááá áá¦áá. 
ááá¡áááááááá ááá áá¦á á£ááá áá§áá¡ 
%s á¡áá®áá¡.
-summary.invalidparams.timestamptoorecent.title=ááá áááá¢á áá, 
áááááá¢áá áááááá ááááááá ááá 
áá¦áá
-summary.invalidparams.timestamptoorecent.body=áááááªáááá 
áááá, á¡áááá áá£ááá á¯áá  áá  
á¨áááªááá¡ á¡ááááá áá¡ áááááªááááá¡, 
áá áááá®ááááá¡ ááá áááá£ááá 
á¡áááá¡á£á®áá. á£áá®ááá¡á ááá¡áá¦ááá 
ááá áá¦áá, áá£á¨ááá¬áááááá. 
ááá®ááá, ááááááá áá á«áááá á¡á®áá 
áá¦áá¡áááá¡.
-summary.serverproblem.nodata.title=á¡áá ááá áá¡ á®áá 
áááá
-summary.serverproblem.nodata.body.text=áááááªáááá 
áááá, áá  á¨áááªááá¡ áááááªááááá¡ 
áááá®áááááá ááá áá¦áá¡áááá¡. 
ááá®ááá, á¡áªáááá ááááááááááá. 
áá£ á®áá áááá ááááá ááá á¡ááááá¡, 
ááá®ááá %s!
-sum

[tor-commits] [translation/exoneratorproperties] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties

2019-10-17 Thread translation

commit 8cb17471ff4303e5f1966d68753e16964a5095f5
Author: Translation commit bot 
Date:   Thu Oct 17 21:15:49 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties
---
 ka/exonerator.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ka/exonerator.properties b/ka/exonerator.properties
index ba7ff6edb..0d5e9ded8 100644
--- a/ka/exonerator.properties
+++ b/ka/exonerator.properties
@@ -30,7 +30,7 @@ summary.positive.title=á¨ááááá 
ááááááááá
 summary.positive.body=á©ááá áááááá®áá áá áá 
áá ááá¢á Tor-ááááááªááá IP-ááá¡áááá 
ááá %s ááá áá¦áá %s, á ááª 
Tor-áááááá¢áááá¡áááá¡ áªáááááá 
áá¥áááááá.
 summary.negative.title=á¨ááááá á£áá á§áá¤áááá
 summary.negative.body=á©ááá ááá  áááááá®áá 
IP-ááá¡áááá áá %s ááá áá¦áá %s.
-summary.missingdata=However, the database is missing several hours of data for 
this specific request, so that this result must be interpreted carefully.
+summary.missingdata=á¡áááá áá£ááá, 
áááááªáááá ááááá¨á 
ááááá¢ááááá£ááá á áááááááá 
á¡áááá, áááªááá£áá áááá®ááááá¡, 
áá¡á á áá á¨ááááááá á§á£á 
ááá¦áááááá ááá¡ááá£á¨áááááááá.
 technicaldetails.heading=á¢áá¥áááá£á á ááá¢ááááá
 technicaldetails.pre=áá«áááááá IP-ááá¡áááá áá 
%s ááá áá¦áá %s. Tor-áááááá¢ááá¡ 
á¨ááá«áááááá áá Tor-ááááááªáááááá¡ 
áá á©ááá á¬á áááááá¡ á¨áá¡áá¥áááááá.
 technicaldetails.colheader.timestamp=áá ááá¡ áááááááá 
(UTC)

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

[tor-commits] [translation/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed

2019-10-17 Thread translation

commit e4229a8d03d44a1591b4eace03fd40aaea3e31e1
Author: Translation commit bot 
Date:   Thu Oct 17 20:52:55 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
---
 ka/network-settings.dtd | 125 
 1 file changed, 73 insertions(+), 52 deletions(-)

diff --git a/ka/network-settings.dtd b/ka/network-settings.dtd
index 8f79930a9..b0d38062a 100644
--- a/ka/network-settings.dtd
+++ b/ka/network-settings.dtd
@@ -1,62 +1,83 @@
-
-
-
-
+
+
+
+
 
 
-
-
+
+
 
 
 
-
-
-
-
+
+
+
+
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

[tor-commits] [translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings

2019-10-17 Thread translation

commit 8384080ffdea6fdfdb62f7c60e6819199e43f5ae
Author: Translation commit bot 
Date:   Thu Oct 17 20:52:50 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
---
 ka/network-settings.dtd | 34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/ka/network-settings.dtd b/ka/network-settings.dtd
index 786a1e3d7..82ae5ad70 100644
--- a/ka/network-settings.dtd
+++ b/ka/network-settings.dtd
@@ -26,18 +26,18 @@
 
 
 
-
+
 
 
 
-
-
+
+
 
 
 
 
 
-
+
 
 
 
@@ -63,21 +63,21 @@
 
 
 
-
-
+
+
 
 
-
-
+
+
 
-
-
-
-
-
-
+
+
+
+
+
+
 
 
-
-
-
+
+
+

___
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] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseronboardingproperties_completed

2019-10-17 Thread translation

commit 51ab1f3d0b19913ad27118818dfc7771a16682e2
Author: Translation commit bot 
Date:   Thu Oct 17 20:52:10 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseronboardingproperties_completed
---
 ka/browserOnboarding.properties | 109 
 1 file changed, 55 insertions(+), 54 deletions(-)

diff --git a/ka/browserOnboarding.properties b/ka/browserOnboarding.properties
index b976c7635..04a6c0a67 100644
--- a/ka/browserOnboarding.properties
+++ b/ka/browserOnboarding.properties
@@ -2,70 +2,71 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-onboarding.tour-tor-welcome=ááááá¡ááááááá
-onboarding.tour-tor-welcome.title=á§ááááá¤áá á 
áááááá.
-onboarding.tour-tor-welcome.description=Tor-áá áá£ááá á 
ááááááááá á£ááá¦ááá¡á á®áá áá¡á®áá¡ 
áááá¡áá®á£á áááá¡, ááá ááá 
áááááªáááááá¡ áááªááá¡á áá á£á¡áá¤á 
áá®ááááá¡ á£áá á£ááááá¡áá§áá¤áá, 
áááá ááááá¡ ááááá®á£ááááá¡áá¡. 
áá®áá á£ááá áááªá£áá á®áá á 
áááááááááá¡ááá, ááááááá§á£á 
ááááá¡á áá áªáááá£á áá¡ááá. 
áááªááá£áá ááááá£á á á§ááááá¤áá á¡ 
áááááááá á¢ááá.
-onboarding.tour-tor-welcome.next-button=áá®áááá ááá 
ááá£áááá
+# onboarding.tour-tor-welcome=Welcome
+# onboarding.tour-tor-welcome.title=Youâre ready.
+# onboarding.tour-tor-welcome.description=Tor Browser offers the highest 
standard of privacy and security while browsing the web. Youâre now protected 
against tracking, surveillance, and censorship. This quick onboarding will show 
you how.
+# onboarding.tour-tor-welcome.next-button=Go to Privacy
 
-onboarding.tour-tor-privacy=ááá ááá£áááá
-onboarding.tour-tor-privacy.title=ááááªáááá 
ááááááá§á£á áááá áá 
áªááááá¡ááá§ááá áááá
-onboarding.tour-tor-privacy.description=Tor-áá áá£ááá á 
ááªáááááááá¡ á¡ááá¢áá¡ á¤á£ááá£á¨ááá¡ 
áá á¨ááá¡ ááááá®á£áááá£áá áááá 
ááááá¡ áá¡á¢áá ááá¡ ááá®á£á 
ááá¡áááááá. áá¡áááá¡á 
ááááá¢ááá£áá áªááááááááá á£áá 
á£ááááá§áá¤á¡ ááá ááá 
áááááªáááááá¡ áááªááá¡á áá á£á¡áá¤á 
áá®ááááá¡ ááá¦áá á®áá áá¡á®á¡ áá 
áá£ááá á¨á. ááá¬ááááá âTor-á¥á¡áááâ 
áá áá®áááá, áá£ á áááá  á®áááá 
áááªáá á¥á¡áááá¡ áááááá.
-onboarding.tour-tor-privacy.button=áá®áááá Tor-á¥á¡ááá
+# onboarding.tour-tor-privacy=Privacy
+# onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+# onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and 
deletes your browser history after your session. These modifications ensure 
your privacy and security are protected in the browser. Click âTor Networkâ 
to learn how we protect you on the network level.
+# onboarding.tour-tor-privacy.button=Go to Tor Network
 
-onboarding.tour-tor-network=Tor-á¥á¡ááá
-onboarding.tour-tor-network.title=áá¡áá áááááá 
ááááá£áááááááá, áá áááá áááá£áá 
áááá áááááááá¡ááá áááªá£áá 
á¥á¡áááá.
-onboarding.tour-tor-network.description=Tor-áá áá£ááá áá 
á£áááá¨áá ááááá Tor-á¥á¡ááá¡, á ááááá¡ 
áá£á¨ááááá¡ááª á£áá á£ááááá§áá¤á¡ 
áááá¡áááá ááá®áááá¡á, ááááá 
áá¡áá¤áááá¡ ááá¡á¨á¢áááá. 
áááá¡á®ááááááá VPN-áá¡ááá, áá 
á¨áááá®ááááá¨á áá  ááá¬ááá 
áªááááá£áá ááá áá¡ áá áá ááá£ááá¡ 
ááááá áá áá áááá¡áá á®áá á 
áááááááááá£áá, ááá¢áá ááá¢áá 
áááááááá¡ ááá£ááá¦áááááááá á¡áá 
áááááááá¡áá¡.
-onboarding.tour-tor-network.button=áá®áááá á¬á áááá¡ áá 
á
+# onboarding.tour-tor-network=Tor Network
+# onboarding.tour-tor-network.title=Travel a decentralized network.
+# onboarding.tour-tor-network.description=Tor Browser connects you to the Tor 
network run by thousands of volunteers around the world. Unlike a VPN, 
thereâs no one point of failur

[tor-commits] [tor-browser-build/master] Bug 30461: Remove unneeded patches for tor-android-service.

2019-10-17 Thread gk

commit 11672b3b3a615e7493add5d3b3dae0a7ed960551
Author: sisbell 
Date:   Thu Oct 17 12:35:58 2019 -0700

Bug 30461: Remove unneeded patches for tor-android-service.
---
 projects/tor-android-service/build  | 2 --
 projects/tor-android-service/config | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/projects/tor-android-service/build 
b/projects/tor-android-service/build
index 4f5ac9b..8f8d16d 100644
--- a/projects/tor-android-service/build
+++ b/projects/tor-android-service/build
@@ -15,8 +15,6 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') 
%].tar.gz
 
 cd /var/tmp/build/[% project %]-[% c('version') %]
 patch -p1 < $rootdir/remove-native-build.patch
-patch -p1 < $rootdir/disable-daemon.patch
-patch -p1 < $rootdir/maven-local.patch
 
 # Remove native files, otherwise build will fail after gradle.patch
 rm -fR service/src/main/jni
diff --git a/projects/tor-android-service/config 
b/projects/tor-android-service/config
index 1ca2cac..492a3e1 100644
--- a/projects/tor-android-service/config
+++ b/projects/tor-android-service/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]'
-git_hash: 50d01b1fbc6e776d0b39f42f644137dd25a92c7a
+git_hash: e9bbdc6fb25af47ccaf3bace0162125d94812072
 git_url: https://git.torproject.org/tor-android-service.git
 git_submodule: 1
 
@@ -29,5 +29,3 @@ input_files:
   - project: tor-onion-proxy-library
 name: topl
   - filename: remove-native-build.patch
-  - filename: disable-daemon.patch
-  - filename: maven-local.patch

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

[tor-commits] [translation/torbutton-browseronboardingproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseronboardingproperties

2019-10-17 Thread translation

commit 08334e4a61b28ec9b96158369812730ce294b4f1
Author: Translation commit bot 
Date:   Thu Oct 17 20:52:04 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseronboardingproperties
---
 ka/browserOnboarding.properties | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ka/browserOnboarding.properties b/ka/browserOnboarding.properties
index 118327967..5de57a606 100644
--- a/ka/browserOnboarding.properties
+++ b/ka/browserOnboarding.properties
@@ -15,8 +15,8 @@ onboarding.tour-tor-privacy.button=áá®áááá 
Tor-á¥á¡ááá
 onboarding.tour-tor-network=Tor-á¥á¡ááá
 onboarding.tour-tor-network.title=áá¡áá áááááá 
ááááá£áááááááá, áá áááá áááá£áá 
áááá áááááááá¡ááá áááªá£áá 
á¥á¡áááá.
 onboarding.tour-tor-network.description=Tor-áá áá£ááá áá 
á£áááá¨áá ááááá Tor-á¥á¡ááá¡, á ááááá¡ 
áá£á¨ááááá¡ááª á£áá á£ááááá§áá¤á¡ 
áááá¡áááá ááá®áááá¡á, ááááá 
áá¡áá¤áááá¡ ááá¡á¨á¢áááá. 
áááá¡á®ááááááá VPN-áá¡ááá, áá 
á¨áááá®ááááá¨á áá  ááá¬ááá 
áªááááá£áá ááá áá¡ áá áá ááá£ááá¡ 
ááááá áá áá áááá¡áá á®áá á 
áááááááááá£áá, ááá¢áá ááá¢áá 
áááááááá¡ ááá£ááá¦áááááááá á¡áá 
áááááááá¡áá¡.
-onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, 
including the ability to request bridges where Tor is blocked, can now be found 
in Preferences.
-onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings
+onboarding.tour-tor-network.description-para2=á¡ááá®áá: 
Tor-á¥á¡áááá¡ ááááá ááá, ááá áááá, 
á®áááááá¡ áááá®áááá, Tor-áá¡ 
á¨ááá¦á£áááá¡ ááá ááááá¨á, áá®áá 
á£ááá á¨áááá«áááá ááá áááá¢á 
áááááá.
+onboarding.tour-tor-network.action-button=ááááá ááá 
Tor-á¥á¡áááá¡ ááá áááá¢á ááá
 onboarding.tour-tor-network.button=áá®áááá á¬á áááá¡ áá 
á
 
 onboarding.tour-tor-circuit-display=á¬á áááá¡ áá á
@@ -49,10 +49,10 @@ onboarding.tour-tor-update.prefix-new=áá®ááá
 onboarding.tour-tor-update.prefix-updated=ááááá®áááá£áá
 
 onboarding.tour-tor-toolbar=á®ááá¡áá¬á§ááá áááá
-onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button.
-onboarding.tour-tor-toolbar-update-9.0.description=We want your experience 
using Tor to be fully integrated within Tor Browser.
-onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, 
rather than using the onion button, you can see your Tor Circuit via the [i] in 
the URL bar and request a New Identity using the toolbar button or the [â¡] 
menu.
-onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity
+onboarding.tour-tor-toolbar-update-9.0.title=áá¨ááááááá Onion 
Button.
+onboarding.tour-tor-toolbar-update-9.0.description=ááá¡á£á á¡, á 
áá Tor á¡á á£ááá áá§áá¡ á©áá¨ááááá£áá 
Tor-áá áá£ááá á¨á.
+onboarding.tour-tor-toolbar-update-9.0.description-para2=á¡á¬áá áá 
áááá¢áá, ááááá áááá Tor-á¬á ááá¡ 
áá®ááááá onion-á¦áááááá¡ áááªáááá, [i] 
ááá¨áááá ááá¬ááááááá¡áá¡ ááá¡áááá 
ááááá¡ áááá¨á,  á®ááá áá®ááá 
áááááááá¡ áááá®áááá 
á¨áááá«ááááá á®ááá¡áá¬á§ááá 
ááááááá áá [â¡] ááááá£ááá.
+onboarding.tour-tor-toolbar-update-9.0.button=á áááá  á®áááá 
áá®ááá áááááááá¡ áááá®áááá
 onboarding.tour-tor-toolbar-update-9.0.next-button=áá®áááá 
Tor-á¥á¡ááá
 
 # Circuit Display onboarding.

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

[tor-commits] [translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json

2019-10-17 Thread translation

commit 3adf4a5ea9a437666ef938abee5253d9227a5c5e
Author: Translation commit bot 
Date:   Thu Oct 17 20:47:07 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
---
 ka/messages.json | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ka/messages.json b/ka/messages.json
index a2e6436ca..748227b60 100644
--- a/ka/messages.json
+++ b/ka/messages.json
@@ -39,37 +39,37 @@
 "message": "áá áá£ááá á"
   },
   "censoredUsers": {
-"message": "If your internet access is censored, you should download https://www.torproject.org/download/\";>Tor Browser."
+"message": "áá£ áá¥áááá ááá¢áá 
ááá¢áááá¨áá á áªáááá£á áá¡ á¥ááá¨áá, 
ááá á©ááá á©áááá¢ááá ááá https://www.torproject.org/download/\";>Tor-áá áá£ááá á."
   },
   "extension": {
 "message": "ááá¤áá ááááá"
   },
   "installExtension": {
-"message": "If your internet access is not censored, you 
should consider installing the Snowflake extension to help users in censored 
networks. There is no need to worry about which websites people are accessing 
through your proxy. Their visible browsing IP address will match their Tor exit 
node, not yours."
+"message": "áá£ áá¥áááá ááá¢áá 
ááá¢áááá¨áá á áá áá áªáááá£á 
áá¡ á¥ááá¨, á¡áá¡á£á ááááá áááá§áááá 
ááá¤áá ááááá Snowflake á áá áááá®ááá áá 
áªáááá£á áá¡ á¥ááá¨ áá§áá¤ááá¡. 
á¨áááá«áááá áá  áá¦ááááá, áá£ á 
áááá á¡ááá¢ááá¡ áá¬áááá á®ááá®á 
áá¥áááá áá áá¥á¡áá¡ áááááá. ááá 
IP-ááá¡áááá ááááá ááááá©ááááá 
áááá áááá¡ááááá Tor-á¬áá á¢ááááá áá 
áá á áá¥áááá."
   },
   "installFirefox": {
-"message": "Install in Firefox"
+"message": "á©ááááá Firefox-á¨á"
   },
   "installChrome": {
-"message": "Install in Chrome"
+"message": "á©ááááá Chrome-á¨á"
   },
   "reportingBugs": {
-"message": "Reporting Bugs"
+"message": "á®áá ááááááá¡ ááá®á¡ááááá"
   },
   "fileBug": {
-"message": "If you encounter problems with Snowflake as a client or a 
proxy, please consider filing a bug.  To do so, you will have to,"
+"message": "áá£ á ááá á®áá áááá¡ 
áááááá¬á§ááá Snowflake-áá¡ áááááá¢áá¡ áá 
áá áá¥á¡áá¡ ááááá§áááááá¡áá¡, 
ááá®ááá, áááááá®á¡áááá.  
áááá¡áááá¡ á¡áááá áá,"
   },
   "sharedAccount": {
-"message": "Either https://trac.torproject.org/projects/tor/register\";>create an 
account or https://trac.torproject.org/projects/tor/login\";>log 
in using the shared cypherpunks account with password 
writecode."
+"message": "áá á£ááá https://trac.torproject.org/projects/tor/register\";>á¨áá¥áááá
 ááááá áá¨á áá https://trac.torproject.org/projects/tor/login\";>á¨áá®ááááá
 áááááá§áááá á¨áá¤á ááááááááá¡ 
á¡ááááá á ááááá áá¨á ááá áááá 
writecode."
   },
   "bugTracker": {
-"message": "https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake\";>File
 a ticket using our bug tracker."
+"message": "https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake\";>á¨áá¥ááááá
 áááááá á®áá ááááááá¡ áá¦áá 
ááªá®áááá¡ ááá¨áááááá."
   },
   "descriptive": {
-"message": "Please try to be as descriptive as possible with your ticket 
and if possible include log messages that will help us reproduce the bug. 
Consider adding keywords snowflake-webextension or 
snowflake-client to let us know how which part of the Snowflake system 
is experiencing problems."
+"message": "ááá®ááá, á¨áááªáááá ááá¢áá 
áá áªááá áá¦á¬áá áá á¡ááááá®á 
áááááá¨á áá áá£ á¨áá¡áá«ááááááá 
ááá£á ááá áá¦á ááªá®ááá¡ 
á¨áá¢á§ááááááááá, á ááª áááááá®ááá 
ááá ááááááááá¬ááá á®áá áááá. 
á¡áá¡á£á ááááá á¡áááááá«á 
á¡áá¢á§ááááá ááá£ááááá 
snowflake-webextension áá snowflake-clientá ááª 
áááá£á¬á§ááá¡, áá£ Snowflake-á¡áá¡á¢áááá¡ á á 
ááá¬ááááá á¬á

[tor-commits] [translation/snowflakeaddon-messages.json_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed

2019-10-17 Thread translation

commit b1334f6de1b7ec3095f26fe211b906b0cb239ded
Author: Translation commit bot 
Date:   Thu Oct 17 20:47:12 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed
---
 ka/messages.json | 48 
 1 file changed, 48 insertions(+)

diff --git a/ka/messages.json b/ka/messages.json
index e83a0fdd3..0d638c7d4 100644
--- a/ka/messages.json
+++ b/ka/messages.json
@@ -28,5 +28,53 @@
   },
   "badgeCookiesOff": {
 "message": "Cookies are not enabled."
+  },
+  "websiteIntro": {
+"message": "Snowflake is a system to defeat internet censorship. People 
who are censored can use Snowflake to access the internet. Their connection 
goes through Snowflake proxies, which are run by volunteers. For more detailed 
information about how Snowflake works see our https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\"; 
data-msgid=\"__MSG_docWiki__\">documentation wiki."
+  },
+  "docWiki": {
+"message": "documentation wiki"
+  },
+  "browser": {
+"message": "Browser"
+  },
+  "censoredUsers": {
+"message": "If your internet access is censored, you should download https://www.torproject.org/download/\";>Tor Browser."
+  },
+  "extension": {
+"message": "Extension"
+  },
+  "installExtension": {
+"message": "If your internet access is not censored, you 
should consider installing the Snowflake extension to help users in censored 
networks. There is no need to worry about which websites people are accessing 
through your proxy. Their visible browsing IP address will match their Tor exit 
node, not yours."
+  },
+  "installFirefox": {
+"message": "Install in Firefox"
+  },
+  "installChrome": {
+"message": "Install in Chrome"
+  },
+  "reportingBugs": {
+"message": "Reporting Bugs"
+  },
+  "fileBug": {
+"message": "If you encounter problems with Snowflake as a client or a 
proxy, please consider filing a bug.  To do so, you will have to,"
+  },
+  "sharedAccount": {
+"message": "Either https://trac.torproject.org/projects/tor/register\";>create an 
account or https://trac.torproject.org/projects/tor/login\";>log 
in using the shared cypherpunks account with password 
writecode."
+  },
+  "bugTracker": {
+"message": "https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake\";>File
 a ticket using our bug tracker."
+  },
+  "descriptive": {
+"message": "Please try to be as descriptive as possible with your ticket 
and if possible include log messages that will help us reproduce the bug. 
Consider adding keywords snowflake-webextension or 
snowflake-client to let us know how which part of the Snowflake system 
is experiencing problems."
+  },
+  "embed": {
+"message": "Embed"
+  },
+  "possible": {
+"message": "It is now possible to embed the Snowflake badge on any 
website:"
+  },
+  "looksLike": {
+"message": "Which looks like this:"
   }
 }

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

[tor-commits] [translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot

2019-10-17 Thread translation

commit 554ac631be66b48be33ec55538fd5ae933fccd74
Author: Translation commit bot 
Date:   Thu Oct 17 20:46:54 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
---
 code_of_conduct+fr.po | 44 ++--
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/code_of_conduct+fr.po b/code_of_conduct+fr.po
index 5590ec4a8..97a5ce810 100644
--- a/code_of_conduct+fr.po
+++ b/code_of_conduct+fr.po
@@ -652,21 +652,21 @@ msgid ""
 "danger or harm to anyone. More information about the Community Council's "
 "incident reporting and response policies can be found on their wiki [1]."
 msgstr ""
-"Si vous Ãªtes sujet Ã  un comportement inacceptable ou si vous en Ãªtes 
tÃ©moin,"
-" ou si vous avez dâautres prÃ©occupations, veuillez en informer le conseil "
-"communautaire le plus rapidement possible. Vous pouvez contacter le conseil "
-"communautaire en personne ou Ã  tor-community-coun...@lists.torproject.org. "
-"Les membres actuels du conseil sont listÃ©s sur le wiki [1]. La rÃ©action du "
-"conseil communautaire aux incidents variera au cas par cas. Le conseil "
+"Si vous Ãªtes lâobjet dâun comportement inacceptable ou si vous en Ãªtes "
+"tÃ©moin, ou encore si quelque prÃ©occupation vous habite, veuillez en 
informer"
+" le conseil communautaire dÃ¨s que possible. Vous pouvez contacter le conseil"
+" communautaire en personne ou Ã  tor-community-coun...@lists.torproject.org. "
+"Les membres actuels du conseil sont rÃ©pertoriÃ©s sur le wiki [1]. La 
rÃ©action"
+" du conseil communautaire aux incidents variera selon les cas. Le conseil "
 "sâefforcera de rÃ©agir immÃ©diatement Ã  lâincident. Le conseil accordera 
la "
-"prioritÃ© Ã  la sÃ©curitÃ© de la personne qui a Ã©tÃ© blessÃ©e ou risque de 
lâÃªtre."
-" Les personnes qui ont subi un prÃ©judice ou qui risquent de lâÃªtre 
peuvent "
-"retirer le rapport dâincident Ã  tout moment. Nous ne ferons jamais rien 
sans"
-" le consentement de la personne qui a subi un prÃ©judice ou qui risque de "
-"lâÃªtre, sauf dans des situations oÃ¹ il existe un danger de danger 
imminent "
-"ou de prÃ©judice pour quiconque. Vous trouverez plus dâinformations sur les 
"
-"rapports dâincident et les politiques de rÃ©ponse du conseil communautaire "
-"sur son wiki [1]."
+"prioritÃ© Ã  la sÃ©curitÃ© de la personne qui a Ã©tÃ© lÃ©sÃ©e ou risque de 
lâÃªtre. "
+"Les personnes qui ont Ã©tÃ© lÃ©sÃ©es ou qui risquent de lâÃªtre peuvent 
retirer "
+"le rapport dâincident Ã  tout moment. Nous nâentreprendrons jamais aucune 
"
+"action sans le consentement de la personne qui a Ã©tÃ© lÃ©sÃ©e ou qui risque 
de "
+"lâÃªtre, sauf dans les situations de danger imminent ou dâatteinte envers 
"
+"quelquâun. De plus amples renseignements sur les politiques de signalement "
+"dâincidents et dâintervention du conseil communautaire se trouvent sur 
son "
+"wiki [1]."
 
 #. type: Plain text
 #: ../code_of_conduct.txt:233
@@ -675,7 +675,7 @@ msgid ""
 "7. What the person reporting a violation can expect\n"
 "\n"
 msgstr ""
-"7. Ce Ã  quoi la personne qui signale une contraventions peut sâattendre\n"
+"7. Ce Ã  quoi la personne qui signale une contravention peut sâattendre\n"
 "=== ==\n"
 
 #. type: Plain text
@@ -691,13 +691,13 @@ msgid ""
 "basis."
 msgstr ""
 "Le conseil communautaire donne la prioritÃ© Ã  la sÃ©curitÃ© et au bien-Ãªtre 
de "
-"toute personne qui estime avoir Ã©tÃ© lÃ©sÃ©e ou risquant de lâÃªtre. Toute 
"
-"personne signalant un problÃ¨me au Conseil de la communautÃ© peut 
sâattendre Ã "
-" ce que son rapport soit pris au sÃ©rieux. Les rapports initiaux peuvent 
Ãªtre"
-" pris sous forme Ã©crite ou verbale. Si lâincident ne nÃ©cessite pas de "
-"rÃ©solution immÃ©diate, un rapport Ã©crit peut Ãªtre partagÃ© avec le conseil 
"
-"communautaire dans un format cryptÃ©. Les prochaines Ã©tapes dâune "
-"intervention en cas dâincident varieront au cas par cas."
+"toute personne qui estime avoir Ã©tÃ© lÃ©sÃ©e ou risque de lâÃªtre. 
Quiconque "
+"signale un problÃ¨me au conseil communautaire peut sâattendre Ã  ce que son 
"
+"signalement soit pris au sÃ©rieux. Les signalements initiaux peuvent Ãªtre "
+"reÃ§us sous forme Ã©crite ou verbale. Si lâincident nâexige pas de 
rÃ©solution "
+"immÃ©diate, un signalement Ã©crit peut alors Ãªtre partagÃ© avec le conseil "
+"communautaire sous forme chiffrÃ©e. Les prochaines Ã©tapes dâune 
intervention "
+"en cas dâincident varieront selon les cas."
 
 #. type: Plain text
 #: ../code_of_conduct.txt:245

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

[tor-commits] [translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings

2019-10-17 Thread translation

commit fe422f70ef8f3eb0a2f758fd8703c0b000cf54ed
Author: Translation commit bot 
Date:   Thu Oct 17 20:22:32 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
---
 lt/network-settings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lt/network-settings.dtd b/lt/network-settings.dtd
index b7ea124dc..faf089e64 100644
--- a/lt/network-settings.dtd
+++ b/lt/network-settings.dtd
@@ -79,5 +79,5 @@
 
 
 
-
+
 

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

[tor-commits] [translation/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed

2019-10-17 Thread translation

commit d1cc9e3343a26c0e89275b53736c79a42056a6aa
Author: Translation commit bot 
Date:   Thu Oct 17 20:22:37 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
---
 lt/network-settings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lt/network-settings.dtd b/lt/network-settings.dtd
index 2c3c55125..0c2877e72 100644
--- a/lt/network-settings.dtd
+++ b/lt/network-settings.dtd
@@ -79,5 +79,5 @@
 
 
 
-
+
 

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

[tor-commits] [translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json

2019-10-17 Thread translation

commit bde3a6c77f7ba4f85f2fb2417d6c9a4f7114ee65
Author: Translation commit bot 
Date:   Thu Oct 17 20:17:03 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
---
 ka/messages.json | 4 ++--
 lt/messages.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ka/messages.json b/ka/messages.json
index a3399c234..a2e6436ca 100644
--- a/ka/messages.json
+++ b/ka/messages.json
@@ -30,10 +30,10 @@
 "message": "á¤á£ááá£á¨ááá áá áá á©áá 
áá£áá."
   },
   "websiteIntro": {
-"message": "Snowflake is a system to defeat internet censorship. People 
who are censored can use Snowflake to access the internet. Their connection 
goes through Snowflake proxies, which are run by volunteers. For more detailed 
information about how Snowflake works see our https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\"; 
data-msgid=\"__MSG_docWiki__\">documentation wiki."
+"message": "Snowflake á¬áá áááááááá¡ 
á¡áá¡á¢áááá¡ ááá¢áá ááá¢-áªáááá£á áá¡ 
ááá¡áá¡ááááá. á®ááá®á¡ á áááááááª 
áªáááá£á áá¡ á¥ááá¨ áá ááá, á¨áá£á«áááá 
áááááá§áááá Snowflake ááá¢áá ááá¢ááá 
á¬áááááá¡áááá¡.  áááá áááá¨áá á 
ááááááá¡áááá ááááá Snowflake-áá 
áá¥á¡áááá, á áááááá¡ááª 
ááá£á¨áááááá ááá®áááá¡áááá. 
Snowflake-áá¡ áá£á¨ááááá¡ á¨áá¡áá®áá áá 
áªááá, áá®áááá á©áááá https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\"; 
data-msgid=\"__MSG_docWiki__\">ááá¡áááááá¡ 
ááááá¨á."
   },
   "docWiki": {
-"message": "documentation wiki"
+"message": "áááá®ááá á ááá¡áááááá¡ 
áááá"
   },
   "browser": {
 "message": "áá áá£ááá á"
diff --git a/lt/messages.json b/lt/messages.json
index bbd8efd29..fdb98be24 100644
--- a/lt/messages.json
+++ b/lt/messages.json
@@ -39,7 +39,7 @@
 "message": "NarÅ¡yklÄ"
   },
   "censoredUsers": {
-"message": "If your internet access is censored, you should download https://www.torproject.org/download/\";>Tor Browser."
+"message": "Jeigu jÅ«sÅ³ interneto prieiga yra cenzÅ«ruojama, turÄtumÄte 
atsisiÅ³sti Tor Browser."
   },
   "extension": {
 "message": "PlÄtinys"

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

[tor-commits] [translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot

2019-10-17 Thread translation

commit 746332b7c21549696191f2326bc1f1178a79d892
Author: Translation commit bot 
Date:   Thu Oct 17 19:46:52 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
---
 code_of_conduct+fr.po | 43 ++-
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/code_of_conduct+fr.po b/code_of_conduct+fr.po
index 382474e75..5590ec4a8 100644
--- a/code_of_conduct+fr.po
+++ b/code_of_conduct+fr.po
@@ -587,18 +587,19 @@ msgid ""
 "and information can be found on the Community Council wiki [1].  You can "
 "contact the whole Community council:"
 msgstr ""
-"Le conseil de communautÃ© est un organe Ã©lu de contributeurs Tor Core qui "
-"peut aider Ã  la rÃ©solution de conflits intra-communautaires. Les politiques 
"
-"et informations du conseil communautaire se trouvent sur le wiki du conseil "
-"communautaire [1]. Vous pouvez contacter lâensemble du conseil de "
-"communautÃ©:"
+"Le conseil communautaire est un organe Ã©lu composÃ© de contributeurs "
+"principaux de Tor, qui peuvent aider Ã  la rÃ©solution de conflits "
+"intracommunautaires. Les politiques du conseil communautaire et des "
+"renseignements sur ce dernier se trouvent sur le wiki du conseil "
+"communautaire [1]. Vous pouvez contacter lâensemble du conseil 
communautaire"
+"Â :"
 
 #. type: Bullet: '  - '
 #: ../code_of_conduct.txt:203
 msgid "if you have questions or concerns about the code of conduct, or"
 msgstr ""
-"si vous avez des questions ou des prÃ©occupations au sujet du code de "
-"conduite, ou"
+"si vous avez des questions ou des prÃ©occupations quant au code de conduite, "
+"ou"
 
 #. type: Bullet: '  - '
 #: ../code_of_conduct.txt:205
@@ -616,13 +617,13 @@ msgid ""
 "involved in any discussion or documentation of the incident. More about the "
 "Community Council can be found in the guidelines [2]."
 msgstr ""
-"Toutefois, si vous estimez quâil existe un conflit dâintÃ©rÃªts avec 
lâun des "
-"membres du conseil, vous pouvez contacter les membres individuellement. Les "
-"clÃ©s GPG des membres du conseil sont rÃ©pertoriÃ©es sur le wiki du conseil 
de "
-"communautÃ©. En cas de conflit dâintÃ©rÃªts, le membre du conseil concernÃ© 
se "
-"rÃ©cuse. Ils ne seront impliquÃ©s dans aucune discussion ou documentation de "
-"lâincident. Vous trouverez plus dâinformations sur le conseil 
communautaire "
-"dans les lignes directrices [2]."
+"Toutefois, si vous estimez que lâun des membres du conseil se trouve en "
+"position de conflit dâintÃ©rÃªts, vous pouvez contacter les membres "
+"individuellement. Les clÃ©s GPG des membres du conseil sont rÃ©pertoriÃ©es 
sur "
+"le wiki du conseil communautaire. Si conflit dâintÃ©rÃªts il y a, le membre 
"
+"concernÃ© du conseil se rÃ©cusera. Il ne sera impliquÃ© dans aucune 
discussion "
+"ni documentation de lâincident. De plus amples renseignements sur le 
conseil"
+" communautaire se trouvent dans les lignes directrices [2]."
 
 #. type: Plain text
 #: ../code_of_conduct.txt:215
@@ -631,7 +632,7 @@ msgid ""
 "6. What to do if you witness unacceptable behavior\n"
 "\n"
 msgstr ""
-"6. Que faire si vous Ãªtes tÃ©moin dâun comportement inacceptable\n"
+"6. Que faire si vous Ãªtes tÃ©moin dâun comportement inacceptableâ?\n"
 " === ==\n"
 
 #. type: Plain text
@@ -654,9 +655,9 @@ msgstr ""
 "Si vous Ãªtes sujet Ã  un comportement inacceptable ou si vous en Ãªtes 
tÃ©moin,"
 " ou si vous avez dâautres prÃ©occupations, veuillez en informer le conseil "
 "communautaire le plus rapidement possible. Vous pouvez contacter le conseil "
-"de communautÃ© en personne ou Ã  tor-community-coun...@lists.torproject.org. "
+"communautaire en personne ou Ã  tor-community-coun...@lists.torproject.org. "
 "Les membres actuels du conseil sont listÃ©s sur le wiki [1]. La rÃ©action du "
-"conseil de communautÃ© aux incidents variera au cas par cas. Le conseil "
+"conseil communautaire aux incidents variera au cas par cas. Le conseil "
 "sâefforcera de rÃ©agir immÃ©diatement Ã  lâincident. Le conseil accordera 
la "
 "prioritÃ© Ã  la sÃ©curitÃ© de la personne qui a Ã©tÃ© blessÃ©e ou risque de 
lâÃªtre."
 " Les personnes qui ont subi un prÃ©judice ou qui risquent de lâÃªtre 
peuvent "
@@ -694,9 +695,9 @@ msgstr ""
 "personne signalant un problÃ¨me au Conseil de la communautÃ© peut 
sâattendre Ã "
 " ce que son rapport soit pris au sÃ©rieux. Les rapports initiaux peuvent 
Ãªtre"
 " pris sous forme Ã©crite ou verbale. Si lâincident ne nÃ©cessite pas de "
-"rÃ©solution immÃ©diate, un rapport Ã©crit peut Ãªtre partagÃ© avec le conseil 
de "
-"communautÃ© dans un format cryptÃ©. Les prochaines Ã©tapes dâune 
intervention "
-"en cas dâincident varieront au cas par cas."
+"rÃ©solution immÃ©diate, un rapport Ã©crit peut Ãªtre partagÃ© avec le conseil 
"
+"communautaire dans un format cryp

[tor-commits] [translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot

2019-10-17 Thread translation

commit c3b5e2aa43a51cb8649170ba7ff08c1995d6699e
Author: Translation commit bot 
Date:   Thu Oct 17 19:15:41 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/fr/LC_MESSAGES/messages.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 2a4fd851b..945c50369 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -938,7 +938,7 @@ msgstr ""
 "Vous pouvez dÃ©couvrir les principaux contributeurs au ProjetÂ Tor sur notre "
 "https://www.torproject.org/fr/about/people/#core\";>page des contributeurs principaux Ã  Tor."
+"class=\"links\">page des contributeurs du NoyauÂ Tor."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:116
 msgid "Who uses Tor?"

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

[tor-commits] [translation/donatepages-messagespot_completed] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot_completed

2019-10-17 Thread translation

commit c8bc9a56f106754b844a92a486c381e1038300d6
Author: Translation commit bot 
Date:   Thu Oct 17 19:15:48 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot_completed
---
 locale/fr/LC_MESSAGES/messages.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index 2a4fd851b..945c50369 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -938,7 +938,7 @@ msgstr ""
 "Vous pouvez dÃ©couvrir les principaux contributeurs au ProjetÂ Tor sur notre "
 "https://www.torproject.org/fr/about/people/#core\";>page des contributeurs principaux Ã  Tor."
+"class=\"links\">page des contributeurs du NoyauÂ Tor."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:116
 msgid "Who uses Tor?"

___
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-68.1.0esr-9.0-3] squash! Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.

2019-10-17 Thread gk

commit 55b6cd7f3139dd0069ba2c69ec6d08da038594ad
Author: Matthew Finkel 
Date:   Sat Oct 12 00:48:05 2019 +

squash! Orfox: Centralized proxy applied to AbstractCommunicator and 
BaseResources.

Bug 31144 - ESR68 Network Code Review
---
 .../base/java/org/mozilla/gecko/GeckoApplication.java   | 12 +---
 .../src/main/java/org/mozilla/gecko/util/BitmapUtils.java   | 13 +++--
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java 
b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
index 26e06b55ecfc..bb3cdec7c0fe 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
@@ -61,6 +61,7 @@ import org.mozilla.gecko.util.GeckoBundle;
 import org.mozilla.gecko.util.HardwareUtils;
 import org.mozilla.gecko.util.IntentUtils;
 import org.mozilla.gecko.util.PRNGFixes;
+import org.mozilla.gecko.util.ProxySelector;
 import org.mozilla.gecko.util.ShortcutUtils;
 import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.geckoview.GeckoRuntime;
@@ -71,7 +72,7 @@ import java.io.File;
 import java.io.InputStream;
 import java.io.IOException;
 import java.lang.reflect.Method;
-import java.net.URL;
+import java.net.URI;
 import java.util.UUID;
 
 import org.torproject.android.service.util.Prefs;
@@ -866,11 +867,16 @@ public class GeckoApplication extends Application
 byte[] buf = Base64.decode(aSrc.substring(dataStart + 1), 
Base64.DEFAULT);
 image = BitmapUtils.decodeByteArray(buf);
 } else {
+URI uri;
 int byteRead;
 byte[] buf = new byte[4192];
 os = new ByteArrayOutputStream();
-URL url = new URL(aSrc);
-is = url.openStream();
+try {
+uri = new URI(aSrc);
+} catch (Exception e) {
+return;
+}
+is = 
ProxySelector.openConnectionWithProxy(uri).getInputStream();
 
 // Cannot read from same stream twice. Also, InputStream from
 // URL does not support reset. So converting to byte array.
diff --git 
a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/BitmapUtils.java
 
b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/BitmapUtils.java
index 2a3f08de4ae7..b5e1a9664b35 100644
--- 
a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/BitmapUtils.java
+++ 
b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/BitmapUtils.java
@@ -103,16 +103,9 @@ public final class BitmapUtils {
 public static Bitmap decodeUrl(final URL url) {
 InputStream stream = null;
 
-try {
-if ("jar".equals(url.getProtocol())) {
-final Context context = GeckoAppShell.getApplicationContext();
-stream = GeckoJarReader.getStream(context, url.toString());
-} else {
-stream = url.openStream();
-}
-} catch (IOException e) {
-Log.w(LOGTAG, "decodeUrl: IOException downloading " + url);
-return null;
+if ("jar".equals(url.getProtocol())) {
+final Context context = GeckoAppShell.getApplicationContext();
+stream = GeckoJarReader.getStream(context, url.toString());
 }
 
 if (stream == null) {

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

[tor-commits] [translation/donatepages-messagespot_completed] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot_completed

2019-10-17 Thread translation

commit 8d80b764d8dfeee86ce3948b601984608a49e582
Author: Translation commit bot 
Date:   Thu Oct 17 18:45:48 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot_completed
---
 locale/fr/LC_MESSAGES/messages.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index fd701998b..2a4fd851b 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -937,8 +937,8 @@ msgid ""
 msgstr ""
 "Vous pouvez dÃ©couvrir les principaux contributeurs au ProjetÂ Tor sur notre "
 "https://www.torproject.org/about/corepeople.html.en\";>page des contributeurs au noyauÂ Tor ."
+"href=\"https://www.torproject.org/fr/about/people/#core\";>page des contributeurs principaux Ã  Tor."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:116
 msgid "Who uses Tor?"

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

[tor-commits] [translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot

2019-10-17 Thread translation

commit 9b9bc75abf863ca9f5cd9c1ab1a8dcd1357b991a
Author: Translation commit bot 
Date:   Thu Oct 17 18:45:41 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/fr/LC_MESSAGES/messages.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index fd701998b..2a4fd851b 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -937,8 +937,8 @@ msgid ""
 msgstr ""
 "Vous pouvez dÃ©couvrir les principaux contributeurs au ProjetÂ Tor sur notre "
 "https://www.torproject.org/about/corepeople.html.en\";>page des contributeurs au noyauÂ Tor ."
+"href=\"https://www.torproject.org/fr/about/people/#core\";>page des contributeurs principaux Ã  Tor."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:116
 msgid "Who uses Tor?"

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

[tor-commits] [community/master] Fix some local errors

2019-10-17 Thread hiro

commit 0e4d7f7f2a79bd4843932b35a31f1e57cfa1fd19
Author: hiro 
Date:   Thu Oct 17 20:23:28 2019 +0200

Fix some local errors
---
 content/user-research/become-tester/contents.lr | 5 +
 lego| 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/content/user-research/become-tester/contents.lr 
b/content/user-research/become-tester/contents.lr
index c30c983..7025245 100644
--- a/content/user-research/become-tester/contents.lr
+++ b/content/user-research/become-tester/contents.lr
@@ -8,3 +8,8 @@ subtitle: We regularly release Tor Browser Alpha versions to 
allow users to test
 ---
 key: 1
 ---
+_template: layout.html
+---
+html: two-columns-page.html
+---
+body:
diff --git a/lego b/lego
index 8cb5f20..09c5813 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 8cb5f20089a163b0a5134d841248778cb518bdf2
+Subproject commit 09c5813e895e67104dbdcf15bfec66367bd11790

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

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2019-10-17 Thread translation

commit d64c838f633bd2150452a85c176e12388b3c37af
Author: Translation commit bot 
Date:   Thu Oct 17 18:24:46 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+pt-BR.po | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index dedca38ad..2a129aa21 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -3382,6 +3382,9 @@ msgid ""
 "device. It is a one stop browser that uses the Tor network and tries to be "
 "as anonymous as possible."
 msgstr ""
+"O Navegador Tor para Android Ã© como o Navegador Tor na Ã¡rea de trabalho, 
mas"
+" no seu dispositivo mÃ³vel. Ã um navegador Ãºnico que usa a rede Tor e tenta 
"
+"ser o mais anÃ´nimo possÃvel."
 
 #: https//support.torproject.org/tormobile/tormobile-6/
 #: (content/tormobile/tormobile-6/contents+en.lrquestion.description)
@@ -3391,6 +3394,11 @@ msgid ""
 "through the tor network; a version of Orbot is also inside of the Tor "
 "Browser for Android, and is what enables it to connect to the Tor network."
 msgstr ""
+"O Orbot, por outro lado, Ã© um proxy que permitirÃ¡ que vocÃª envie os dados 
de"
+" seus outros aplicativos (clientes de e-mail, aplicativos de mensagens "
+"instantÃ¢neas etc.) atravÃ©s da rede tor; uma versÃ£o do Orbot tambÃ©m estÃ¡ "
+"dentro do Navegador Tor para Android e Ã© o que permite que ele se conecte Ã  
"
+"rede Tor."
 
 #: https//support.torproject.org/tormobile/tormobile-6/
 #: (content/tormobile/tormobile-6/contents+en.lrquestion.description)
@@ -3405,6 +3413,8 @@ msgid ""
 "Depending on how you want to use the tor network, either one or both of "
 "these could be a great option."
 msgstr ""
+"Dependendo de como vocÃª deseja usar a rede tor, um ou os dois podem ser uma "
+"Ã³tima opÃ§Ã£o."
 
 #: https//support.torproject.org/tormobile/tormobile-7/
 #: (content/tormobile/tormobile-7/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/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings

2019-10-17 Thread translation

commit 5812e4bc5c03195a9b122fb2902a1c996e412336
Author: Translation commit bot 
Date:   Thu Oct 17 18:22:34 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
---
 pt_BR/network-settings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/network-settings.dtd b/pt_BR/network-settings.dtd
index 25c4d9acc..b1c40d8cf 100644
--- a/pt_BR/network-settings.dtd
+++ b/pt_BR/network-settings.dtd
@@ -79,5 +79,5 @@
 
 
 
-
+
 

___
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-68.1.0esr-9.0-3] fixup! Bug 25741 - TBA: Add mozconfig for Android and pertinent branding files.

2019-10-17 Thread gk

commit 47e35494838222732b9eb9638fb40e7a9707b307
Author: Matthew Finkel 
Date:   Fri Oct 11 15:17:04 2019 +

fixup! Bug 25741 - TBA: Add mozconfig for Android and pertinent branding 
files.
---
 mobile/android/app/000-tor-browser-android.js | 12 
 1 file changed, 12 deletions(-)

diff --git a/mobile/android/app/000-tor-browser-android.js 
b/mobile/android/app/000-tor-browser-android.js
index 7fdf796e5caf..0017cb2d058a 100644
--- a/mobile/android/app/000-tor-browser-android.js
+++ b/mobile/android/app/000-tor-browser-android.js
@@ -5,18 +5,6 @@
 
 #include ../../../browser/app/profile/000-tor-browser.js
 
-
-// Disable Presentation API
-pref("dom.presentation.controller.enabled", false);
-pref("dom.presentation.enabled", false);
-pref("dom.presentation.discoverable", false);
-pref("dom.presentation.discoverable.encrypted", false);
-pref("dom.presentation.discovery.enabled", false);
-pref("dom.presentation.receiver.enabled", false);
-
-pref("dom.audiochannel.audioCompeting", false);
-pref("dom.audiochannel.mediaControl", false);
-
 // Space separated list of URLs that are allowed to send objects (instead of
 // only strings) through webchannels. This list is duplicated in 
browser/app/profile/firefox.js
 pref("webchannel.allowObject.urlWhitelist", "");

___
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-68.1.0esr-9.0-3] squash! TB4: Tor Browser's Firefox preference overrides.

2019-10-17 Thread gk

commit 947d477eb9289ebcdbbf48ee77609a6d7f395785
Author: Matthew Finkel 
Date:   Fri Oct 11 15:16:17 2019 +

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

Disable Presentation API everywhere
---
 browser/app/profile/000-tor-browser.js | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/browser/app/profile/000-tor-browser.js 
b/browser/app/profile/000-tor-browser.js
index 4c244b49d181..974f8c31af17 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -364,6 +364,17 @@ pref("browser.taskbar.lists.tasks.enabled", false);
 pref("browser.taskbar.lists.recent.enabled", false);
 #endif
 
+// Disable Presentation API
+pref("dom.presentation.controller.enabled", false);
+pref("dom.presentation.enabled", false);
+pref("dom.presentation.discoverable", false);
+pref("dom.presentation.discoverable.encrypted", false);
+pref("dom.presentation.discovery.enabled", false);
+pref("dom.presentation.receiver.enabled", false);
+
+pref("dom.audiochannel.audioCompeting", false);
+pref("dom.audiochannel.mediaControl", false);
+
 #expand pref("torbrowser.version", __TOR_BROWSER_VERSION_QUOTED__);
 
 // If we are bundling fonts, whitelist those bundled fonts, and restrict 
system fonts to a selection.



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

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2019-10-17 Thread translation

commit 2782d586fc96b3ddf93f1c9d56bb64afb6822123
Author: Translation commit bot 
Date:   Thu Oct 17 17:53:44 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+pt-BR.po | 17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index 955aafb50..dedca38ad 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -570,6 +570,9 @@ msgid ""
 "specific "
 "applications](https://trac.torproject.org/projects/tor/wiki/doc/TorifyHOWTO)."
 msgstr ""
+"Nossa wiki possui uma lista mantida pela comunidade de instruÃ§Ãµes para "
+"[Torificando aplicaÃ§Ãµes "
+"especÃficas](https://trac.torproject.org/projects/tor/wiki/doc/TorifyHOWTO)."
 
 #: https//support.torproject.org/about/can-i-use-tor-with/
 #: (content/about/can-i-use-tor-with/contents+en.lrquestion.description)
@@ -2097,7 +2100,7 @@ msgid ""
 "manual.torproject.org/uninstalling/) in the Tor Browser Manual."
 msgstr ""
 "Por favor, consulte a [seÃ§Ã£o 
Desinstalando](https://tb-manual.torproject.org";
-"/pt-BR/uninstalling/) Por favor, consulte a [seÃ§Ã£o Desinstalando]"
+"/pt-BR/uninstalling/) no manual do navegador Tor."
 
 #: https//support.torproject.org/tbb/tbb-29/
 #: (content/tbb/tbb-29/contents+en.lrquestion.title)
@@ -2808,7 +2811,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-46/
 #: (content/tbb/tbb-46/contents+en.lrquestion.title)
 msgid "How do I install Tor Browser?"
-msgstr ""
+msgstr "Como instalo o Navegador Tor?"
 
 #: https//support.torproject.org/tbb/tbb-46/
 #: (content/tbb/tbb-46/contents+en.lrquestion.description)
@@ -2816,6 +2819,8 @@ msgid ""
 "Please see the [Installation](https://tb-";
 "manual.torproject.org/installation/) section in the Tor Browser Manual."
 msgstr ""
+"Por favor, consulte a [seÃ§Ã£o instalaÃ§Ã£o](https://tb-manual.torproject.org";
+"/pt-BR/installation/) no manual do navegador Tor."
 
 #: https//support.torproject.org/tbb/tbb-47/
 #: (content/tbb/tbb-47/contents+en.lrquestion.title)
@@ -3145,6 +3150,9 @@ msgid ""
 "* Note the Library folder is hidden on newer versions of macOS. To navigate "
 "to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
+"* Observe que a pasta Biblioteca estÃ¡ oculta nas versÃµes mais recentes do "
+"macOS. Para navegar para esta pasta no Finder, selecione \"Ir para a pasta "
+"...\" no menu \"Ir\"."
 
 #: https//support.torproject.org/tbb/tbb-editing-torrc/
 #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description)
@@ -3160,6 +3168,7 @@ msgstr ""
 msgid ""
 "*  Then type \"~/Library/Application Support/\" in the window and click Go."
 msgstr ""
+"*  EntÃ£o digite \"~/Library/Application Support/\" na janela e clique em Ir."
 
 #: https//support.torproject.org/tbb/tbb-editing-torrc/
 #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description)
@@ -3355,7 +3364,7 @@ msgstr ""
 #: https//support.torproject.org/tormobile/tormobile-6/
 #: (content/tormobile/tormobile-6/contents+en.lrquestion.title)
 msgid "Do I need both Tor Browser for Android and Orbot, or only one?"
-msgstr ""
+msgstr "Preciso do Navegador Tor para Android e Orbot, ou de apenas um?"
 
 #: https//support.torproject.org/tormobile/tormobile-6/
 #: (content/tormobile/tormobile-6/contents+en.lrquestion.description)
@@ -3363,6 +3372,8 @@ msgid ""
 "While both Tor Browser for Android and Orbot are great, they serve different"
 " purposes."
 msgstr ""
+"Embora o Navegador Tor para Android e o Orbot sejam Ã³timos, eles servem a "
+"propÃ³sitos diferentes."
 
 #: https//support.torproject.org/tormobile/tormobile-6/
 #: (content/tormobile/tormobile-6/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/tbmanual-contentspot_completed] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed

2019-10-17 Thread translation

commit 19ede4d6c07b412ce121c42b7c90140730e618f3
Author: Translation commit bot 
Date:   Thu Oct 17 17:50:32 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed
---
 contents+pt-BR.po | 2125 +
 1 file changed, 2125 insertions(+)

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
new file mode 100644
index 0..3f06df2e9
--- /dev/null
+++ b/contents+pt-BR.po
@@ -0,0 +1,2125 @@
+# Translators:
+# Chacal E., 2019
+# Communia , 2019
+# Emma Peel, 2019
+# Alexei GonÃ§alves de Oliveira , 2019
+# Cy Belle , 2019
+# erinm, 2019
+# Eduardo Addad de Oliveira , 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-09-05 17:40+CET\n"
+"PO-Revision-Date: 2018-11-14 12:31+\n"
+"Last-Translator: Eduardo Addad de Oliveira , 2019\n"
+"Language-Team: Portuguese (Brazil) 
(https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: https//tb-manual.torproject.org/ (content/contents+en.lrshowcase.title)
+msgid "Tor Browser User Manual"
+msgstr "Manual do Navegador Tor "
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "About"
+msgstr "Sobre"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Documentation"
+msgstr "DocumentaÃ§Ã£o"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Press"
+msgstr "Imprensa"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Blog"
+msgstr "Blog"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Newsletter"
+msgstr "Boletim de notÃcias"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Contact"
+msgstr "Contato"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "About Tor Browser"
+msgstr "Sobre o Navegador Tor"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Downloading"
+msgstr "Fazendo download"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Running Tor Browser for the first time"
+msgstr "Executando o Navegador Tor pela primeira vez"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Pluggable transports"
+msgstr "Transportadores plugÃ¡veis"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Circumvention"
+msgstr "Contornar a censura"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Bridges"
+msgstr "Pontes"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Managing identities"
+msgstr ""
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Onion Services"
+msgstr "ServiÃ§os Onion"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Secure Connections"
+msgstr ""
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Security Settings"
+msgstr ""
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Updating"
+msgstr ""
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr ""
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Troubleshooting"
+msgstr ""
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Uninstalling"
+msgstr ""
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.description)
+msgid "Known issues"
+msgstr ""
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor Translator"
+msgstr ""
+
+#: https//tb-manual.torproject.org/about/
+#: (content/about/contents+en.lrtopic.title)
+msgid "ABOUT TOR BROWSER"
+msgstr ""
+
+#: https//tb-manual.torproject.org/about/
+#: (content/about/contents+en.lrtopic.description)
+msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
+msgstr ""
+
+#: https//tb-manual.torproject.org/about/
+#: (content/about/contents+en.lrtopic.body)
+msgid ""
+"Tor Browser uses the Tor network to protect your privacy and anonymity. "
+"Using the Tor network has two main properties:"
+msgstr ""
+
+#: https//tb-manual.torproject.org/about/
+#: (content/about/contents+en.lrtopic.body)
+msgid ""
+"* Your internet

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

2019-10-17 Thread translation

commit 6ec67e26344f2037bac2667c5068a1f2bc0f31b7
Author: Translation commit bot 
Date:   Thu Oct 17 17:50:23 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+pt-BR.po | 53 -
 1 file changed, 48 insertions(+), 5 deletions(-)

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index 21e330cbf..3bd74a987 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -199,6 +199,10 @@ msgid ""
 " valid for a single session (until Tor Browser is exited or a [New Identity"
 "](/managing-identities/#new-identity) is requested)."
 msgstr ""
+"Por padrÃ£o, o Navegador Tor nÃ£o mantÃ©m nenhum histÃ³rico de navegaÃ§Ã£o. 
Os "
+"cookies sÃ£o vÃ¡lidos apenas para uma Ãºnica sessÃ£o (atÃ© a saÃda do 
Navegador "
+"Tor ou uma [Nova Identidade](/managing-identities/#new-identity) Ã© "
+"solicitado)."
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -1532,7 +1536,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid "## Safest"
-msgstr ""
+msgstr "## Mais seguro"
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
@@ -1544,6 +1548,13 @@ msgid ""
 "disabled by default on all sites; most video and audio formats are disabled;"
 " and some fonts and icons may not display correctly."
 msgstr ""
+"* Nesse nÃvel, a mÃdia de Ã¡udio e vÃdeo HTML5 se torna reproduzida por 
meio "
+"do NoScript; todas as otimizaÃ§Ãµes de desempenho do JavaScript estÃ£o "
+"desativadas; algumas equaÃ§Ãµes matemÃ¡ticas podem nÃ£o ser exibidas "
+"corretamente; alguns recursos de renderizaÃ§Ã£o de fonte estÃ£o desativados; "
+"alguns tipos de imagem estÃ£o desativados; Javascript estÃ¡ desativado por "
+"padrÃ£o em todos os sites; a maioria dos formatos de vÃdeo e Ã¡udio estÃ¡ "
+"desativada; e algumas fontes e Ãcones podem nÃ£o ser exibidos corretamente."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
@@ -1561,6 +1572,12 @@ msgid ""
 "features are disabled; some types of image are disabled; and JavaScript is "
 "disabled by default on all non-[HTTPS](/secure-connections) sites."
 msgstr ""
+"Nesse nÃvel, a mÃdia de Ã¡udio e vÃdeo HTML5 se torna reproduzida por meio 
do"
+" NoScript; todas as otimizaÃ§Ãµes de desempenho do JavaScript estÃ£o "
+"desativadas; algumas equaÃ§Ãµes matemÃ¡ticas podem nÃ£o ser exibidas "
+"corretamente; alguns recursos de renderizaÃ§Ã£o de fonte estÃ£o desativados; "
+"alguns tipos de imagem estÃ£o desativados; e o JavaScript estÃ¡ desativado 
por"
+" padrÃ£o em todos os sites nÃ£o [HTTPS](/secure-connections)."
 
 #: https//tb-manual.torproject.org/security-slider/
 #: (content/security-slider/contents+en.lrtopic.body)
@@ -1731,6 +1748,9 @@ msgid ""
 "symbols, and images are disabled; audio and video (HTML5 media) are click-"
 "to-play."
 msgstr ""
+"* Javascript estÃ¡ desativado por padrÃ£o em todos os sites; algumas fontes, "
+"Ãcones, sÃmbolos matemÃ¡ticos e imagens estÃ£o desativados; Ã¡udio e vÃdeo 
"
+"(mÃdia HTML5) sÃ£o reproduzidos por clique."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.title)
@@ -1833,6 +1853,9 @@ msgid ""
 "Remove Tor Browser from your system by deleting the folder that contains it "
 "(see the [Uninstalling](/uninstalling) section for more information)."
 msgstr ""
+"Remova o Navegador Tor do seu sistema excluindo a pasta que o contÃ©m "
+"(consulte a seÃ§Ã£o  [Desinstalando](/uninstalling) para obter mais "
+"informaÃ§Ãµes)."
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.body)
@@ -2070,6 +2093,10 @@ msgid ""
 "but not yet fixed. Please check the [Known Issues](/known-issues) page to "
 "see if the problem you are experiencing is already listed there."
 msgstr ""
+"O  estÃ¡ em constante desenvolvimento e alguns problemas sÃ£o conhecidos, mas 
"
+"ainda nÃ£o foram corrigidos. Por favor, verifique na pÃ¡gina [Problemas "
+"conhecidos](/known-issues) para ver se o problema que vocÃª estÃ¡ enfrentando 
"
+"jÃ¡ estÃ¡ listado lÃ¡."
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.title)
@@ -2170,6 +2197,8 @@ msgid ""
 "* BitTorrent in specific is [not anonymous over "
 "Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 msgstr ""
+"* O BitTorrent em especÃfico Ã© [nÃ£o anÃ´nimo sobre Tor] "
+"(https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)."
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.title)
@@ -2221,6 +2250,7 @@ msgid ""
 "* Locate your Tor Browser application. The default location is the "
 "Applications folder."
 msgstr ""
+"* Localize o aplicativo Navegador Tor. O local padrÃ£o Ã© a pasta 
Aplicativos."
 
 #:

[tor-commits] [translation/snowflakeaddon-messages.json_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed

2019-10-17 Thread translation

commit 2e8c2ce1573005bbf789ac65a369beaec1bfd3d3
Author: Translation commit bot 
Date:   Thu Oct 17 17:47:19 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed
---
 fr/messages.json | 48 
 1 file changed, 48 insertions(+)

diff --git a/fr/messages.json b/fr/messages.json
index 302a427d0..34451367e 100644
--- a/fr/messages.json
+++ b/fr/messages.json
@@ -28,5 +28,53 @@
   },
   "badgeCookiesOff": {
 "message": "Les tÃ©moins ne sont pas activÃ©s."
+  },
+  "websiteIntro": {
+"message": "Snowflake est un systÃ¨me pour contrecarrer la censure sur 
Internet. Les personnes victimes de censure peuvent utiliser Snowflake pour 
accÃ©der Ã  Internet. Leur connexion passe par des mandatairesÂ Snowflake dont 
les opÃ©rateurs sont des bÃ©nÃ©voles. Pour de plus amples renseignements sur le 
fonctionnement de Snowflake, consultez notre https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\"; 
data-msgid=\"__MSG_docWiki__\">wiki de documentation (page en anglais)."
+  },
+  "docWiki": {
+"message": "wiki de documentation"
+  },
+  "browser": {
+"message": "Navigateur"
+  },
+  "censoredUsers": {
+"message": "Si votre accÃ¨s Ã  Internet est censurÃ©, vous devriez 
tÃ©lÃ©charger le https://www.torproject.org/fr/download/\";>NavigateurÂ Tor."
+  },
+  "extension": {
+"message": "Extension"
+  },
+  "installExtension": {
+"message": "Si votre accÃ¨s Ã  Internet nâest pas 
censurÃ©, vous devriez envisager dâinstaller lâextension Snowflake pour 
aider les utilisateurs sur les rÃ©seaux censurÃ©s. Vous nâavez pas Ã  vous 
soucier des sites Web auxquels les utilisateurs accÃ¨dent par votre mandataire. 
Leur adresse IP visible de navigation correspondra Ã  leur nÅud de sortie de 
Tor, pas Ã  la vÃ´tre."
+  },
+  "installFirefox": {
+"message": "Installer dans Firefox"
+  },
+  "installChrome": {
+"message": "Installer dans Chrome"
+  },
+  "reportingBugs": {
+"message": "Signaler des bogues"
+  },
+  "fileBug": {
+"message": "Si vous rencontrez des problÃ¨mes avec Snowflake comme client 
ou comme mandataire, veuillez envisager de remplir un relevÃ© de bogue. Pour ce 
faire, vous devrezÂ :"
+  },
+  "sharedAccount": {
+"message": "Soit https://trac.torproject.org/projects/tor/register\";>crÃ©er un compte 
ou vous https://trac.torproject.org/projects/tor/login\";>connecter avec le 
compte partagÃ© cypherpunks et le mot de passe writecode."
+  },
+  "bugTracker": {
+"message": "Soit https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake\";>remplir
 un ticket en utilisant notre systÃ¨me de suivi des bogues."
+  },
+  "descriptive": {
+"message": "Veuillez essayer de crÃ©er un ticket des plus descriptif, et 
si possible, joignez-y des messages de journalisation qui nous aideront Ã  
reproduire le bogue. Essayez dâajouter les mots-clÃ©s 
snowflake-webextension ou snowflake-client pour nous indiquer 
quelle partie du systÃ¨me Snowflake Ã©prouve des problÃ¨mes."
+  },
+  "embed": {
+"message": "IntÃ©grer"
+  },
+  "possible": {
+"message": "Il est maintenant possible dâintÃ©grer le macaronÂ Snowflake 
sur nâimporte quel site WebÂ :"
+  },
+  "looksLike": {
+"message": "Qui ressemble Ã  ceciÂ :"
   }
 }

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

[tor-commits] [translation/snowflake-website-indexhtml] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml

2019-10-17 Thread translation

commit b5fd62def02e726174af8f14e615672d5e8bce27
Author: Translation commit bot 
Date:   Thu Oct 17 17:47:25 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml
---
 fr/index.html | 87 ++-
 1 file changed, 57 insertions(+), 30 deletions(-)

diff --git a/fr/index.html b/fr/index.html
index 1dcf6183e..88fefe1d2 100644
--- a/fr/index.html
+++ b/fr/index.html
@@ -1,56 +1,83 @@
 
-
+
 
 
 
 Snowflake
-
-
+
+
+
 
-
-https://www.torproject.org/";>
-SNOWFLAKE
+
+https://www.torproject.org/";>
+  
+
+  
+  
+
+  
+  SNOWFLAKE
 
-  https://trac.torproject.org/projects/tor/raw-attachment/wiki/doc/Snowflake/snowflake-schematic.png";
 alt="Diagram">
+https://trac.torproject.org/projects/tor/raw-attachment/wiki/doc/Snowflake/snowflake-schematic.png";
 alt="Diagram">
 
-  Snowflake est un systÃ¨me pour contrecarrer la censure sur Internet. 
Les personnes victimes de censure peuvent utiliser Snowflake pour accÃ©der Ã  
Internet. Leur connexion passe par des mandatairesÂ Snowflake qui sont 
exploitÃ©s par des bÃ©nÃ©voles. Pour de plus amples renseignements sur le 
fonctionnement de Snowflake, consultez notre https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/";>wiki de 
documentation (page en anglais).
+Snowflake is a system to defeat 
internet censorship. People who are
+censored can use Snowflake to access the internet. Their connection 
goes
+through Snowflake proxies, which are run by volunteers. For more 
detailed
+information about how Snowflake works see our
+https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/"; 
data-msgid="__MSG_docWiki__">documentation wiki.
 
-  
+
 
-Navigateur
+  Navigateur
 
-  Si votre accÃ¨s Ã  Internet est censurÃ©, vous devriez 
tÃ©lÃ©charger le https://www.torproject.org/download/";>NavigateurÂ 
Tor.
+If your internet access is 
censored, you should download 
+https://www.torproject.org/download/";>Tor Browser.
 
-  
-Extension
+
+  Extension
 
-  Si votre accÃ¨s Ã  Internet nâest pas 
censurÃ©, vous devriez envisager dâinstaller lâextension Snowflake pour 
aider les utilisateurs sur les rÃ©seaux censurÃ©s. Vous nâavez pas Ã  vous 
soucier des sites Web auxquels les utilisateurs accÃ¨dent par votre mandataire. 
Leur adresse IP visible de navigation correspondra Ã  leur nÅud de sortie de 
Tor, pas au vÃ´tre.
+If your internet access 
is not censored, you should
+consider installing the Snowflake extension to help users in 
censored
+networks. There is no need to worry about which websites people are
+accessing through your proxy. Their visible browsing IP address 
will
+match their Tor exit node, not yours.
 
-  https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/";>
-  Installer dans Firefox
+https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/";>
+  Install in 
Firefox
 
 https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie";>
-  Installer dans Chrome
+  Install in 
Chrome
 
-
+  
 
 
-  SIGNALER DES BOGUES
+Signaler des 
bogues
 
-Si vous rencontrez des problÃ¨mes avec Snowflake comme client ou 
comme mandataire, veuillez envisager de remplir un relevÃ© de bogue. Pour ce 
faire, vous devrezÂ :
+  If you encounter problems with 
Snowflake as a client or a proxy,
+  please consider filing a bug.  To do so, you will have to,
 
-
-Soit https://trac.torproject.org/projects/tor/register";>crÃ©er un 
compte ou vous https://trac.torproject.org/projects/tor/login";>connecter avec le 
compte partagÃ© cypherpunks et le mot de passe writecode.
-  Soit https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake";>remplir
 un ticket en utilisant notre systÃ¨me de suivi des bogues.
-
-Veuillez essayer de crÃ©er un ticket des plus descriptif, et si possible, 
incluez des messages de journalisation qui nous aideront Ã  reproduire le 
bogue. Essayez dâajouter les mots-clÃ©s snowflake-webextension ou 
snowflake-client pour nous indiquer quelle partie du systÃ¨me 
Snowflake Ã©prouve des problÃ¨mes.
-  INTÃGRER
+  
+Either https://trac.torproject.org/projects/tor/register";>create an
+account or https://trac.torproject.org/projects/tor/login";>log in
+  using the shared cypherpunks account with password 
writecode.
+
+https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake";>File
 a ticket
+  using our bug tracker.
+  
+Please try to be

[tor-commits] [translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json

2019-10-17 Thread translation

commit a0a3b54bb6ef115e4e90dace57fe4067ba10a864
Author: Translation commit bot 
Date:   Thu Oct 17 17:47:13 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
---
 fr/messages.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fr/messages.json b/fr/messages.json
index f04a8d4f0..34451367e 100644
--- a/fr/messages.json
+++ b/fr/messages.json
@@ -66,10 +66,10 @@
 "message": "Soit https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake\";>remplir
 un ticket en utilisant notre systÃ¨me de suivi des bogues."
   },
   "descriptive": {
-"message": "Please try to be as descriptive as possible with your ticket 
and if possible include log messages that will help us reproduce the bug. 
Consider adding keywords snowflake-webextension or 
snowflake-client to let us know how which part of the Snowflake system 
is experiencing problems."
+"message": "Veuillez essayer de crÃ©er un ticket des plus descriptif, et 
si possible, joignez-y des messages de journalisation qui nous aideront Ã  
reproduire le bogue. Essayez dâajouter les mots-clÃ©s 
snowflake-webextension ou snowflake-client pour nous indiquer 
quelle partie du systÃ¨me Snowflake Ã©prouve des problÃ¨mes."
   },
   "embed": {
-"message": "Embed"
+"message": "IntÃ©grer"
   },
   "possible": {
 "message": "Il est maintenant possible dâintÃ©grer le macaronÂ Snowflake 
sur nâimporte quel site WebÂ :"

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

[tor-commits] [translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot

2019-10-17 Thread translation

commit 2351e71b100952dfc4cf1ae4887568242e6a881b
Author: Translation commit bot 
Date:   Thu Oct 17 17:46:59 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
---
 code_of_conduct+fr.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code_of_conduct+fr.po b/code_of_conduct+fr.po
index 3142e334c..382474e75 100644
--- a/code_of_conduct+fr.po
+++ b/code_of_conduct+fr.po
@@ -565,8 +565,8 @@ msgid ""
 "behalf without their consent."
 msgstr ""
 "Toute personne Ã  laquelle un autre membre de la communautÃ© demande de 
mettre"
-" fin Ã  un comportement inacceptable doit se conformer immÃ©diatement. Sâil 
"
-"vous plaÃ®t, nâintervenez pas au nom de quelquâun dâautre sans son "
+" fin Ã  un comportement inacceptable devra se conformer immÃ©diatement Ã  
cette"
+" demande. Veuillez ne pas intervenir au nom de quelquâun dâautre sans son 
 "
 "consentement."
 
 #. type: Plain text
@@ -576,7 +576,7 @@ msgid ""
 "5. Where to go for help\n"
 "\n"
 msgstr ""
-"5. OÃ¹ obtenir de lâaide\n"
+"5. OÃ¹ trouver de lâaideâ?\n"
 "\n"
 
 #. type: Plain text
@@ -705,7 +705,7 @@ msgid ""
 "8. How the Community Council responds to incidents\n"
 "\n"
 msgstr ""
-"8. Comment le conseil communautaire rÃ©pond aux incidents\n"
+"8. La rÃ©ponse du conseil communautaire aux incidents\n"
 "=== ==\n"
 
 #. type: Plain text

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

[tor-commits] [translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot

2019-10-17 Thread translation

commit da64cbd549dae3f0aacccec3cda6d878f2b9b7b7
Author: Translation commit bot 
Date:   Thu Oct 17 17:16:55 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
---
 code_of_conduct+fr.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/code_of_conduct+fr.po b/code_of_conduct+fr.po
index 894af7691..3142e334c 100644
--- a/code_of_conduct+fr.po
+++ b/code_of_conduct+fr.po
@@ -526,12 +526,12 @@ msgstr ""
 #. type: Bullet: '  * '
 #: ../code_of_conduct.txt:177
 msgid "Deliberately pushing against someone's stated boundaries."
-msgstr "Pousser dÃ©libÃ©rÃ©ment contre les limites dÃ©clarÃ©es de quelquâun."
+msgstr "Pousser dÃ©libÃ©rÃ©ment les limites dÃ©clarÃ©es de quelquâun."
 
 #. type: Bullet: '  * '
 #: ../code_of_conduct.txt:179
 msgid "Advocating for, or encouraging, any of the above behavior."
-msgstr "DÃ©fendre ou encourager lâun des comportements ci-dessus."
+msgstr "PrÃ´ner ou encourager lâun des comportements ci-dessus."
 
 #. type: Plain text
 #: ../code_of_conduct.txt:182
@@ -551,11 +551,11 @@ msgid ""
 "authority.  People in formal or informal leadership roles must model the "
 "highest standards of behavior."
 msgstr ""
-"Nous ne tolÃ©rerons aucun comportement inacceptable de la part dâun membre 
de"
-" la communautÃ©. Nous ne ferons pas dâexceptions pour les sponsors et ceux "
-"qui ont un pouvoir dÃ©cisionnel. Les personnes occupant des rÃ´les de "
-"direction formels ou informels doivent adopter les normes de comportement "
-"les plus strictes."
+"Nous ne tolÃ©rerons de comportement inacceptable dâaucun membre de la "
+"communautÃ©. Nous ne ferons dâexception ni pour les commanditaires ni pour "
+"ceux qui dÃ©tiennent le pouvoir dÃ©cisionnel. Les personnes qui occupent des "
+"rÃ´les de direction formels ou informels doivent adopter les normes les plus "
+"Ã©levÃ©es en matiÃ¨re de comportement."
 
 #. type: Plain text
 #: ../code_of_conduct.txt:192

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

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2019-10-17 Thread translation

commit 58ecaef90b429bf96952bfe78ad64c973151b49a
Author: Translation commit bot 
Date:   Thu Oct 17 16:53:22 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+ml.po | 249 -
 1 file changed, 209 insertions(+), 40 deletions(-)

diff --git a/contents+ml.po b/contents+ml.po
index 660c5bfa2..a2f1cf7fe 100644
--- a/contents+ml.po
+++ b/contents+ml.po
@@ -783,17 +783,22 @@ msgstr ""
 #: 
(content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description)
 msgid "Simple proxy providers also create a single point of failure."
 msgstr ""
+"à´²à´³à´¿à´¤à´®à´¾à´¯ à´ªàµà´°àµà´àµà´¸à´¿ à´¦à´¾à´¤à´¾à´àµà´à´³àµà´ 
à´ªà´°à´¾à´à´¯à´¤àµà´¤à´¿à´¨àµà´±àµ à´à´°àµà´±àµà´± 
à´ªàµà´¯à´¿à´¨àµà´±àµ à´¸àµà´·àµà´à´¿à´àµà´àµà´¨àµà´¨àµ."
 
 #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/
 #: 
(content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description)
 msgid ""
 "The provider knows both who you are and what you browse on the Internet."
 msgstr ""
+"à´¨à´¿à´àµà´àµ¾ à´à´°à´¾à´£àµà´¨àµà´¨àµà´ à´¨à´¿à´àµà´àµ¾ 
à´à´¨àµà´±àµ¼à´¨àµà´±àµà´±à´¿àµ½ 
à´¬àµà´°àµà´¸àµà´àµà´¯àµà´¯àµà´¨àµà´¨à´¤àµ 
à´à´¨àµà´¤à´¾à´£àµà´¨àµà´¨àµà´ "
+"à´¦à´¾à´¤à´¾à´µà´¿à´¨àµ à´à´±à´¿à´¯à´¾à´."
 
 #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/
 #: 
(content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description)
 msgid "They can see your traffic as it passes through their server."
 msgstr ""
+"à´¨à´¿à´àµà´à´³àµà´àµ à´àµà´°à´¾à´«à´¿à´àµ à´à´µà´°àµà´àµ 
à´¸àµàµ¼à´µà´±à´¿à´²àµà´àµ à´à´à´¨àµà´¨àµà´ªàµà´àµà´®àµà´ªàµàµ¾ à´
à´µàµ¼à´àµà´àµ à´à´¤àµ à´à´¾à´£à´¾àµ» "
+"à´à´´à´¿à´¯àµà´."
 
 #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/
 #: 
(content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description)
@@ -801,6 +806,9 @@ msgid ""
 "In some cases, they can even see inside your encrypted traffic as they relay"
 " it to your banking site or to ecommerce stores."
 msgstr ""
+"à´à´¿à´² à´¸à´¾à´¹à´à´°àµà´¯à´àµà´à´³à´¿àµ½, 
à´¨à´¿à´àµà´à´³àµà´àµ à´àµ»âà´àµà´°à´¿à´ªàµà´±àµà´±àµ 
à´àµà´¯àµà´¤ à´àµà´°à´¾à´«à´¿à´àµ à´¨à´¿à´àµà´à´³àµà´àµ "
+"à´¬à´¾à´àµà´à´¿à´à´àµ à´¸àµà´±àµà´±à´¿à´²àµà´àµà´àµ 
à´-à´àµà´®àµà´´àµâà´¸àµ 
à´¸àµà´±àµà´±àµà´±àµà´à´³à´¿à´²àµà´àµà´àµ à´±à´¿à´²àµ 
à´àµà´¯àµà´¯àµà´®àµà´ªàµàµ¾ à´à´µ "
+"à´à´¾à´£à´¾à´¨à´¾à´àµà´."
 
 #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/
 #: 
(content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description)
@@ -809,6 +817,9 @@ msgid ""
 "own advertisements into your traffic stream, or recording your personal "
 "details."
 msgstr ""
+"à´¦à´¾à´¤à´¾à´µàµ à´¨à´¿à´àµà´à´³àµà´àµ à´àµà´°à´¾à´«à´¿à´àµ 
à´à´¾à´£àµà´¨àµà´¨à´¿à´²àµà´²àµà´¨àµà´¨àµà´ à´à´µà´°àµà´àµ 
à´ªà´°à´¸àµà´¯à´àµà´àµ¾ à´¨à´¿à´àµà´à´³àµà´àµ "
+"à´àµà´°à´¾à´«à´¿à´àµ à´¸àµà´àµà´°àµà´®à´¿à´²àµà´àµà´àµ 
à´à´à´¤àµà´¤à´¿à´µà´¿à´àµà´¨àµà´¨à´¿à´²àµà´²àµà´¨àµà´¨àµà´ à´
à´²àµà´²àµà´àµà´à´¿àµ½ à´¨à´¿à´àµà´à´³àµà´àµ "
+"à´µàµà´¯à´àµà´¤à´¿à´à´¤ à´µà´¿à´¶à´¦à´¾à´à´¶à´àµà´àµ¾ 
à´°àµà´à´ªàµà´ªàµà´àµà´¤àµà´¤àµà´¨àµà´¨à´¿à´²àµà´²àµà´¨àµà´¨àµà´ 
à´¨à´¿à´àµà´àµ¾ à´µà´¿à´¶àµà´µà´¸à´¿à´àµà´à´£à´."
 
 #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/
 #: 
(content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description)
@@ -816,6 +827,8 @@ msgid ""
 "Tor passes your traffic through at least 3 different servers before sending "
 "it on to the destination."
 msgstr ""
+"à´²à´àµà´·àµà´¯à´¸àµà´¥à´¾à´¨à´¤àµà´¤àµà´àµà´àµ à´
à´¯à´¯àµâà´àµà´àµà´¨àµà´¨à´¤à´¿à´¨àµ à´®àµà´®àµà´ªàµ à´àµàµ¼ 
à´¨à´¿à´àµà´à´³àµà´àµ à´àµà´°à´¾à´«à´¿à´àµà´à´¿à´¨àµ "
+"à´àµà´±à´àµà´à´¤àµ 3 à´µàµà´¯à´¤àµà´¯à´¸àµà´¤ 
à´¸àµàµ¼à´µà´±àµà´à´³à´¿à´²àµà´àµ 
à´à´à´¨àµà´¨àµà´ªàµà´àµà´¨àµà´¨àµ."
 
 #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/
 #: 
(content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.description)
@@ -824,6 +837,9 @@ msgid ""
 " somebody watching your Internet connection can't modify, or read, what you "
 "are sending into the Tor network."
 msgstr ""
+"à´®àµà´¨àµà´¨àµ à´±à´¿à´²àµà´à´³à´¿à´²àµà´ 
à´à´°àµà´¨àµà´¨à´¿à´¨àµà´ à´ªàµà´°à´¤àµà´¯àµà´ 
à´àµ»âà´àµà´°à´¿à´ªàµà´·àµ» à´ªà´¾à´³à´¿ à´à´³àµà´³à´¤à´¿à´¨à´¾àµ½, 
à´¨à´¿à´àµà´à´³àµà´àµ "
+"à´à´¨àµà´±àµ¼à´¨àµà´±àµà´±àµ à´à´£à´àµà´·àµ» à´à´¾à´£àµà´¨àµà´¨ 
à´à´°à´¾àµ¾à´àµà´àµ à´¨à´¿à´àµà´àµ¾ à´àµàµ¼ 
à´¨àµà´±àµà´±àµâà´µàµ¼à´àµà´à´¿à´²à

[tor-commits] [tor-launcher/master] Release preparations for 0.2.20

2019-10-17 Thread gk

commit 6a22ee94943ff57a0abf8200e3aaad6dcf009009
Author: Georg Koppen 
Date:   Thu Oct 17 16:27:06 2019 +

Release preparations for 0.2.20

Version bump
---
 src/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/install.rdf b/src/install.rdf
index 40d84da..e77f99e 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -7,7 +7,7 @@
 The Tor Project, Inc.
 Pearl Crescent, LLC
 tor-launc...@torproject.org
-0.2.19.5
+0.2.20
 true
 
https://www.torproject.org/projects/torbrowser.html
 data:text/plain,

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

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

2019-10-17 Thread gk

commit 7903c068dfd02672a68c9bb6246aca7b97c08cab
Author: Georg Koppen 
Date:   Thu Oct 17 16:25:44 2019 +

Translations update
---
 chrome/locale/ca/browserOnboarding.properties| 12 +++---
 chrome/locale/es-AR/browserOnboarding.properties |  2 +-
 chrome/locale/es-ES/browserOnboarding.properties | 10 ++---
 chrome/locale/fr/browserOnboarding.properties|  4 +-
 chrome/locale/fr/torbutton.dtd   |  2 +-
 chrome/locale/ga-IE/torbutton.dtd|  2 +-
 chrome/locale/is/browserOnboarding.properties| 12 +++---
 chrome/locale/it/browserOnboarding.properties| 12 +++---
 chrome/locale/ja/browserOnboarding.properties| 12 +++---
 chrome/locale/nl/torbutton.properties|  2 +-
 chrome/locale/pl/browserOnboarding.properties|  2 +-
 chrome/locale/ru/browserOnboarding.properties| 52 
 chrome/locale/zh-TW/browserOnboarding.properties | 14 +++
 13 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/chrome/locale/ca/browserOnboarding.properties 
b/chrome/locale/ca/browserOnboarding.properties
index b3125ed0..f2b473d1 100644
--- a/chrome/locale/ca/browserOnboarding.properties
+++ b/chrome/locale/ca/browserOnboarding.properties
@@ -15,8 +15,8 @@ onboarding.tour-tor-privacy.button=Aneu a la xarxa Tor
 onboarding.tour-tor-network=Xarxa Tor
 onboarding.tour-tor-network.title=Viatja per una xarxa descentralitzada.
 onboarding.tour-tor-network.description=El navegador Tor us connecta a la 
xarxa Tor gestionada per milers de voluntaris de tot el mÃ³n. A diferÃ¨ncia 
d'una VPN, no hi ha cap punt de fracÃ s o entitat centralitzada que necessiteu 
confiar per gaudir d'Internet en privat.
-onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, 
including the ability to request bridges where Tor is blocked, can now be found 
in Preferences.
-onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings
+onboarding.tour-tor-network.description-para2=NOVETAT: ConfiguraciÃ³ de la 
xarxa Tor que podeu trobar a les Opcions, inclosa la capacitat per demanar 
lÃnies de pont si el Tor estÃ  blocat.
+onboarding.tour-tor-network.action-button=Configureu la vostra xarxa Tor
 onboarding.tour-tor-network.button=VÃ©s a la pantalla de circuits
 
 onboarding.tour-tor-circuit-display=Pantalla de circuits
@@ -49,10 +49,10 @@ onboarding.tour-tor-update.prefix-new=Nou
 onboarding.tour-tor-update.prefix-updated=Actualitzat
 
 onboarding.tour-tor-toolbar=Barra d'eines
-onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button.
-onboarding.tour-tor-toolbar-update-9.0.description=We want your experience 
using Tor to be fully integrated within Tor Browser.
-onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, 
rather than using the onion button, you can see your Tor Circuit via the [i] in 
the URL bar and request a New Identity using the toolbar button or the [â¡] 
menu.
-onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity
+onboarding.tour-tor-toolbar-update-9.0.title=AdÃ©u botÃ³ Onion
+onboarding.tour-tor-toolbar-update-9.0.description=Volem que la vostra 
experiÃ¨ncia usant el Tor sigui Ãntegra, mitjanÃ§ant el navegador Tor.
+onboarding.tour-tor-toolbar-update-9.0.description-para2=Ãs per aquest motiu 
que, en comptes de veure el botÃ³ de la ceba, ara veieu el logotip del Circuit 
del Tor a [i] de l'URL i en demanar una identitat mitjanÃ§ant el botÃ³ de la 
barra d'eines o el menÃº [â¡] .
+onboarding.tour-tor-toolbar-update-9.0.button=Com demanar una identitat nova
 onboarding.tour-tor-toolbar-update-9.0.next-button=Aneu a la Xarxa Tor
 
 # Circuit Display onboarding.
diff --git a/chrome/locale/es-AR/browserOnboarding.properties 
b/chrome/locale/es-AR/browserOnboarding.properties
index b3d531b7..2808fa7f 100644
--- a/chrome/locale/es-AR/browserOnboarding.properties
+++ b/chrome/locale/es-AR/browserOnboarding.properties
@@ -15,7 +15,7 @@ onboarding.tour-tor-privacy.button=Ir a la red de Tor
 onboarding.tour-tor-network=Red de Tor
 onboarding.tour-tor-network.title=ViajÃ¡ por una red descentralizada.
 onboarding.tour-tor-network.description=El Navegador Tor te conecta a la red 
Tor, formada por miles de voluntarios alrededor del mundo. A diferencia de una 
RPV, no hay un Ãºnico punto de falla o entidad central en la cual necesitÃ©s 
confiar de manera de disfrutar de internet privadamente.
-onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, 
including the ability to request bridges where Tor is blocked, can now be found 
in Preferences.
+onboarding.tour-tor-network.description-para2=NOVEDAD:  La configuraciÃ³n de 
la red Tor. Incluyendo posibilidad de solicitar puentes para donde Tor esta 
bloqueado, fue movida a Preferencias.
 onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings
 onboarding.tour-tor-network.button=Ir a visualizaciÃ³n de Circuito
 
diff --git a/chrome/locale/es-ES/browserOnboarding.properties 
b/chrome/loca

[tor-commits] [translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings

2019-10-17 Thread translation

commit a807e9f7840e6786ee43f011df96d846a2208e39
Author: Translation commit bot 
Date:   Thu Oct 17 16:22:43 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
---
 ml/network-settings.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ml/network-settings.dtd b/ml/network-settings.dtd
index 8576c6872..f8dbadf12 100644
--- a/ml/network-settings.dtd
+++ b/ml/network-settings.dtd
@@ -26,9 +26,9 @@
 
 
 
-
+
 
-
+
 
 
 
@@ -37,7 +37,7 @@
 
 
 
-
+
 
 
 
@@ -79,5 +79,5 @@
 
 
 
-
+
 

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

[tor-commits] [translation/snowflake-website-indexhtml] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml

2019-10-17 Thread translation

commit b2d977e1b9034025f9b355c5525abe7de9d866ac
Author: Translation commit bot 
Date:   Thu Oct 17 16:17:15 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml
---
 ml/index.html | 108 --
 1 file changed, 60 insertions(+), 48 deletions(-)

diff --git a/ml/index.html b/ml/index.html
index 389d1da82..2c78dc761 100644
--- a/ml/index.html
+++ b/ml/index.html
@@ -1,71 +1,83 @@
 
-
+
 
 
 
 à´¸àµâà´¨àµà´«àµà´³àµà´àµ 
-
-
+
+
+
 
-
-https://www.torproject.org/";>
-à´¸àµâà´¨àµà´«àµà´³àµà´àµ 
+
+https://www.torproject.org/";>
+  
+
+  
+  
+
+  
+  à´¸àµâà´¨àµà´«àµà´³àµà´àµ 
 
-  https://trac.torproject.org/projects/tor/raw-attachment/wiki/doc/Snowflake/snowflake-schematic.png";
 alt="Diagram">
+https://trac.torproject.org/projects/tor/raw-attachment/wiki/doc/Snowflake/snowflake-schematic.png";
 alt="Diagram">
 
-  à´¸àµâà´¨àµà´«àµà´³àµà´àµ à´à´¨àµà´¨à´¤àµ à´à´°àµ 
à´à´¨àµà´±àµ¼à´¨àµà´±àµà´±àµ à´¸àµà´¨àµà´¸à´°àµà´·à´¿à´ªàµ 
à´ªàµà´°àµà´§à´¿à´°àµà´§à´¿à´àµà´àµà´¨àµà´¨ 
à´¸à´¿à´¸àµà´±àµà´±à´®à´¾à´£àµ . à´¸àµà´¨àµà´¸à´°àµà´·à´¿à´ªàµ 
à´à´³àµà´³ à´¸àµà´¥à´²à´àµà´à´³à´¿à´²àµ à´à´³àµà´àµ¾à´àµà´àµ 
à´¸àµâà´¨àµà´«àµà´³àµà´àµ à´à´ªà´¯àµà´à´¿à´àµà´àµ 
à´à´¨àµà´±àµ¼à´¨àµà´±àµà´±àµ 
à´à´ªà´¯àµà´à´¿à´àµà´à´¾à´µàµà´¨àµà´¨à´¤à´¾à´£àµ . à´à´µà´°àµà´àµ 
à´¬à´¨àµà´§à´àµà´àµ¾ à´¸àµâà´¨àµà´«àµà´³àµà´àµ  à´
à´ªà´°à´¨àµà´®à´¾àµ¼ à´µà´´à´¿ à´à´¯à´¿à´°à´¿à´àµà´àµà´ 
-à´ªàµà´àµà´¨àµà´¨à´¤àµ , à´à´¤àµ 
à´ªàµà´°àµà´µà´°àµà´¤à´¿à´ªàµà´ªà´¿à´àµà´àµà´¨àµà´¨à´¤àµ 
à´¸àµà´µà´®àµà´§à´¯à´¾ à´ªàµà´°à´µàµ¼à´¤àµà´àµà´àµà´¨àµà´¨ 
à´à´³àµà´àµ¾ à´®àµà´à´¾à´¨àµà´¦à´°à´®à´¾à´£àµ .à´àµà´àµà´¤àµ½ 
à´µà´¿à´¶à´¦à´®à´¾à´¯ à´µà´¿à´µà´°à´àµà´àµ¾à´àµà´àµà´ 
à´à´àµà´à´¨àµà´¯à´¾à´£àµ à´¸à´¨àµà´«àµà´³àµà´àµ 
à´ªàµà´°àµà´µà´°àµà´¤à´¿à´àµà´àµà´¨àµà´¨à´¤àµà´¨àµà´¨àµà´ à´
à´±à´¿à´¯à´¾àµ» https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/";>à´µà´¿à´àµà´à´¿
 à´à´£àµà´¡à´ à´à´¾à´£àµà´ 
+Snowflake is a system to defeat 
internet censorship. People who are
+censored can use Snowflake to access the internet. Their connection 
goes
+through Snowflake proxies, which are run by volunteers. For more 
detailed
+information about how Snowflake works see our
+https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/"; 
data-msgid="__MSG_docWiki__">documentation wiki.
 
-  
+
 
-à´¬àµà´°àµà´¸àµ¼ 
+  à´¬àµà´°àµà´¸àµ¼ 
 
-  à´¨à´¿à´àµà´à´³àµà´àµ à´à´¨àµà´±àµ¼à´¨àµà´±àµà´±àµ 
à´à´ªà´¯àµà´à´ à´¸àµàµ»à´¸àµ¼ 
à´àµà´¯àµà´¤à´¿à´àµà´àµà´£àµà´àµà´àµà´à´¿àµ½ à´¨à´¿à´àµà´àµ¾ 
à´¤àµàµ¼à´àµà´à´¯à´¾à´¯àµà´ https://www.torproject.org/download/";>à´àµàµ¼ à´¬àµà´°àµà´¸àµ¼ 
à´¡àµàµºà´²àµà´¡àµ à´àµà´¯àµà´¯àµà´ 
+If your internet access is 
censored, you should download 
+https://www.torproject.org/download/";>Tor Browser.
 
-  
-à´µàµà´¯à´¾à´ªà´¿à´ªàµà´ªà´¿à´àµà´à´¾àµ» 
+
+  à´µàµà´¯à´¾à´ªà´¿à´ªàµà´ªà´¿à´àµà´à´¾àµ» 

 
-  à´¨à´¿à´àµà´à´³àµà´àµ à´à´¨àµà´±àµ¼à´¨àµà´±àµà´±àµ 
à´à´ªà´¯àµà´à´ à´¸àµàµ»à´¸àµ¼ 
à´àµà´¯àµà´¤à´¿à´àµà´à´¿à´²àµà´²àµà´àµà´à´¿àµ½ 
à´¨à´¿à´àµà´àµ¾ à´¤àµàµ¼à´àµà´à´¯à´¾à´¯àµà´
- à´¸à´¨àµ à´«àµà´³àµà´àµ à´à´àµà´¸àµà´±àµà´±àµ»à´·àµ» 
à´àµ»à´¸àµà´±àµà´±à´¾àµ¾ à´àµà´¯àµà´¤àµ à´®à´±àµà´±àµà´³àµà´³ 
à´¸àµàµ»à´¸àµ¼ à´àµà´¯àµà´¤àµà´ªàµà´¯à´¿à´àµà´àµà´³àµà´³
-à´à´ªà´àµà´àµà´¤à´¾à´àµà´à´³àµ à´¸à´¹à´¾à´¯à´¿à´àµà´à´£à´. 
à´®à´±àµà´±àµà´³àµà´³ à´à´ªà´àµà´àµà´¤à´¾à´àµà´àµ¾ 
-à´à´¤àµà´àµà´àµ à´¤à´°à´¤àµà´¤à´¿àµ½ à´à´³àµà´³ 
à´µàµà´¬àµà´¸àµà´±àµà´±àµ à´à´£àµ à´¨à´¿à´àµà´à´³àµà´àµ 
à´ªàµà´°àµà´àµà´¸à´¿ à´µà´´à´¿ 
à´à´ªà´¯àµà´à´¿à´àµà´àµà´¨àµà´¨à´¤àµ à´à´¨àµà´¨à´¤à´¿à´¨àµ 
à´ªà´±àµà´±à´¿ à´¨à´¿à´àµà´àµ¾ 
à´µàµà´¯à´¾à´àµà´²à´ªàµà´ªàµà´àµà´£àµà´à´¤à´¿à´²àµà´² . à´
à´µà´°àµà´àµ à´à´¾à´£àµà´¨àµà´¨ à´ à´ªà´¿ à´à´ªàµà´ªà´´àµà´ 
-à´à´µà´°àµà´àµ à´àµàµ¼ à´à´àµà´¸à´¿à´±àµ à´¨àµà´àµ 
à´à´¯à´¿à´°à´¿à´¯àµà´àµà´àµà´, à´¨à´¿à´àµà´à´³àµà´àµ 
à´à´¯à´¿à´°à´¿à´àµà´à´¿à´²àµà´² .
+If your internet access 
is not censored, you should
+consider installing the Snowflake extension to help users in 
censored
+networks. There is no need to worry about which websites people are
+accessing through your proxy. Their visible browsing IP address 
will
+match their Tor exit node, not yours.
 
-  https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/";>
-à´«à´¯àµ¼à´«àµà´àµà´¸à´¿àµ½ 
à´à

[tor-commits] [translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json

2019-10-17 Thread translation

commit abf61f59ae8db5f19effbdf822380abf53f0771c
Author: Translation commit bot 
Date:   Thu Oct 17 16:17:06 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
---
 ml/messages.json | 24 
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/ml/messages.json b/ml/messages.json
index 665535b97..4ac7baa4a 100644
--- a/ml/messages.json
+++ b/ml/messages.json
@@ -30,46 +30,46 @@
 "message": "à´àµà´àµà´¸àµ à´
à´¨àµà´µà´¦à´¿à´àµà´à´¿à´àµà´à´¿à´²àµà´² "
   },
   "websiteIntro": {
-"message": "Snowflake is a system to defeat internet censorship. People 
who are censored can use Snowflake to access the internet. Their connection 
goes through Snowflake proxies, which are run by volunteers. For more detailed 
information about how Snowflake works see our https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\"; 
data-msgid=\"__MSG_docWiki__\">documentation wiki."
+"message": "à´à´¨àµà´±àµ¼à´¨àµà´±àµà´±àµ 
à´¸àµàµ»à´¸àµ¼à´·à´¿à´ªàµà´ªà´¿à´¨àµ 
à´ªà´°à´¾à´à´¯à´ªàµà´ªàµà´àµà´¤àµà´¤à´¾à´¨àµà´³àµà´³ à´à´°àµ 
à´¸à´à´µà´¿à´§à´¾à´¨à´®à´¾à´£àµ à´¸àµà´¨àµà´«àµà´²àµà´àµà´àµ. 
à´¸àµàµ»à´¸àµ¼ à´àµà´¯àµà´¤ à´à´³àµà´àµ¾à´àµà´àµ 
à´à´¨àµà´±àµ¼à´¨àµà´±àµà´±àµ à´à´àµà´¸à´¸àµ 
à´àµà´¯àµà´¯àµà´¨àµà´¨à´¤à´¿à´¨àµ à´¸àµà´¨àµà´«àµà´²àµà´àµà´àµ 
à´à´ªà´¯àµà´à´¿à´àµà´à´¾à´. 
à´¸à´¨àµà´¨à´¦àµà´§à´ªàµà´°à´µàµ¼à´¤àµà´¤à´àµ¼ à´¨à´à´¤àµà´¤àµà´¨àµà´¨ 
à´¸àµà´¨àµà´«àµà´²àµà´àµà´àµ 
à´ªàµà´°àµà´àµà´¸à´¿à´à´³à´¿à´²àµà´àµà´¯à´¾à´£àµ à´à´µà´°àµà´àµ 
à´à´£à´àµà´·àµ». à´¸àµà´¨àµà´«àµà´²àµà´àµà´àµ à´à´àµà´à´¨àµ 
à´ªàµà´°à´µàµ¼à´¤àµà´¤à´¿à´àµà´àµà´¨àµà´¨àµ 
à´à´¨àµà´¨à´¤à´¿à´¨àµà´àµà´àµà´±à´¿à´àµà´àµà´³àµà´³ 
à´àµà´àµà´¤àµ½ à´µà´¿à´µà´°à´àµà´àµ¾à´àµà´àµ 
à´à´àµà´à´³àµà´àµ https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\";
  data-msgid=\"__MSG_docWiki__\">à´¡àµà´àµà´¯àµà´®àµà´¨àµà´±àµà´·àµ» 
à´µà´¿à´àµà´à´¿ à´à´¾à´£àµà´."
   },
   "docWiki": {
-"message": "documentation wiki"
+"message": "à´¡àµà´àµà´¯àµà´®àµà´¨àµà´±àµà´·àµ» à´µà´¿à´àµà´à´¿"
   },
   "browser": {
 "message": "à´¬àµà´°àµà´¸àµ¼ "
   },
   "censoredUsers": {
-"message": "If your internet access is censored, you should download https://www.torproject.org/download/\";>Tor Browser."
+"message": "à´¨à´¿à´àµà´à´³àµà´àµ à´à´¨àµà´±àµ¼à´¨àµà´±àµà´±àµ 
à´à´àµà´¸à´¸àµ à´¸àµàµ»à´¸àµ¼ 
à´àµà´¯àµà´¤à´¿à´àµà´àµà´£àµà´àµà´àµà´à´¿àµ½, à´¨à´¿à´àµà´àµ¾ 
https://www.torproject.org/download/\";>à´àµàµ¼ à´¬àµà´°àµà´¸àµ¼ 
à´¡àµàµºà´²àµà´¡àµ à´àµà´¯àµà´¯à´£à´."
   },
   "extension": {
 "message": "à´µàµà´¯à´¾à´ªà´¿à´ªàµà´ªà´¿à´àµà´à´¾àµ» "
   },
   "installExtension": {
-"message": "If your internet access is not censored, you 
should consider installing the Snowflake extension to help users in censored 
networks. There is no need to worry about which websites people are accessing 
through your proxy. Their visible browsing IP address will match their Tor exit 
node, not yours."
+"message": "à´¨à´¿à´àµà´à´³àµà´àµ à´àµ»à´±àµ¼à´¨àµà´±àµà´±àµ 
à´à´àµà´¸à´¸àµ à´¸àµàµ»à´¸àµ¼ 
à´àµà´¯àµà´¤à´¿à´àµà´à´¿à´²àµà´²àµà´àµà´à´¿àµ½, à´¸àµàµ»à´¸àµ¼ 
à´àµà´¯àµà´¤ à´¨àµà´±àµà´±àµâà´µàµ¼à´àµà´àµà´à´³à´¿à´²àµ 
à´à´ªà´¯àµà´àµà´¤à´¾à´àµà´à´³àµ 
à´¸à´¹à´¾à´¯à´¿à´àµà´àµà´¨àµà´¨à´¤à´¿à´¨àµ 
à´¸àµà´¨àµà´«àµà´²àµà´àµà´àµ à´à´àµà´¸àµà´±àµà´±àµ»à´·àµ» 
à´àµ»à´¸àµà´±àµà´±à´¾àµ¾ à´àµà´¯àµà´¯àµà´¨àµà´¨à´¤àµ 
à´¨à´¿à´àµà´àµ¾ à´ªà´°à´¿à´à´£à´¿à´àµà´à´£à´. 
à´¨à´¿à´àµà´à´³àµà´àµ à´ªàµà´°àµà´àµà´¸à´¿ à´µà´´à´¿ à´à´³àµà´àµ¾ 
à´à´¤àµ à´µàµà´¬àµâà´¸àµà´±àµà´±àµà´à´³à´¾à´£àµ 
à´à´àµâà´¸à´¸àµà´¸àµà´àµà´¯àµà´¯àµà´¨àµà´¨à´¤àµà´¨àµà´¨àµ 
à´µà´¿à´·à´®à´¿à´àµà´àµà´£àµà´à´¤à´¿à´²àµà´². à´à´µà´°àµà´àµ 
à´¦àµà´¶àµà´¯à´®à´¾à´¯ à´¬àµà´°àµà´¸à´¿à´à´àµ à´à´ªà´¿ 
à´µà´¿à´²à´¾à´¸à´ à´¨à´¿à´àµà´à´³àµà´àµà´¤à´²àµà´², à´àµàµ¼ 
à´à´àµà´¸à´¿à´±àµà´±àµ à´¨àµà´¡àµà´®à´¾à´¯
 à´¿ à´ªàµà´°àµà´¤àµà´¤à´ªàµà´ªàµà´àµà´."
   },
   "installFirefox": {
-"message": "Install in Firefox"
+"message": "à´«à´¯àµ¼à´«àµà´àµà´¸à´¿àµ½ à´àµ»à´¸àµà´±àµà´±à´¾àµ¾ 
à´àµà´¯àµà´¯àµà´"
   },
   "installChrome": {
-"message": "Install in Chrome"
+"message": "à´àµà´°àµà´®à´¿àµ½ - àµ½ à´àµ»à´¸àµà´±àµà´±à´¾àµ¾ 
à´àµà´¯àµà´¯àµà´"
   },
   "reportingBugs": {
-"message": "Reporting Bugs"
+"message": "à´¬à´àµà´àµ¾ 
à´±à´¿à´ªàµà´ªàµàµ¼à´àµà´àµà´àµà´¯àµà´¯àµà´¨àµà´¨àµ"
   },
   "fileBug": {
-"message": "If you encounter problems with Snowflake as a client or a 
proxy, please consider filing a bug.  To do so, you will have to,"
+"message": "à´à´°àµ à´àµà´²à´¯à´¨àµà´±àµ à´
à´²àµà´²àµà´àµà´à´¿

[tor-commits] [translation/exoneratorproperties] https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties

2019-10-17 Thread translation

commit cfd4199490eb8e2c28c65b1b1fa6c22b19ee7fec
Author: Translation commit bot 
Date:   Thu Oct 17 16:15:48 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=exoneratorproperties
---
 ml/exonerator.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ml/exonerator.properties b/ml/exonerator.properties
index a49ba2a14..311eaa448 100644
--- a/ml/exonerator.properties
+++ b/ml/exonerator.properties
@@ -30,7 +30,7 @@ summary.positive.title=à´«à´²à´ 
à´ªàµà´¸à´¿à´±àµà´±àµà´µàµ à´à´£àµ
 summary.positive.body=à´àµàµ¼ à´àµà´²à´¯à´¨àµà´±àµà´àµ¾à´àµà´àµ 
%sà´à´±à´¿à´¯à´¾àµ» à´¸à´¾à´§àµà´¯à´¤à´¯àµà´³àµà´³ à´à´¨àµà´¨àµ à´
à´¤à´¿à´²à´§à´¿à´à´®àµ à´àµàµ¼ à´±à´¿à´²àµà´àµ¾ à´à´ªà´¿ 
à´µà´¿à´²à´¾à´¸à´¤àµà´¤à´¿àµ½ %s à´à´àµà´àµ¾ à´à´£àµà´àµà´¤àµà´¤à´¿.
 summary.negative.title=à´«à´²à´ à´¨àµà´à´±àµà´±àµà´µàµ à´à´£àµ
 summary.negative.body=à´à´°àµ 
à´¦à´¿à´µà´¸à´¤àµà´¤à´¿à´¨àµà´³àµà´³à´¿à´²àµ %sà´
à´¤à´¿à´¨àµà´³àµà´³à´¿à´²àµ à´à´àµà´àµ¾ IP à´µà´¿à´²à´¾à´¸à´%s 
à´à´£àµà´àµà´¤àµà´¤à´¿à´¯à´¿à´²àµà´².
-summary.missingdata=However, the database is missing several hours of data for 
this specific request, so that this result must be interpreted carefully.
+summary.missingdata=à´à´¨àµà´¨à´¿à´°àµà´¨àµà´¨à´¾à´²àµà´, à´ 
à´¨à´¿àµ¼âà´¦àµà´¦à´¿à´·àµâà´ à´
à´àµà´¯àµ¼âà´¤àµà´¥à´¨à´¯àµâà´àµà´à´¾à´¯à´¿ 
à´¡à´¾à´±àµà´±à´¾à´¬àµà´¸à´¿à´¨àµ à´¨à´¿à´°à´µà´§à´¿ 
à´®à´£à´¿à´àµà´àµàµ¼â à´¡à´¾à´±àµà´± à´¨à´·àµâà´à´®à´¾à´¯à´¿, à´
à´¤à´¿à´¨à´¾àµ½â à´ à´«à´²à´ à´¶àµà´°à´¦àµà´§à´¾à´ªàµàµ¼âà´µàµà´µà´ 
à´µàµà´¯à´¾à´àµà´¯à´¾à´¨à´¿à´àµà´à´£à´.
 technicaldetails.heading=à´¸à´¾à´àµà´àµà´¤à´¿à´ 
à´µà´¿à´¶à´¦à´¾à´à´¶à´àµà´àµ¾
 technicaldetails.pre=à´à´°àµ à´¦à´¿à´µà´¸à´¤àµà´¤à´¿à´¨àµà´³àµà´³à´¿àµ½ 
%sà´à´²àµà´²àµà´àµà´à´¿àµ½ à´à´¤à´¿à´¨àµà´³àµà´³à´¿àµ½ IP 
à´µà´¿à´²à´¾à´¸à´%s à´¤à´¿à´°à´¯àµà´¨àµà´¨àµ. à´àµàµ¼ 
à´àµà´²à´¯à´¨àµà´±àµà´àµ¾à´àµà´àµ à´¸àµ¼à´àµà´¯àµà´àµà´àµà´àµ¾ 
à´¨à´¿àµ¼à´®àµà´®à´¿à´àµà´àµà´¨àµà´¨à´¤à´¿à´¨àµ à´ à´
à´²àµà´²àµà´àµà´à´¿àµ½ à´ à´àµàµ¼ à´±à´¿à´²àµà´àµ¾ 
à´¤à´¿à´°à´àµà´àµà´àµà´àµà´à´¾à´®à´¾à´¯à´¿à´°àµà´¨àµà´¨àµ.
 technicaldetails.colheader.timestamp=à´àµà´à´¸àµà´±àµà´±à´¾à´®àµà´ªàµ 
(UTC)

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

2019-10-17 Thread nickm

commit 800b823c292009dd232d9758d1b40c61072e4433
Merge: 0081d6c11 d97d7f0e4
Author: Nick Mathewson 
Date:   Thu Oct 17 12:01:45 2019 -0400

Merge branch 'cmdline_refactor'

 changes/ticket32003   |   4 +
 src/app/config/config.c   | 228 +++---
 src/app/config/config.h   |  24 ++-
 src/app/config/or_options_st.h|   8 +-
 src/app/config/quiet_level.h  |  28 
 src/app/config/tor_cmdline_mode.h |  34 
 src/app/main/main.c   |  53 +++---
 src/app/main/ntmain.c |   1 +
 src/core/include.am   |   2 +
 src/core/mainloop/mainloop.h  |   1 -
 src/test/conf_examples/missing_cl_arg/cmdline |   1 +
 src/test/conf_examples/missing_cl_arg/error   |   1 +
 src/test/conf_examples/missing_cl_arg/torrc   |   0
 13 files changed, 250 insertions(+), 135 deletions(-)

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

[tor-commits] [tor/master] Add a return type for the parsed commandline.

2019-10-17 Thread nickm

commit 9826fb19815794507cbc55358439758fbf700291
Author: Nick Mathewson 
Date:   Tue Oct 8 11:47:43 2019 -0400

Add a return type for the parsed commandline.

Previously it was stored in two outvars, but this is more
elegant. I'm going to be expanding this struct in later commits.
---
 src/app/config/config.c | 89 ++---
 src/app/config/config.h | 17 --
 src/app/main/main.c | 14 
 3 files changed, 69 insertions(+), 51 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index 1abe1e13a..74cd70ad3 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -885,12 +885,8 @@ static or_options_t *global_default_options = NULL;
 static char *torrc_fname = NULL;
 /** Name of the most recently read torrc-defaults file.*/
 static char *torrc_defaults_fname = NULL;
-/** Configuration options set by command line. */
-static config_line_t *global_cmdline_options = NULL;
-/** Non-configuration options set by the command line */
-static config_line_t *global_cmdline_only_options = NULL;
-/** Boolean: Have we parsed the command line? */
-static int have_parsed_cmdline = 0;
+/** Result of parsing the command line. */
+static parsed_cmdline_t *global_cmdline = NULL;
 /** Contents of most recently read DirPortFrontPage file. */
 static char *global_dirfrontpagecontents = NULL;
 /** List of port_cfg_t for all configured ports. */
@@ -1064,11 +1060,7 @@ config_free_all(void)
   or_options_free(global_default_options);
   global_default_options = NULL;
 
-  config_free_lines(global_cmdline_options);
-  global_cmdline_options = NULL;
-
-  config_free_lines(global_cmdline_only_options);
-  global_cmdline_only_options = NULL;
+  parsed_cmdline_free(global_cmdline);
 
   if (configured_ports) {
 SMARTLIST_FOREACH(configured_ports,
@@ -1083,7 +1075,6 @@ config_free_all(void)
 
   cleanup_protocol_warning_severity_level();
 
-  have_parsed_cmdline = 0;
   libevent_initialized = 0;
 
   config_mgr_free(options_mgr);
@@ -2459,8 +2450,12 @@ typedef enum {
   ARGUMENT_OPTIONAL = 2
 } takes_argument_t;
 
+/** Table describing arguments that Tor accepts on the command line,
+ * other than those that are the same as in torrc. */
 static const struct {
+  /** The string that the user has to provide. */
   const char *name;
+  /** Does this option accept an argument? */
   takes_argument_t takes_argument;
 } CMDLINE_ONLY_OPTIONS[] = {
   { .name="-f",
@@ -2497,22 +2492,20 @@ static const struct {
 };
 
 /** Helper: Read a list of configuration options from the command line.  If
- * successful, or if ignore_errors is set, put them in *result, put the
- * commandline-only options in *cmdline_result, and return 0;
- * otherwise, return -1 and leave *result and cmdline_result
- * alone. */
-int
-config_parse_commandline(int argc, char **argv, int ignore_errors,
- config_line_t **result,
- config_line_t **cmdline_result)
+ * successful, return a newly allocated parsed_cmdline_t; otherwise return
+ * NULL.
+ *
+ * If ignore_errors is set, try to recover from all recoverable
+ * errors and return the best command line we can.
+ */
+parsed_cmdline_t *
+config_parse_commandline(int argc, char **argv, int ignore_errors)
 {
+  parsed_cmdline_t *result = tor_malloc_zero(sizeof(parsed_cmdline_t));
   config_line_t *param = NULL;
 
-  config_line_t *front = NULL;
-  config_line_t **new = &front;
-
-  config_line_t *front_cmdline = NULL;
-  config_line_t **new_cmdline = &front_cmdline;
+  config_line_t **new_cmdline = &result->cmdline_opts;
+  config_line_t **new = &result->other_opts;
 
   char *s, *arg;
   int i = 1;
@@ -2557,9 +2550,8 @@ config_parse_commandline(int argc, char **argv, int 
ignore_errors,
   } else {
 log_warn(LD_CONFIG,"Command-line option '%s' with no value. Failing.",
 argv[i]);
-config_free_lines(front);
-config_free_lines(front_cmdline);
-return -1;
+parsed_cmdline_free(result);
+return NULL;
   }
 } else if (want_arg == ARGUMENT_OPTIONAL && is_last) {
   arg = tor_strdup("");
@@ -2587,9 +2579,19 @@ config_parse_commandline(int argc, char **argv, int 
ignore_errors,
 
 i += want_arg ? 2 : 1;
   }
-  *cmdline_result = front_cmdline;
-  *result = front;
-  return 0;
+
+  return result;
+}
+
+/** Release all storage held by cmdline. */
+void
+parsed_cmdline_free_(parsed_cmdline_t *cmdline)
+{
+  if (!cmdline)
+return;
+  config_free_lines(cmdline->cmdline_opts);
+  config_free_lines(cmdline->other_opts);
+  tor_free(cmdline);
 }
 
 /** Return true iff key is a valid configuration option. */
@@ -5199,24 +5201,20 @@ int
 options_init_from_torrc(int argc, char **argv)
 {
   char *cf=NULL, *cf_defaults=NULL;
-  int command;
   int retval = -1;
-  char *command_arg = NULL;
   char *errmsg=NULL;
-  config_line_t *p_index = NULL;
-  config_line_t *cmdline_only_options = NULL;
+  const config_line_

[tor-commits] [tor/master] add a changes file for 32003 (command-line option parsing).

2019-10-17 Thread nickm

commit 35c18870b420e0ce7037c834709ff6daffd70754
Author: Nick Mathewson 
Date:   Tue Oct 8 13:21:24 2019 -0400

add a changes file for 32003 (command-line option parsing).
---
 changes/ticket32003 | 4 
 1 file changed, 4 insertions(+)

diff --git a/changes/ticket32003 b/changes/ticket32003
new file mode 100644
index 0..b8809f288
--- /dev/null
+++ b/changes/ticket32003
@@ -0,0 +1,4 @@
+  o Code simplification and refactoring:
+- When parsing the command line, handle options that determine our "quiet
+  level" and our mode of operation (e.g., --dump-config and so on)
+  all in one table. Closes ticket 32003.



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

[tor-commits] [tor/master] Make the command-line parser understand "commands".

2019-10-17 Thread nickm

commit c529b3f8f1d882b29c6b505de1a61d24c6a0943c
Author: Nick Mathewson 
Date:   Tue Oct 8 16:05:04 2019 -0400

Make the command-line parser understand "commands".

Previously these were implemented with a search in
options_init_from_torrc(), but that led to each option being
declared more than needed: once to say that it was a valid option,
and once to say what it meant.
---
 src/app/config/config.c   | 80 ++-
 src/app/config/config.h   |  4 ++
 src/app/config/tor_cmdline_mode.h |  4 +-
 src/app/main/main.c   |  1 +
 src/app/main/ntmain.c |  1 +
 5 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index 74cd70ad3..734bd0f92 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -2457,6 +2457,8 @@ static const struct {
   const char *name;
   /** Does this option accept an argument? */
   takes_argument_t takes_argument;
+  /** If not CMD_RUN_TOR, what should Tor do when it starts? */
+  tor_cmdline_mode_t command;
 } CMDLINE_ONLY_OPTIONS[] = {
   { .name="-f",
 .takes_argument=ARGUMENT_NECESSARY },
@@ -2464,31 +2466,44 @@ static const struct {
   { .name="--defaults-torrc",
 .takes_argument=ARGUMENT_NECESSARY },
   { .name="--hash-password",
-.takes_argument=ARGUMENT_NECESSARY },
+.takes_argument=ARGUMENT_NECESSARY,
+.command=CMD_HASH_PASSWORD },
   { .name="--dump-config",
-.takes_argument=ARGUMENT_OPTIONAL },
-  { .name="--list-fingerprint" },
-  { .name="--keygen" },
+.takes_argument=ARGUMENT_OPTIONAL,
+.command=CMD_DUMP_CONFIG },
+  { .name="--list-fingerprint",
+.command=CMD_LIST_FINGERPRINT },
+  { .name="--keygen",
+.command=CMD_KEYGEN },
   { .name="--key-expiration",
-.takes_argument=ARGUMENT_OPTIONAL },
+.takes_argument=ARGUMENT_OPTIONAL,
+.command=CMD_KEY_EXPIRATION },
   { .name="--newpass" },
   { .name="--no-passphrase" },
   { .name="--passphrase-fd",
 .takes_argument=ARGUMENT_NECESSARY },
-  { .name="--verify-config" },
+  { .name="--verify-config",
+.command=CMD_VERIFY_CONFIG },
   { .name="--ignore-missing-torrc" },
   { .name="--quiet" },
   { .name="--hush" },
-  { .name="--version" },
-  { .name="--list-modules" },
-  { .name="--library-versions" },
-  { .name="-h" },
-  { .name="--help" },
-  { .name="--list-torrc-options" },
-  { .name="--list-deprecated-options" },
+  { .name="--version",
+.command=CMD_OTHER },
+  { .name="--list-modules",
+.command=CMD_OTHER },
+  { .name="--library-versions",
+.command=CMD_OTHER },
+  { .name="-h",
+.command=CMD_OTHER },
+  { .name="--help",
+.command=CMD_OTHER },
+  { .name="--list-torrc-options",
+.command=CMD_OTHER },
+  { .name="--list-deprecated-options",
+.command=CMD_OTHER },
   { .name="--nt-service" },
   { .name="-nt-service" },
-  { NULL, 0 },
+  { .name=NULL },
 };
 
 /** Helper: Read a list of configuration options from the command line.  If
@@ -2502,6 +2517,7 @@ parsed_cmdline_t *
 config_parse_commandline(int argc, char **argv, int ignore_errors)
 {
   parsed_cmdline_t *result = tor_malloc_zero(sizeof(parsed_cmdline_t));
+  result->command = CMD_RUN_TOR;
   config_line_t *param = NULL;
 
   config_line_t **new_cmdline = &result->cmdline_opts;
@@ -2515,11 +2531,16 @@ config_parse_commandline(int argc, char **argv, int 
ignore_errors)
 takes_argument_t want_arg = ARGUMENT_NECESSARY;
 int is_cmdline = 0;
 int j;
+bool is_a_command = false;
 
 for (j = 0; CMDLINE_ONLY_OPTIONS[j].name != NULL; ++j) {
   if (!strcmp(argv[i], CMDLINE_ONLY_OPTIONS[j].name)) {
 is_cmdline = 1;
 want_arg = CMDLINE_ONLY_OPTIONS[j].takes_argument;
+if (CMDLINE_ONLY_OPTIONS[j].command != CMD_RUN_TOR) {
+  is_a_command = true;
+  result->command = CMDLINE_ONLY_OPTIONS[j].command;
+}
 break;
   }
 }
@@ -2569,6 +2590,10 @@ config_parse_commandline(int argc, char **argv, int 
ignore_errors)
 log_debug(LD_CONFIG, "command line: parsed keyword '%s', value '%s'",
 param->key, param->value);
 
+if (is_a_command) {
+  result->command_arg = param->value;
+}
+
 if (is_cmdline) {
   *new_cmdline = param;
   new_cmdline = &((*new_cmdline)->next);
@@ -3020,7 +3045,9 @@ is_local_addr, (const tor_addr_t *addr))
 or_options_t *
 options_new(void)
 {
-  return config_new(get_options_mgr());
+  or_options_t *options = config_new(get_options_mgr());
+  options->command = CMD_RUN_TOR;
+  return options;
 }
 
 /** Set options to hold reasonable defaults for most options.
@@ -5277,25 +5304,10 @@ options_init_from_torrc(int argc, char **argv)
 return 1;
   }
 
-  command = CMD_RUN_TOR;
-  for (p_index = cmdline_only_options; p_index; p_index = p_index->next) {
-if (!strcmp(p_index->key,"--keygen")) {
-  command = CMD_KEYGEN;
-} else if (!strcmp(p_index->key, "--key-expiration")) {
-

[tor-commits] [tor/master] Add a test for a command-line option without a value.

2019-10-17 Thread nickm

commit 763d955a17ba6c6c6e5487357c672b0cae3d607c
Author: Nick Mathewson 
Date:   Tue Oct 8 15:58:14 2019 -0400

Add a test for a command-line option without a value.
---
 src/test/conf_examples/missing_cl_arg/cmdline | 1 +
 src/test/conf_examples/missing_cl_arg/error   | 1 +
 src/test/conf_examples/missing_cl_arg/torrc   | 0
 3 files changed, 2 insertions(+)

diff --git a/src/test/conf_examples/missing_cl_arg/cmdline 
b/src/test/conf_examples/missing_cl_arg/cmdline
new file mode 100644
index 0..7fc4d0a54
--- /dev/null
+++ b/src/test/conf_examples/missing_cl_arg/cmdline
@@ -0,0 +1 @@
+--hash-password
diff --git a/src/test/conf_examples/missing_cl_arg/error 
b/src/test/conf_examples/missing_cl_arg/error
new file mode 100644
index 0..61dbeac8a
--- /dev/null
+++ b/src/test/conf_examples/missing_cl_arg/error
@@ -0,0 +1 @@
+Command-line option '--hash-password' with no value.
diff --git a/src/test/conf_examples/missing_cl_arg/torrc 
b/src/test/conf_examples/missing_cl_arg/torrc
new file mode 100644
index 0..e69de29bb



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

[tor-commits] [tor/master] Use C99 struct-initializer syntax in COMMANDLINE_ONLY_OPTIONS

2019-10-17 Thread nickm

commit bd5ce112c92b81a98023513a53ecd64cf44122fe
Author: Nick Mathewson 
Date:   Tue Oct 8 10:54:57 2019 -0400

Use C99 struct-initializer syntax in COMMANDLINE_ONLY_OPTIONS

I'm about to add more fields to this table, and this syntax change
will make it easier to do so.
---
 src/app/config/config.c | 54 +++--
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index 44d6a82e5..26b104802 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -2463,30 +2463,36 @@ static const struct {
   const char *name;
   takes_argument_t takes_argument;
 } CMDLINE_ONLY_OPTIONS[] = {
-  { "-f", ARGUMENT_NECESSARY },
-  { "--allow-missing-torrc",  ARGUMENT_NONE },
-  { "--defaults-torrc",   ARGUMENT_NECESSARY },
-  { "--hash-password",ARGUMENT_NECESSARY },
-  { "--dump-config",  ARGUMENT_OPTIONAL },
-  { "--list-fingerprint", ARGUMENT_NONE },
-  { "--keygen",   ARGUMENT_NONE },
-  { "--key-expiration",   ARGUMENT_OPTIONAL },
-  { "--newpass",  ARGUMENT_NONE },
-  { "--no-passphrase",ARGUMENT_NONE },
-  { "--passphrase-fd",ARGUMENT_NECESSARY },
-  { "--verify-config",ARGUMENT_NONE },
-  { "--ignore-missing-torrc", ARGUMENT_NONE },
-  { "--quiet",ARGUMENT_NONE },
-  { "--hush", ARGUMENT_NONE },
-  { "--version",  ARGUMENT_NONE },
-  { "--list-modules", ARGUMENT_NONE },
-  { "--library-versions", ARGUMENT_NONE },
-  { "-h", ARGUMENT_NONE },
-  { "--help", ARGUMENT_NONE },
-  { "--list-torrc-options",   ARGUMENT_NONE },
-  { "--list-deprecated-options",ARGUMENT_NONE },
-  { "--nt-service",   ARGUMENT_NONE },
-  { "-nt-service",ARGUMENT_NONE },
+  { .name="-f",
+.takes_argument=ARGUMENT_NECESSARY },
+  { .name="--allow-missing-torrc" },
+  { .name="--defaults-torrc",
+.takes_argument=ARGUMENT_NECESSARY },
+  { .name="--hash-password",
+.takes_argument=ARGUMENT_NECESSARY },
+  { .name="--dump-config",
+.takes_argument=ARGUMENT_OPTIONAL },
+  { .name="--list-fingerprint" },
+  { .name="--keygen" },
+  { .name="--key-expiration",
+.takes_argument=ARGUMENT_OPTIONAL },
+  { .name="--newpass" },
+  { .name="--no-passphrase" },
+  { .name="--passphrase-fd",
+.takes_argument=ARGUMENT_NECESSARY },
+  { .name="--verify-config" },
+  { .name="--ignore-missing-torrc" },
+  { .name="--quiet" },
+  { .name="--hush" },
+  { .name="--version" },
+  { .name="--list-modules" },
+  { .name="--library-versions" },
+  { .name="-h" },
+  { .name="--help" },
+  { .name="--list-torrc-options" },
+  { .name="--list-deprecated-options" },
+  { .name="--nt-service" },
+  { .name="-nt-service" },
   { NULL, 0 },
 };
 



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

[tor-commits] [tor/master] fixup! Print the error message for --dump-config even if no arguments are given.

2019-10-17 Thread nickm

commit d15223a3858446cda55fd7e062301f697bee1db3
Author: Nick Mathewson 
Date:   Wed Oct 16 16:31:17 2019 -0400

fixup! Print the error message for --dump-config even if no arguments are 
given.

Fix a spelling error.
---
 src/app/config/config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index ea6a5e233..cc5bc8827 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -2446,7 +2446,7 @@ typedef enum {
   ARGUMENT_NONE = 0,
   /** Describes an option that takes a single argument. */
   ARGUMENT_NECESSARY = 1,
-  /** Describes an option that takes a single optinal argument. */
+  /** Describes an option that takes a single optional argument. */
   ARGUMENT_OPTIONAL = 2
 } takes_argument_t;
 



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

[tor-commits] [tor/master] Use an enum for quiet_level.

2019-10-17 Thread nickm

commit d97d7f0e48495e0b354b30b79992da822d12c15d
Author: Nick Mathewson 
Date:   Wed Oct 16 16:49:54 2019 -0400

Use an enum for quiet_level.
---
 src/app/config/config.c  | 22 +++---
 src/app/config/config.h  |  6 +++---
 src/app/config/quiet_level.h | 28 
 src/app/main/main.c  | 18 ++
 src/core/include.am  |  1 +
 src/core/mainloop/mainloop.h |  1 -
 6 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index 522c3b572..37eab2291 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -2470,11 +2470,11 @@ static const struct {
   { .name="--hash-password",
 .takes_argument=ARGUMENT_NECESSARY,
 .command=CMD_HASH_PASSWORD,
-.quiet=1  },
+.quiet=QUIET_HUSH  },
   { .name="--dump-config",
 .takes_argument=ARGUMENT_OPTIONAL,
 .command=CMD_DUMP_CONFIG,
-.quiet=2 },
+.quiet=QUIET_SILENT },
   { .name="--list-fingerprint",
 .command=CMD_LIST_FINGERPRINT },
   { .name="--keygen",
@@ -2490,27 +2490,27 @@ static const struct {
 .command=CMD_VERIFY_CONFIG },
   { .name="--ignore-missing-torrc" },
   { .name="--quiet",
-.quiet=2 },
+.quiet=QUIET_SILENT },
   { .name="--hush",
-.quiet=1 },
+.quiet=QUIET_HUSH },
   { .name="--version",
 .command=CMD_IMMEDIATE,
-.quiet=1 },
+.quiet=QUIET_HUSH },
   { .name="--list-modules",
 .command=CMD_IMMEDIATE,
-.quiet=1 },
+.quiet=QUIET_HUSH },
   { .name="--library-versions",
 .command=CMD_IMMEDIATE,
-.quiet=1 },
+.quiet=QUIET_HUSH },
   { .name="-h",
 .command=CMD_IMMEDIATE,
-.quiet=1 },
+.quiet=QUIET_HUSH },
   { .name="--help",
 .command=CMD_IMMEDIATE,
-.quiet=1  },
+.quiet=QUIET_HUSH  },
   { .name="--list-torrc-options",
 .command=CMD_IMMEDIATE,
-.quiet=1 },
+.quiet=QUIET_HUSH },
   { .name="--list-deprecated-options",
 .command=CMD_IMMEDIATE },
   { .name="--nt-service" },
@@ -2553,7 +2553,7 @@ config_parse_commandline(int argc, char **argv, int 
ignore_errors)
   is_a_command = true;
   result->command = CMDLINE_ONLY_OPTIONS[j].command;
 }
-int quiet = CMDLINE_ONLY_OPTIONS[j].quiet;
+quiet_level_t quiet = CMDLINE_ONLY_OPTIONS[j].quiet;
 if (quiet > result->quiet_level)
   result->quiet_level = quiet;
 break;
diff --git a/src/app/config/config.h b/src/app/config/config.h
index 8fc10d504..e5b687c31 100644
--- a/src/app/config/config.h
+++ b/src/app/config/config.h
@@ -14,6 +14,7 @@
 
 #include "app/config/or_options_st.h"
 #include "lib/testsupport/testsupport.h"
+#include "app/config/quiet_level.h"
 
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(DARWIN)
 #define KERNEL_MAY_SUPPORT_IPFW
@@ -208,9 +209,8 @@ typedef struct {
   tor_cmdline_mode_t command;
   /** Argument for the command mode, if any. */
   const char *command_arg;
-  /** How quiet have we been told to be?  1 for "hush", and 2 for "quiet".
-   */
-  int quiet_level;
+  /** How quiet have we been told to be? */
+  quiet_level_t quiet_level;
 } parsed_cmdline_t;
 
 parsed_cmdline_t *config_parse_commandline(int argc, char **argv,
diff --git a/src/app/config/quiet_level.h b/src/app/config/quiet_level.h
new file mode 100644
index 0..e90ec3f27
--- /dev/null
+++ b/src/app/config/quiet_level.h
@@ -0,0 +1,28 @@
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2019, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/**
+ * \file quiet_level.h
+ * \brief Declare the quiet_level enumeration and global.
+ **/
+
+#ifndef QUIET_LEVEL_H
+#define QUIET_LEVEL_H
+
+/** Enumeration to define how quietly Tor should log at startup. */
+typedef enum {
+   /** Default quiet level: we log everything of level NOTICE or higher. */
+   QUIET_NONE = 0,
+   /** "--hush" quiet level: we log everything of level WARNING or higher. */
+   QUIET_HUSH = 1 ,
+   /** "--quiet" quiet level: we log nothing at all. */
+   QUIET_SILENT = 2
+} quiet_level_t;
+
+/** How quietly should Tor log at startup? */
+extern quiet_level_t quiet_level;
+
+#endif /* !defined(QUIET_LEVEL_H) */
diff --git a/src/app/main/main.c b/src/app/main/main.c
index 22694fdbb..2d7579336 100644
--- a/src/app/main/main.c
+++ b/src/app/main/main.c
@@ -13,6 +13,7 @@
 
 #include "app/config/config.h"
 #include "app/config/statefile.h"
+#include "app/config/quiet_level.h"
 #include "app/main/main.h"
 #include "app/main/ntmain.h"
 #include "app/main/shutdown.h"
@@ -110,11 +111,11 @@ static void process_signal(int sig);
 
 /* START VARIABLES **/
 
-/** Decides our behavior when no logs are configured/before any
- * logs have been configured.  For 0, we log notice to stdout as normal.
- * For 1, we log warnings only.  For 2, we log nothing.
+/** Deci

[tor-commits] [tor/master] Move responsibility for setting the "quiet level" into a table.

2019-10-17 Thread nickm

commit bfdfaae0405aa683cdae85bde58da742f4b59ae5
Author: Nick Mathewson 
Date:   Tue Oct 8 13:13:31 2019 -0400

Move responsibility for setting the "quiet level" into a table.

Previously this was done with a big list of options in main.c which
implied "hush" or "quiet".  One of these options ("--digests") no
longer existed, but we still checked for it.

Now we use the table of command-line-only arguments to set this
value.
---
 src/app/config/config.c | 35 +--
 src/app/config/config.h |  3 +++
 src/app/main/main.c | 30 ++
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index 734bd0f92..ea6a5e233 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -2459,6 +2459,8 @@ static const struct {
   takes_argument_t takes_argument;
   /** If not CMD_RUN_TOR, what should Tor do when it starts? */
   tor_cmdline_mode_t command;
+  /** If nonzero, set the quiet level to this. 1 is "hush", 2 is "quiet" */
+  int quiet;
 } CMDLINE_ONLY_OPTIONS[] = {
   { .name="-f",
 .takes_argument=ARGUMENT_NECESSARY },
@@ -2467,10 +2469,12 @@ static const struct {
 .takes_argument=ARGUMENT_NECESSARY },
   { .name="--hash-password",
 .takes_argument=ARGUMENT_NECESSARY,
-.command=CMD_HASH_PASSWORD },
+.command=CMD_HASH_PASSWORD,
+.quiet=1  },
   { .name="--dump-config",
 .takes_argument=ARGUMENT_OPTIONAL,
-.command=CMD_DUMP_CONFIG },
+.command=CMD_DUMP_CONFIG,
+.quiet=2 },
   { .name="--list-fingerprint",
 .command=CMD_LIST_FINGERPRINT },
   { .name="--keygen",
@@ -2485,20 +2489,28 @@ static const struct {
   { .name="--verify-config",
 .command=CMD_VERIFY_CONFIG },
   { .name="--ignore-missing-torrc" },
-  { .name="--quiet" },
-  { .name="--hush" },
+  { .name="--quiet",
+.quiet=2 },
+  { .name="--hush",
+.quiet=1 },
   { .name="--version",
-.command=CMD_OTHER },
+.command=CMD_OTHER,
+.quiet=1 },
   { .name="--list-modules",
-.command=CMD_OTHER },
+.command=CMD_OTHER,
+.quiet=1 },
   { .name="--library-versions",
-.command=CMD_OTHER },
+.command=CMD_OTHER,
+.quiet=1 },
   { .name="-h",
-.command=CMD_OTHER },
+.command=CMD_OTHER,
+.quiet=1 },
   { .name="--help",
-.command=CMD_OTHER },
+.command=CMD_OTHER,
+.quiet=1  },
   { .name="--list-torrc-options",
-.command=CMD_OTHER },
+.command=CMD_OTHER,
+.quiet=1 },
   { .name="--list-deprecated-options",
 .command=CMD_OTHER },
   { .name="--nt-service" },
@@ -2541,6 +2553,9 @@ config_parse_commandline(int argc, char **argv, int 
ignore_errors)
   is_a_command = true;
   result->command = CMDLINE_ONLY_OPTIONS[j].command;
 }
+int quiet = CMDLINE_ONLY_OPTIONS[j].quiet;
+if (quiet > result->quiet_level)
+  result->quiet_level = quiet;
 break;
   }
 }
diff --git a/src/app/config/config.h b/src/app/config/config.h
index 582b97d74..8fc10d504 100644
--- a/src/app/config/config.h
+++ b/src/app/config/config.h
@@ -208,6 +208,9 @@ typedef struct {
   tor_cmdline_mode_t command;
   /** Argument for the command mode, if any. */
   const char *command_arg;
+  /** How quiet have we been told to be?  1 for "hush", and 2 for "quiet".
+   */
+  int quiet_level;
 } parsed_cmdline_t;
 
 parsed_cmdline_t *config_parse_commandline(int argc, char **argv,
diff --git a/src/app/main/main.c b/src/app/main/main.c
index ad8253cc7..95dccbee6 100644
--- a/src/app/main/main.c
+++ b/src/app/main/main.c
@@ -547,40 +547,22 @@ tor_init(int argc, char *argv[])
   hs_init();
 
   {
-  /* We search for the "quiet" option first, since it decides whether we
-   * will log anything at all to the command line. */
+/* We check for the "quiet"/"hush" settings first, since they decide
+   whether we log anything at all to stdout. */
 parsed_cmdline_t *cmdline;
-const config_line_t *cl = NULL;
 cmdline = config_parse_commandline(argc, argv, 1);
-if (cmdline != NULL) {
-  cl = cmdline->cmdline_opts;
-}
-for (; cl; cl = cl->next) {
-  if (!strcmp(cl->key, "--hush"))
-quiet = 1;
-  if (!strcmp(cl->key, "--quiet") ||
-  !strcmp(cl->key, "--dump-config"))
-quiet = 2;
-  /* The following options imply --hush */
-  if (!strcmp(cl->key, "--version") || !strcmp(cl->key, "--digests") ||
-  !strcmp(cl->key, "--list-torrc-options") ||
-  !strcmp(cl->key, "--library-versions") ||
-  !strcmp(cl->key, "--list-modules") ||
-  !strcmp(cl->key, "--hash-password") ||
-  !strcmp(cl->key, "-h") || !strcmp(cl->key, "--help")) {
-if (quiet < 1)
-  quiet = 1;
-  }
-}
+if (cmdline)
+  quiet = cmdline->quiet_level;
 parsed_cmdline_free(cmdline);
   }
 
  /* give it somewhere to log to initially */
   switch (quiet) {
 case 2:
-  /* no i

[tor-commits] [tor/master] config.c: make a couple of arguments const.

2019-10-17 Thread nickm

commit 911b16e6e7ba657024734e7a36fad56c22c740a9
Author: Nick Mathewson 
Date:   Tue Oct 8 11:37:46 2019 -0400

config.c: make a couple of arguments const.

These functions do not modify their inputs, so they can take const
arguments.
---
 src/app/config/config.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index 26b104802..1abe1e13a 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -5060,12 +5060,12 @@ normalize_nickname_list(config_line_t **normalized_out,
  * filename if it doesn't exist.
  */
 static char *
-find_torrc_filename(config_line_t *cmd_arg,
+find_torrc_filename(const config_line_t *cmd_arg,
 int defaults_file,
 int *using_default_fname, int *ignore_missing_torrc)
 {
   char *fname=NULL;
-  config_line_t *p_index;
+  const config_line_t *p_index;
   const char *fname_opt = defaults_file ? "--defaults-torrc" : "-f";
   const char *ignore_opt = defaults_file ? NULL : "--ignore-missing-torrc";
 
@@ -5144,7 +5144,7 @@ load_torrc_from_stdin(void)
  * Return the contents of the file on success, and NULL on failure.
  */
 static char *
-load_torrc_from_disk(config_line_t *cmd_arg, int defaults_file)
+load_torrc_from_disk(const config_line_t *cmd_arg, int defaults_file)
 {
   char *fname=NULL;
   char *cf = NULL;



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

[tor-commits] [tor/master] Rename CMD_OTHER to CMD_IMMEDIATE

2019-10-17 Thread nickm

commit b9f002dec6fac7276a34371e6183db0f4cd8560a
Author: Nick Mathewson 
Date:   Wed Oct 16 16:39:58 2019 -0400

Rename CMD_OTHER to CMD_IMMEDIATE
---
 src/app/config/config.c   | 18 +-
 src/app/config/tor_cmdline_mode.h |  4 ++--
 src/app/main/main.c   |  2 +-
 src/app/main/ntmain.c |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index cc5bc8827..522c3b572 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -2494,25 +2494,25 @@ static const struct {
   { .name="--hush",
 .quiet=1 },
   { .name="--version",
-.command=CMD_OTHER,
+.command=CMD_IMMEDIATE,
 .quiet=1 },
   { .name="--list-modules",
-.command=CMD_OTHER,
+.command=CMD_IMMEDIATE,
 .quiet=1 },
   { .name="--library-versions",
-.command=CMD_OTHER,
+.command=CMD_IMMEDIATE,
 .quiet=1 },
   { .name="-h",
-.command=CMD_OTHER,
+.command=CMD_IMMEDIATE,
 .quiet=1 },
   { .name="--help",
-.command=CMD_OTHER,
+.command=CMD_IMMEDIATE,
 .quiet=1  },
   { .name="--list-torrc-options",
-.command=CMD_OTHER,
+.command=CMD_IMMEDIATE,
 .quiet=1 },
   { .name="--list-deprecated-options",
-.command=CMD_OTHER },
+.command=CMD_IMMEDIATE },
   { .name="--nt-service" },
   { .name="-nt-service" },
   { .name=NULL },
@@ -5321,8 +5321,8 @@ options_init_from_torrc(int argc, char **argv)
 
   int command = global_cmdline->command;
   const char *command_arg = global_cmdline->command_arg;
-  /* "Other" has already been handled by this point. */
-  tor_assert(command != CMD_OTHER);
+  /* "immediate" has already been handled by this point. */
+  tor_assert(command != CMD_IMMEDIATE);
 
   if (command == CMD_HASH_PASSWORD) {
 cf_defaults = tor_strdup("");
diff --git a/src/app/config/tor_cmdline_mode.h 
b/src/app/config/tor_cmdline_mode.h
index 36626bed5..b2c43bbb8 100644
--- a/src/app/config/tor_cmdline_mode.h
+++ b/src/app/config/tor_cmdline_mode.h
@@ -24,8 +24,8 @@ typedef enum {
   CMD_DUMP_CONFIG, /**< Running --dump-config. */
   CMD_KEYGEN, /**< Running --keygen */
   CMD_KEY_EXPIRATION, /**< Running --key-expiration */
-  CMD_OTHER, /**< Special value: indicates a command that is handled
-  * immediately during configuration processing. */
+  CMD_IMMEDIATE, /**< Special value: indicates a command that is handled
+  * immediately during configuration processing. */
   CMD_RUN_UNITTESTS, /**< Special value: indicates that we have entered
   * the Tor code from the unit tests, not from the
   * regular Tor binary at all. */
diff --git a/src/app/main/main.c b/src/app/main/main.c
index 95dccbee6..22694fdbb 100644
--- a/src/app/main/main.c
+++ b/src/app/main/main.c
@@ -1339,7 +1339,7 @@ tor_run_main(const tor_main_configuration_t *tor_cfg)
 result = do_dump_config();
 break;
   case CMD_RUN_UNITTESTS: /* only set by test.c */
-  case CMD_OTHER: /* Handled in config.c */
+  case CMD_IMMEDIATE: /* Handled in config.c */
   default:
 log_warn(LD_BUG,"Illegal command number %d: internal error.",
  get_options()->command);
diff --git a/src/app/main/ntmain.c b/src/app/main/ntmain.c
index 16dc72acc..9351d9687 100644
--- a/src/app/main/ntmain.c
+++ b/src/app/main/ntmain.c
@@ -340,7 +340,7 @@ nt_service_main(void)
"or --key-expiration) in NT service.");
 break;
   case CMD_RUN_UNITTESTS:
-  case CMD_OTHER:
+  case CMD_IMMEDIATE:
   default:
 log_err(LD_CONFIG, "Illegal command number %d: internal error.",
 get_options()->command);



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

[tor-commits] [tor/master] Document takes_argument_t and its members.

2019-10-17 Thread nickm

commit 6cea2bd498b15aac14b884916b7dffa76f0547b7
Author: Nick Mathewson 
Date:   Tue Oct 8 10:50:53 2019 -0400

Document takes_argument_t and its members.
---
 src/app/config/config.c | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index 561fc6545..44d6a82e5 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -2447,9 +2447,15 @@ options_act(const or_options_t *old_options)
   return 0;
 }
 
+/**
+ * Enumeration to describe the syntax for a command-line option.
+ **/
 typedef enum {
+  /** Describe an option that does not take an argument. */
   ARGUMENT_NONE = 0,
+  /** Describes an option that takes a single argument. */
   ARGUMENT_NECESSARY = 1,
+  /** Describes an option that takes a single optinal argument. */
   ARGUMENT_OPTIONAL = 2
 } takes_argument_t;
 



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

[tor-commits] [tor/master] Rename TAKES_NO_ARGUMENT to ARGUMENT_NONE.

2019-10-17 Thread nickm

commit 4c25ea6703296d068a133da9821643f87c5f5316
Author: Nick Mathewson 
Date:   Tue Oct 8 10:46:16 2019 -0400

Rename TAKES_NO_ARGUMENT to ARGUMENT_NONE.

I'm doing this for consistency, so that all the values for this enum
have the same prefix.

This is an automated commit, generated by the following shell commands:

for fn in $(git ls-tree --name-only -r HEAD src |grep '\.[ch]$'); do \
perl -i -pe 's!\bTAKES_NO_ARGUMENT\b!ARGUMENT_NONE!g;' "$fn"; \
done
---
 src/app/config/config.c | 40 
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index deda2448b..561fc6545 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -2448,7 +2448,7 @@ options_act(const or_options_t *old_options)
 }
 
 typedef enum {
-  TAKES_NO_ARGUMENT = 0,
+  ARGUMENT_NONE = 0,
   ARGUMENT_NECESSARY = 1,
   ARGUMENT_OPTIONAL = 2
 } takes_argument_t;
@@ -2458,29 +2458,29 @@ static const struct {
   takes_argument_t takes_argument;
 } CMDLINE_ONLY_OPTIONS[] = {
   { "-f", ARGUMENT_NECESSARY },
-  { "--allow-missing-torrc",  TAKES_NO_ARGUMENT },
+  { "--allow-missing-torrc",  ARGUMENT_NONE },
   { "--defaults-torrc",   ARGUMENT_NECESSARY },
   { "--hash-password",ARGUMENT_NECESSARY },
   { "--dump-config",  ARGUMENT_OPTIONAL },
-  { "--list-fingerprint", TAKES_NO_ARGUMENT },
-  { "--keygen",   TAKES_NO_ARGUMENT },
+  { "--list-fingerprint", ARGUMENT_NONE },
+  { "--keygen",   ARGUMENT_NONE },
   { "--key-expiration",   ARGUMENT_OPTIONAL },
-  { "--newpass",  TAKES_NO_ARGUMENT },
-  { "--no-passphrase",TAKES_NO_ARGUMENT },
+  { "--newpass",  ARGUMENT_NONE },
+  { "--no-passphrase",ARGUMENT_NONE },
   { "--passphrase-fd",ARGUMENT_NECESSARY },
-  { "--verify-config",TAKES_NO_ARGUMENT },
-  { "--ignore-missing-torrc", TAKES_NO_ARGUMENT },
-  { "--quiet",TAKES_NO_ARGUMENT },
-  { "--hush", TAKES_NO_ARGUMENT },
-  { "--version",  TAKES_NO_ARGUMENT },
-  { "--list-modules", TAKES_NO_ARGUMENT },
-  { "--library-versions", TAKES_NO_ARGUMENT },
-  { "-h", TAKES_NO_ARGUMENT },
-  { "--help", TAKES_NO_ARGUMENT },
-  { "--list-torrc-options",   TAKES_NO_ARGUMENT },
-  { "--list-deprecated-options",TAKES_NO_ARGUMENT },
-  { "--nt-service",   TAKES_NO_ARGUMENT },
-  { "-nt-service",TAKES_NO_ARGUMENT },
+  { "--verify-config",ARGUMENT_NONE },
+  { "--ignore-missing-torrc", ARGUMENT_NONE },
+  { "--quiet",ARGUMENT_NONE },
+  { "--hush", ARGUMENT_NONE },
+  { "--version",  ARGUMENT_NONE },
+  { "--list-modules", ARGUMENT_NONE },
+  { "--library-versions", ARGUMENT_NONE },
+  { "-h", ARGUMENT_NONE },
+  { "--help", ARGUMENT_NONE },
+  { "--list-torrc-options",   ARGUMENT_NONE },
+  { "--list-deprecated-options",ARGUMENT_NONE },
+  { "--nt-service",   ARGUMENT_NONE },
+  { "-nt-service",ARGUMENT_NONE },
   { NULL, 0 },
 };
 
@@ -2552,7 +2552,7 @@ config_parse_commandline(int argc, char **argv, int 
ignore_errors,
 } else if (want_arg == ARGUMENT_OPTIONAL && is_last) {
   arg = tor_strdup("");
 } else {
-  arg = (want_arg != TAKES_NO_ARGUMENT) ? tor_strdup(argv[i+1]) :
+  arg = (want_arg != ARGUMENT_NONE) ? tor_strdup(argv[i+1]) :
   tor_strdup("");
 }
 



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

[tor-commits] [tor/master] Extract the enumeration that tells Tor what command it is running.

2019-10-17 Thread nickm

commit c42a79499afe45304b9dcdd63357c851f9a6d115
Author: Nick Mathewson 
Date:   Tue Oct 8 10:41:49 2019 -0400

Extract the enumeration that tells Tor what command it is running.
---
 src/app/config/or_options_st.h|  8 ++--
 src/app/config/tor_cmdline_mode.h | 32 
 src/core/include.am   |  1 +
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h
index 32dcd9fb1..21ddbb18b 100644
--- a/src/app/config/or_options_st.h
+++ b/src/app/config/or_options_st.h
@@ -15,6 +15,7 @@
 
 #include "lib/cc/torint.h"
 #include "lib/net/address.h"
+#include "app/config/tor_cmdline_mode.h"
 
 struct smartlist_t;
 struct config_line_t;
@@ -31,12 +32,7 @@ struct or_options_t {
   uint32_t magic_;
 
   /** What should the tor process actually do? */
-  enum {
-CMD_RUN_TOR=0, CMD_LIST_FINGERPRINT, CMD_HASH_PASSWORD,
-CMD_VERIFY_CONFIG, CMD_RUN_UNITTESTS, CMD_DUMP_CONFIG,
-CMD_KEYGEN,
-CMD_KEY_EXPIRATION,
-  } command;
+  tor_cmdline_mode_t command;
   char *command_arg; /**< Argument for command-line option. */
 
   struct config_line_t *Logs; /**< New-style list of configuration lines
diff --git a/src/app/config/tor_cmdline_mode.h 
b/src/app/config/tor_cmdline_mode.h
new file mode 100644
index 0..9bc9a68d5
--- /dev/null
+++ b/src/app/config/tor_cmdline_mode.h
@@ -0,0 +1,32 @@
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2019, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/**
+ * \file tor_cmdline_mode.h
+ * \brief Declare the tor_cmdline_mode_t enumeration
+ **/
+
+#ifndef TOR_CMDLINE_MODE_H
+#define TOR_CMDLINE_MODE_H
+
+/**
+ * Enumeration to describe which command Tor is running.  These commands
+ * are controlled by command-line options.
+ **/
+typedef enum tor_cmdline_mode_t {
+  CMD_RUN_TOR=0, /**< The default: run Tor as a daemon. */
+  CMD_LIST_FINGERPRINT, /**< Running --list-fingerprint. */
+  CMD_HASH_PASSWORD, /**< Running --hash-password. */
+  CMD_VERIFY_CONFIG, /**< Running --verify-config. */
+  CMD_DUMP_CONFIG, /**< Running --dump-config. */
+  CMD_KEYGEN, /**< Running --keygen */
+  CMD_KEY_EXPIRATION, /**< Running --key-expiration */
+  CMD_RUN_UNITTESTS, /**< Special value: indicates that we have entered
+  * the Tor code from the unit tests, not from the
+  * regular Tor binary at all. */
+} tor_cmdline_mode_t;
+
+#endif /* !defined(TOR_CMDLINE_MODE_H) */
diff --git a/src/core/include.am b/src/core/include.am
index 9b4b251c8..64004da34 100644
--- a/src/core/include.am
+++ b/src/core/include.am
@@ -216,6 +216,7 @@ noinst_HEADERS +=   \
src/app/config/or_options_st.h  \
src/app/config/or_state_st.h\
src/app/config/statefile.h  \
+   src/app/config/tor_cmdline_mode.h   \
src/app/main/main.h \
src/app/main/ntmain.h   \
src/app/main/shutdown.h \



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

[tor-commits] [translation/snowflakeaddon-messages.json_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed

2019-10-17 Thread translation

commit 612167588c0a516d6f0beff0e6c0d1a47b62ea9e
Author: Translation commit bot 
Date:   Thu Oct 17 15:47:19 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed
---
 mk/messages.json | 48 
 1 file changed, 48 insertions(+)

diff --git a/mk/messages.json b/mk/messages.json
index 8b4977683..a11a0d31d 100644
--- a/mk/messages.json
+++ b/mk/messages.json
@@ -28,5 +28,53 @@
   },
   "badgeCookiesOff": {
 "message": "ÐÐ¾Ð»Ð°ÑÐ¸ÑÐ°ÑÐ° Ð½Ðµ ÑÐµ Ð¾Ð²Ð¾Ð·Ð¼Ð¾Ð¶ÐµÐ½Ð¸."
+  },
+  "websiteIntro": {
+"message": "Snowflake Ðµ ÑÐ¸ÑÑÐµÐ¼ ÐºÐ¾Ñ ÑÐ° Ð¿Ð¾ÑÐ°Ð·ÑÐ²Ð° 
Ð¸Ð½ÑÐµÑÐ½ÐµÑ ÑÐµÐ½Ð·ÑÑÐ°ÑÐ°. ÐÑÑÐµÑÐ¾ ÐºÐ¾Ð¸ ÑÐµ 
ÑÐµÐ½Ð·ÑÑÐ¸ÑÐ°Ð½Ð¸ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÐ°Ñ Snowflake Ð·Ð° Ð´Ð° 
Ð¿ÑÐ¸ÑÑÐ°Ð¿ÑÐ²Ð°Ð°Ñ Ð½Ð° ÐÐ½ÑÐµÑÐ½ÐµÑ. ÐÐ¸Ð²Ð½Ð¾ÑÐ¾ 
Ð¿Ð¾Ð²ÑÐ·ÑÐ²Ð°ÑÐµ Ð¾Ð´Ð¸ Ð¿ÑÐµÐºÑ Snowflake Ð¿ÑÐ¾ÐºÑÐ¸ÑÐ°, ÐºÐ¾Ð¸ ÑÐµ 
Ð²Ð¾Ð´ÐµÐ½Ð¸ Ð¾Ð´ Ð²Ð¾Ð»Ð¾Ð½ÑÐµÑÐ¸. ÐÐ° Ð¿Ð¾Ð´ÐµÑÐ°Ð»Ð½Ð¸ 
Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð·Ð° ÑÐ¾Ð° ÐºÐ°ÐºÐ¾ ÑÐ°Ð±Ð¾ÑÐ¸ Snowflake Ð²Ð¸Ð´ÐµÑÐµ 
ÑÐ° Ð½Ð°ÑÐ°ÑÐ° https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\"; 
data-msgid=\"__MSG_docWiki__\">wiki Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÐ¸ÑÐ°."
+  },
+  "docWiki": {
+"message": "wiki Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÐ¸ÑÐ°"
+  },
+  "browser": {
+"message": "ÐÑÐµÐ»Ð¸ÑÑÑÐ²Ð°Ñ"
+  },
+  "censoredUsers": {
+"message": "ÐÐºÐ¾ Ð²Ð°ÑÐ¸Ð¾Ñ Ð¿ÑÐ¸ÑÑÐ°Ð¿ Ð½Ð° ÐÐ½ÑÐµÑÐ½ÐµÑ Ðµ 
ÑÐµÐ½Ð·ÑÑÐ¸ÑÐ°Ð½, ÑÑÐµÐ±Ð° Ð´Ð° Ð³Ð¾ Ð¿ÑÐµÐ·ÐµÐ¼ÐµÑÐµ https://www.torproject.org/download/\";>Tor Browser."
+  },
+  "extension": {
+"message": "ÐÑÐ¾ÑÐ¸ÑÑÐ²Ð°ÑÐµ"
+  },
+  "installExtension": {
+"message": "ÐÐºÐ¾ Ð²Ð°ÑÐ¸Ð¾Ñ ÐÐ½ÑÐµÑÐ½ÐµÑ Ð¿ÑÐ¸ÑÑÐ°Ð¿ Ðµ 
Ð½Ðµ ÑÐµÐ½Ð·ÑÑÐ¸ÑÐ°Ð½, Ð±Ð¸ Ð¼Ð¾Ð¶ÐµÐ»Ðµ Ð´Ð° 
ÑÐ°Ð·Ð¼Ð¸ÑÐ»Ð¸ÑÐµ Ð´Ð° Ð³Ð¾ Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°ÑÐµ Snowflake 
Ð¿ÑÐ¾ÑÐ¸ÑÑÐ²Ð°ÑÐµÑÐ¾ Ð·Ð° Ð´Ð° Ð¸Ð¼ Ð¿Ð¾Ð¼Ð¾Ð³Ð½ÐµÑÐµ Ð½Ð° 
ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐ¸ÑÐµ Ð½Ð° ÑÐµÐ½Ð·ÑÑÐ¸ÑÐ°Ð½Ð¸ÑÐµ Ð¼ÑÐµÐ¶Ð¸. ÐÐµÐ¼Ð° 
Ð¿Ð¾ÑÑÐµÐ±Ðµ Ð´Ð° ÑÐµ Ð³ÑÐ¸Ð¶Ð¸ÑÐµ Ð·Ð° ÑÐ¾Ð° Ð½Ð° ÐºÐ¾ÑÐ° Ð²ÐµÐ± 
ÑÑÑÐ°Ð½Ð° Ð»ÑÑÐµÑÐ¾ Ð¸ Ð¿ÑÐ¸ÑÑÐ°Ð¿ÑÐ²Ð°Ð°Ñ Ð¿ÑÐµÐºÑ Ð²Ð°ÑÐµÑÐ¾ 
Ð¿ÑÐ¾ÐºÑÐ¸. ÐÐ¸Ð²Ð½Ð°ÑÐ° Ð²Ð¸Ð´Ð»Ð¸Ð²Ð° IP Ð°Ð´ÑÐµÑÐ° Ð·Ð° 
Ð¿ÑÐµÐ»Ð¸ÑÑÑÐ²Ð°ÑÐµ ÑÐµ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ð°ÑÐ° ÑÐ¾ Ð½Ð¸Ð²Ð½Ð¸Ð¾Ñ 
Ð¸Ð·Ð»ÐµÐ·ÐµÐ½ Tor ÑÐ°Ð·Ð¾Ð», Ð° Ð½Ðµ ÑÐ¾ Ð²Ð°ÑÐ¸Ð¾Ñ."
+  },
+  "installFirefox": {
+"message": "ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ñ Ð²Ð¾ Firefox"
+  },
+  "installChrome": {
+"message": "ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ñ Ð²Ð¾ Chrome"
+  },
+  "reportingBugs": {
+"message": "ÐÑÐ¸ÑÐ°Ð²ÑÐ²Ð°ÑÐµ Ð³ÑÐµÑÐºÐ¸"
+  },
+  "fileBug": {
+"message": "ÐÐºÐ¾ ÑÐµ ÑÑÐ´ÑÐ¸ÑÐµ ÑÐ¾ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð¸ ÑÐ¾ 
Snowflake ÐºÐ°ÐºÐ¾ ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸Ð»Ð¸ ÐºÐ°ÐºÐ¾ Ð¿ÑÐºÑÐ¸, Ð²Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ 
ÑÐ°Ð·Ð¼Ð¸ÑÐ»ÐµÑÐµ Ð´Ð° Ð¿ÑÐ¸ÑÐ°Ð²Ð¸ÑÐµ Ð³ÑÐµÑÐºÐ°. ÐÐ° Ð´Ð° Ð³Ð¾ 
ÑÑÐ¾ÑÐ¸ÑÐµ ÑÐ¾Ð°, ÑÑÐµÐ±Ð° Ð´Ð°,"
+  },
+  "sharedAccount": {
+"message": "ÐÐ»Ð¸ Ð´Ð° https://trac.torproject.org/projects/tor/register\";>ÑÐ¾Ð·Ð´Ð°Ð´ÐµÑÐµ 
ÑÐ¼ÐµÑÐºÐ° Ð¸Ð»Ð¸ https://trac.torproject.org/projects/tor/login\";>Ð´Ð° ÑÐµ 
Ð½Ð°ÑÐ°Ð²Ð¸ÑÐµ ÐºÐ¾ÑÐ¸ÑÑÐµÑÑÐ¸ ÑÐ° ÑÐ¿Ð¾Ð´ÐµÐ»ÐµÐ½Ð°ÑÐ° 
ÐµÐ½ÐºÑÐ¸Ð¿ÑÐµÑÑÐºÐ° ÑÐ¼ÐµÑÐºÐ° ÑÐ¾ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°  Ð²Ð½ÐµÑÐ¸ 
ÐºÐ¾Ð´ ."
+  },
+  "bugTracker": {
+"message": "https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake\";>ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸
 Ð¸Ð·Ð²ÐµÑÑÐ°Ñ ÐºÐ¾ÑÐ¸ÑÑÐµÑÑÐ¸ Ð³Ð¾ Ð½Ð°ÑÐ¸Ð¾Ñ ÑÐ»ÐµÐ´Ð°Ñ Ð½Ð° 
Ð³ÑÐµÑÐºÐ¸."
+  },
+  "descriptive": {
+"message": "ÐÐµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð¾Ð±Ð¸Ð´ÐµÑÐµ ÑÐµ Ð´Ð° Ð±Ð¸Ð´ÐµÑÐµ ÑÑÐ¾ 
Ðµ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾ÑÐ°ÑÐ½Ð¸ Ð²Ð¾ Ð²Ð°ÑÐ¸Ð¾Ñ Ð¸Ð·Ð²ÐµÑÑÐ°Ñ Ð¸ Ð°ÐºÐ¾ Ðµ 
Ð¼Ð¾Ð¶Ð½Ð¾ Ð²ÐºÐ»ÑÑÐµÑÐµ Ð³Ð¸ Ð»Ð¾Ð³Ð¾Ð²Ð¸ÑÐµ ÐºÐ¾Ð¸ ÑÐµ Ð½Ð¸ 
Ð¿Ð¾Ð¼Ð¾Ð³Ð½Ð°Ñ Ð´Ð° ÑÐ° Ð¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ¼Ðµ Ð¸ÑÑÐ°ÑÐ° Ð³ÑÐµÑÐºÐ°. Ð 
Ð°Ð·Ð¼Ð¸ÑÐ»ÐµÑÐµ Ð·Ð° Ð´Ð¾Ð´Ð´Ð°Ð²Ð°ÑÐµ Ð½Ð° ÐºÐ»ÑÑÐ½Ð¸ Ð·Ð±Ð¾ÑÐ¾Ð²Ð¸ 
snowflake-webextension Ð¸Ð»Ð¸ snowflake-client ÐºÐ°ÐºÐ¾ Ð±Ð¸ 
Ð½Ð¸ ÐºÐ°Ð¶Ð°Ð»Ðµ Ð²Ð¾ ÐºÐ¾Ñ Ð´ÐµÐ» Ð¾Ð´ Snowflake ÑÐ¸ÑÑÐµÐ¼Ð¾Ñ ÑÐµ 
ÑÑÐµÑÐ½Ð°Ð²ÑÐµ ÑÐ¾ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð¸."
+  },
+  "embed": {
+"message": "ÐÐ³ÑÐ°Ð´Ð¸"
+  },
+  "possible": {
+"message": "Ð¡ÐµÐ³Ð° Ðµ Ð¼Ð¾Ð¶Ð½Ð¾ Ð´Ð° Ð³Ð¾ Ð²Ð³ÑÐ°Ð´Ð¸Ñ Snowflake 
Ð±ÐµÑÐ¾Ñ Ð½Ð° Ð±Ð¸Ð»Ð¾ ÐºÐ¾ÑÐ° Ð²ÐµÐ± ÑÑÑÐ°Ð½Ð°:"
+  },
+  "looksLike": {
+"message": "ÐÐ¾Ñ Ð¸Ð·Ð³Ð»ÐµÐ´Ð° Ð²Ð°ÐºÐ°:"
   }
 }

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

[tor-commits] [translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json

2019-10-17 Thread translation

commit b5d902361600d75b5fd147e32e35923dd0f4d3ac
Author: Translation commit bot 
Date:   Thu Oct 17 15:47:13 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
---
 mk/messages.json | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mk/messages.json b/mk/messages.json
index a063eaf75..a11a0d31d 100644
--- a/mk/messages.json
+++ b/mk/messages.json
@@ -33,7 +33,7 @@
 "message": "Snowflake Ðµ ÑÐ¸ÑÑÐµÐ¼ ÐºÐ¾Ñ ÑÐ° Ð¿Ð¾ÑÐ°Ð·ÑÐ²Ð° 
Ð¸Ð½ÑÐµÑÐ½ÐµÑ ÑÐµÐ½Ð·ÑÑÐ°ÑÐ°. ÐÑÑÐµÑÐ¾ ÐºÐ¾Ð¸ ÑÐµ 
ÑÐµÐ½Ð·ÑÑÐ¸ÑÐ°Ð½Ð¸ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÐ°Ñ Snowflake Ð·Ð° Ð´Ð° 
Ð¿ÑÐ¸ÑÑÐ°Ð¿ÑÐ²Ð°Ð°Ñ Ð½Ð° ÐÐ½ÑÐµÑÐ½ÐµÑ. ÐÐ¸Ð²Ð½Ð¾ÑÐ¾ 
Ð¿Ð¾Ð²ÑÐ·ÑÐ²Ð°ÑÐµ Ð¾Ð´Ð¸ Ð¿ÑÐµÐºÑ Snowflake Ð¿ÑÐ¾ÐºÑÐ¸ÑÐ°, ÐºÐ¾Ð¸ ÑÐµ 
Ð²Ð¾Ð´ÐµÐ½Ð¸ Ð¾Ð´ Ð²Ð¾Ð»Ð¾Ð½ÑÐµÑÐ¸. ÐÐ° Ð¿Ð¾Ð´ÐµÑÐ°Ð»Ð½Ð¸ 
Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð·Ð° ÑÐ¾Ð° ÐºÐ°ÐºÐ¾ ÑÐ°Ð±Ð¾ÑÐ¸ Snowflake Ð²Ð¸Ð´ÐµÑÐµ 
ÑÐ° Ð½Ð°ÑÐ°ÑÐ° https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\"; 
data-msgid=\"__MSG_docWiki__\">wiki Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÐ¸ÑÐ°."
   },
   "docWiki": {
-"message": "documentation wiki"
+"message": "wiki Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÐ¸ÑÐ°"
   },
   "browser": {
 "message": "ÐÑÐµÐ»Ð¸ÑÑÑÐ²Ð°Ñ"
@@ -45,16 +45,16 @@
 "message": "ÐÑÐ¾ÑÐ¸ÑÑÐ²Ð°ÑÐµ"
   },
   "installExtension": {
-"message": "ÐÐºÐ¾ Ð²Ð°ÑÐ¸Ð¾Ñ ÐÐ½ÑÐµÑÐ½ÐµÑ Ð¿ÑÐ¸ÑÑÐ°Ð¿ Ðµ 
Ð½Ðµ ÑÐµÐ½Ð·ÑÑÐ¸ÑÐ°Ð½, Ð±Ð¸ Ð¼Ð¾Ð¶ÐµÐ»Ðµ Ð´Ð° 
ÑÐ°Ð·Ð¼Ð¸ÑÐ»Ð¸ÑÐµ Ð´Ð° Ð³Ð¾Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°ÑÐµ Snowflake 
Ð¿ÑÐ¾ÑÐ¸ÑÑÐ²Ð°ÑÐµÑÐ¾ Ð·Ð° Ð´Ð° Ð¸Ð¼ Ð¿Ð¾Ð¼Ð¾Ð³Ð½ÐµÑÐµ Ð½Ð° 
ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐ¸ÑÐµ Ð½Ð° ÑÐµÐ½Ð·ÑÑÐ¸ÑÐ°Ð½Ð¸ÑÐµ Ð¼ÑÐµÐ¶Ð¸. ÐÐµÐ¼Ð° 
Ð¿Ð¾ÑÑÐµÐ±Ðµ Ð´Ð° ÑÐµ Ð³ÑÐ¸Ð¶Ð¸ÑÐµ Ð·Ð° ÑÐ¾Ð° Ð½Ð° ÐºÐ¾ÑÐ° Ð²ÐµÐ± 
ÑÑÑÐ°Ð½Ð° Ð»ÑÑÐµÑÐ¾ Ð¸ Ð¿ÑÐ¸ÑÑÐ°Ð¿ÑÐ²Ð°Ð°Ñ Ð¿ÑÐµÐºÑ Ð²Ð°ÑÐµÑÐ¾ 
Ð¿ÑÐ¾ÐºÑÐ¸. ÐÐ¸Ð²Ð½Ð°ÑÐ° Ð²Ð¸Ð´Ð»Ð¸Ð²Ð° IP Ð°Ð´ÑÐµÑÐ° Ð·Ð° 
Ð¿ÑÐµÐ»Ð¸ÑÑÑÐ²Ð°ÑÐµ ÑÐµ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ð°ÑÐ° ÑÐ¾ Ð½Ð¸Ð²Ð½Ð¸Ð¾Ñ 
Ð¸Ð·Ð»ÐµÐ·ÐµÐ½ Tor ÑÐ°Ð·Ð¾Ð», Ð° Ð½Ðµ ÑÐ¾ Ð²Ð°ÑÐ¸Ð¾Ñ."
+"message": "ÐÐºÐ¾ Ð²Ð°ÑÐ¸Ð¾Ñ ÐÐ½ÑÐµÑÐ½ÐµÑ Ð¿ÑÐ¸ÑÑÐ°Ð¿ Ðµ 
Ð½Ðµ ÑÐµÐ½Ð·ÑÑÐ¸ÑÐ°Ð½, Ð±Ð¸ Ð¼Ð¾Ð¶ÐµÐ»Ðµ Ð´Ð° 
ÑÐ°Ð·Ð¼Ð¸ÑÐ»Ð¸ÑÐµ Ð´Ð° Ð³Ð¾ Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°ÑÐµ Snowflake 
Ð¿ÑÐ¾ÑÐ¸ÑÑÐ²Ð°ÑÐµÑÐ¾ Ð·Ð° Ð´Ð° Ð¸Ð¼ Ð¿Ð¾Ð¼Ð¾Ð³Ð½ÐµÑÐµ Ð½Ð° 
ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐ¸ÑÐµ Ð½Ð° ÑÐµÐ½Ð·ÑÑÐ¸ÑÐ°Ð½Ð¸ÑÐµ Ð¼ÑÐµÐ¶Ð¸. ÐÐµÐ¼Ð° 
Ð¿Ð¾ÑÑÐµÐ±Ðµ Ð´Ð° ÑÐµ Ð³ÑÐ¸Ð¶Ð¸ÑÐµ Ð·Ð° ÑÐ¾Ð° Ð½Ð° ÐºÐ¾ÑÐ° Ð²ÐµÐ± 
ÑÑÑÐ°Ð½Ð° Ð»ÑÑÐµÑÐ¾ Ð¸ Ð¿ÑÐ¸ÑÑÐ°Ð¿ÑÐ²Ð°Ð°Ñ Ð¿ÑÐµÐºÑ Ð²Ð°ÑÐµÑÐ¾ 
Ð¿ÑÐ¾ÐºÑÐ¸. ÐÐ¸Ð²Ð½Ð°ÑÐ° Ð²Ð¸Ð´Ð»Ð¸Ð²Ð° IP Ð°Ð´ÑÐµÑÐ° Ð·Ð° 
Ð¿ÑÐµÐ»Ð¸ÑÑÑÐ²Ð°ÑÐµ ÑÐµ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ð°ÑÐ° ÑÐ¾ Ð½Ð¸Ð²Ð½Ð¸Ð¾Ñ 
Ð¸Ð·Ð»ÐµÐ·ÐµÐ½ Tor ÑÐ°Ð·Ð¾Ð», Ð° Ð½Ðµ ÑÐ¾ Ð²Ð°ÑÐ¸Ð¾Ñ."
   },
   "installFirefox": {
-"message": "Install in Firefox"
+"message": "ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ñ Ð²Ð¾ Firefox"
   },
   "installChrome": {
-"message": "Install in Chrome"
+"message": "ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ñ Ð²Ð¾ Chrome"
   },
   "reportingBugs": {
-"message": "Reporting Bugs"
+"message": "ÐÑÐ¸ÑÐ°Ð²ÑÐ²Ð°ÑÐµ Ð³ÑÐµÑÐºÐ¸"
   },
   "fileBug": {
 "message": "ÐÐºÐ¾ ÑÐµ ÑÑÐ´ÑÐ¸ÑÐµ ÑÐ¾ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð¸ ÑÐ¾ 
Snowflake ÐºÐ°ÐºÐ¾ ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸Ð»Ð¸ ÐºÐ°ÐºÐ¾ Ð¿ÑÐºÑÐ¸, Ð²Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ 
ÑÐ°Ð·Ð¼Ð¸ÑÐ»ÐµÑÐµ Ð´Ð° Ð¿ÑÐ¸ÑÐ°Ð²Ð¸ÑÐµ Ð³ÑÐµÑÐºÐ°. ÐÐ° Ð´Ð° Ð³Ð¾ 
ÑÑÐ¾ÑÐ¸ÑÐµ ÑÐ¾Ð°, ÑÑÐµÐ±Ð° Ð´Ð°,"
@@ -63,13 +63,13 @@
 "message": "ÐÐ»Ð¸ Ð´Ð° https://trac.torproject.org/projects/tor/register\";>ÑÐ¾Ð·Ð´Ð°Ð´ÐµÑÐµ 
ÑÐ¼ÐµÑÐºÐ° Ð¸Ð»Ð¸ https://trac.torproject.org/projects/tor/login\";>Ð´Ð° ÑÐµ 
Ð½Ð°ÑÐ°Ð²Ð¸ÑÐµ ÐºÐ¾ÑÐ¸ÑÑÐµÑÑÐ¸ ÑÐ° ÑÐ¿Ð¾Ð´ÐµÐ»ÐµÐ½Ð°ÑÐ° 
ÐµÐ½ÐºÑÐ¸Ð¿ÑÐµÑÑÐºÐ° ÑÐ¼ÐµÑÐºÐ° ÑÐ¾ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°  Ð²Ð½ÐµÑÐ¸ 
ÐºÐ¾Ð´ ."
   },
   "bugTracker": {
-"message": "https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake\";>ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸
 ÑÐ°Ð¿Ð¾ÑÑ ÐºÐ¾ÑÐ¸ÑÑÐµÑÑÐ¸ Ð³Ð¾ Ð½Ð°ÑÐ¸Ð¾Ñ ÑÐ»ÐµÐ´Ð°Ñ Ð½Ð° 
Ð³ÑÐµÑÐºÐ¸."
+"message": "https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake\";>ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸
 Ð¸Ð·Ð²ÐµÑÑÐ°Ñ ÐºÐ¾ÑÐ¸ÑÑÐµÑÑÐ¸ Ð³Ð¾ Ð½Ð°ÑÐ¸Ð¾Ñ ÑÐ»ÐµÐ´Ð°Ñ Ð½Ð° 
Ð³ÑÐµÑÐºÐ¸."
   },
   "descriptive": {
-"message": "ÐÐµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð¾Ð±Ð¸Ð´ÐµÑÐµ ÑÐµ Ð´Ð° Ð±Ð¸Ð´ÐµÑÐµ ÑÑÐ¾ 
Ðµ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾ÑÐ°ÑÐ½Ð¸ Ð²Ð¾ Ð²Ð°ÑÐ¸Ð¾Ñ ÑÐ°Ð¿Ð¾ÑÑ Ð¸ Ð°ÐºÐ¾ Ðµ 
Ð¼Ð¾Ð¶Ð½Ð¾ Ð²ÐºÐ»ÑÑÐµÑÐµ Ð³Ð¸ Ð»Ð¾Ð³Ð¾Ð²Ð¸ÑÐµ ÐºÐ¾Ð¸ ÑÐµ Ð½Ð¸ 
Ð¿Ð¾Ð¼Ð¾Ð³Ð½Ð°Ñ Ð´Ð° ÑÐ° Ð¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ¼Ðµ Ð¸ÑÑÐ°ÑÐ° Ð³ÑÐµÑÐºÐ°. Ð 
Ð°Ð·Ð¼Ð¸ÑÐ»ÐµÑÐµ Ð·Ð° Ð´Ð¾Ð´Ð´Ð°Ð²Ð°ÑÐµ Ð½Ð° ÐºÐ»ÑÑÐ½Ð¸ Ð·Ð±Ð¾ÑÐ¾Ð²Ð¸ 
snowflake-webextension Ð¸Ð»Ð¸ snowflake-client ÐºÐ°ÐºÐ¾ Ð±Ð¸ 
Ð½Ð¸ ÐºÐ°Ð¶Ð°Ð»Ðµ Ð²Ð¾ ÐºÐ¾Ñ Ð´ÐµÐ» Ð¾Ð´ Snowflake ÑÐ¸ÑÑÐµÐ¼Ð¾Ñ ÑÐµ 
ÑÑÐµÑÐ½Ð°Ð²ÑÐµ ÑÐ¾ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð¸."
+"message": "ÐÐµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð¾Ð±Ð¸Ð´ÐµÑÐµ ÑÐµ Ð´Ð° Ð±Ð¸Ð´ÐµÑÐµ ÑÑÐ¾ 
Ðµ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾ÑÐ°ÑÐ½Ð¸ Ð²Ð¾ Ð²Ð°ÑÐ¸Ð¾Ñ Ð¸Ð·Ð²ÐµÑÑÐ°Ñ Ð¸ Ð°ÐºÐ¾ Ðµ 
Ð¼Ð¾Ð¶Ð½Ð¾ Ð²ÐºÐ»ÑÑÐµÑÐµ Ð³Ð¸ Ð»Ð¾Ð³Ð¾Ð²Ð¸ÑÐµ ÐºÐ¾Ð¸ ÑÐµ Ð½Ð¸ 
Ð¿Ð¾Ð¼Ð¾Ð³Ð½Ð°Ñ Ð´Ð° ÑÐ

[tor-commits] [translation/snowflake-website-indexhtml] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml

2019-10-17 Thread translation

commit d88b8f5b3e7ab8911708f66a08ef6097431a1d6e
Author: Translation commit bot 
Date:   Thu Oct 17 15:47:24 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml
---
 mk/index.html | 112 +++---
 1 file changed, 60 insertions(+), 52 deletions(-)

diff --git a/mk/index.html b/mk/index.html
index 8d848c74b..f706ff5e5 100644
--- a/mk/index.html
+++ b/mk/index.html
@@ -1,75 +1,83 @@
 
-
+
 
 
 
 Snowflake
-
-
+
+
+
 
-
-https://www.torproject.org/";>
- SNOWFLAKE
+
+https://www.torproject.org/";>
+  
+
+  
+  
+
+  
+  SNOWFLAKE
 
-  https://trac.torproject.org/projects/tor/raw-attachment/wiki/doc/Snowflake/snowflake-schematic.png";
 alt="Diagram">
+https://trac.torproject.org/projects/tor/raw-attachment/wiki/doc/Snowflake/snowflake-schematic.png";
 alt="Diagram">
 
-  Snowflake Ðµ ÑÐ¸ÑÑÐµÐ¼ ÐºÐ¾Ñ ÑÐ° Ð¿Ð¾ÑÐ°Ð·ÑÐ²Ð° 
Ð¸Ð½ÑÐµÑÐ½ÐµÑ ÑÐµÐ½Ð·ÑÑÐ°ÑÐ°. ÐÑÑÐµÑÐ¾ ÐºÐ¾Ð¸ ÑÐµ
-ÑÐµÐ½Ð·ÑÑÐ¸ÑÐ°Ð½Ð¸ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÐ°Ñ Snowflake Ð·Ð° Ð´Ð° 
Ð¿ÑÐ¸ÑÑÐ°Ð¿ÑÐ²Ð°Ð°Ñ Ð½Ð° ÐÐ½ÑÐµÑÐ½ÐµÑ. ÐÐ¸Ð²Ð½Ð¾ÑÐ¾ 
Ð¿Ð¾Ð²ÑÐ·ÑÐ²Ð°ÑÐµ Ð¾Ð´Ð¸
-Ð¿ÑÐµÐºÑ Snowflake Ð¿ÑÐ¾ÐºÑÐ¸ÑÐ°, ÐºÐ¾Ð¸ ÑÐµ Ð²Ð¾Ð´ÐµÐ½Ð¸ Ð¾Ð´ 
Ð²Ð¾Ð»Ð¾Ð½ÑÐµÑÐ¸. ÐÐ° Ð¿Ð¾Ð´ÐµÑÐ°Ð»Ð½Ð¸
-Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð·Ð° ÑÐ¾Ð° ÐºÐ°ÐºÐ¾ ÑÐ°Ð±Ð¾ÑÐ¸ Snowflake Ð²Ð¸Ð´ÐµÑÐµ 
ÑÐ° Ð½Ð°ÑÐ°ÑÐ°
-  https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/";>wiki 
Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÐ¸ÑÐ°.
+Snowflake is a system to defeat 
internet censorship. People who are
+censored can use Snowflake to access the internet. Their connection 
goes
+through Snowflake proxies, which are run by volunteers. For more 
detailed
+information about how Snowflake works see our
+https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/"; 
data-msgid="__MSG_docWiki__">documentation wiki.
 
-  
+
 
-ÐÑÐµÐ»Ð¸ÑÑÑÐ²Ð°Ñ
+  ÐÑÐµÐ»Ð¸ÑÑÑÐ²Ð°Ñ
 
-  ÐÐºÐ¾ Ð²Ð°ÑÐ¸Ð¾Ñ Ð¿ÑÐ¸ÑÑÐ°Ð¿ Ð½Ð° ÐÐ½ÑÐµÑÐ½ÐµÑ Ðµ 
ÑÐµÐ½Ð·ÑÑÐ¸ÑÐ°Ð½, ÑÑÐµÐ±Ð° Ð´Ð° Ð³Ð¾ Ð¿ÑÐµÐ·ÐµÐ¼ÐµÑÐµ
-  https://www.torproject.org/download/";>Tor Browser.
+If your internet access is 
censored, you should download 
+https://www.torproject.org/download/";>Tor Browser.
 
-  
-ÐÑÐ¾ÑÐ¸ÑÑÐ²Ð°ÑÐµ
+
+  ÐÑÐ¾ÑÐ¸ÑÑÐ²Ð°ÑÐµ
 
-  ÐÐºÐ¾ Ð²Ð°ÑÐ¸Ð¾Ñ ÐÐ½ÑÐµÑÐ½ÐµÑ Ð¿ÑÐ¸ÑÑÐ°Ð¿ Ðµ 
Ð½Ðµ ÑÐµÐ½Ð·ÑÑÐ¸ÑÐ°Ð½, Ð±Ð¸ Ð¼Ð¾Ð¶ÐµÐ»Ðµ
-Ð´Ð° ÑÐ°Ð·Ð¼Ð¸ÑÐ»Ð¸ÑÐµ Ð´Ð° Ð³Ð¾Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°ÑÐµ Snowflake 
Ð¿ÑÐ¾ÑÐ¸ÑÑÐ²Ð°ÑÐµÑÐ¾ Ð·Ð° Ð´Ð° Ð¸Ð¼ Ð¿Ð¾Ð¼Ð¾Ð³Ð½ÐµÑÐµ Ð½Ð° 
ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐ¸ÑÐµ Ð½Ð° ÑÐµÐ½Ð·ÑÑÐ¸ÑÐ°Ð½Ð¸ÑÐµ
-Ð¼ÑÐµÐ¶Ð¸. ÐÐµÐ¼Ð° Ð¿Ð¾ÑÑÐµÐ±Ðµ Ð´Ð° ÑÐµ Ð³ÑÐ¸Ð¶Ð¸ÑÐµ Ð·Ð° ÑÐ¾Ð° Ð½Ð° 
ÐºÐ¾ÑÐ° Ð²ÐµÐ± ÑÑÑÐ°Ð½Ð° Ð»ÑÑÐµÑÐ¾ Ð¸
-Ð¿ÑÐ¸ÑÑÐ°Ð¿ÑÐ²Ð°Ð°Ñ Ð¿ÑÐµÐºÑ Ð²Ð°ÑÐµÑÐ¾ Ð¿ÑÐ¾ÐºÑÐ¸. ÐÐ¸Ð²Ð½Ð°ÑÐ° 
Ð²Ð¸Ð´Ð»Ð¸Ð²Ð° IP Ð°Ð´ÑÐµÑÐ° Ð·Ð° Ð¿ÑÐµÐ»Ð¸ÑÑÑÐ²Ð°ÑÐµ ÑÐµ
-Ð¾Ð´Ð³Ð¾Ð²Ð¾Ð°ÑÐ° ÑÐ¾ Ð½Ð¸Ð²Ð½Ð¸Ð¾Ñ Ð¸Ð·Ð»ÐµÐ·ÐµÐ½ Tor ÑÐ°Ð·Ð¾Ð», Ð° Ð½Ðµ 
ÑÐ¾ Ð²Ð°ÑÐ¸Ð¾Ñ.
+If your internet access 
is not censored, you should
+consider installing the Snowflake extension to help users in 
censored
+networks. There is no need to worry about which websites people are
+accessing through your proxy. Their visible browsing IP address 
will
+match their Tor exit node, not yours.
 
-  https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/";>
- ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ñ Ð²Ð¾ Firefox
- 
- https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie";>
- ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ñ Ð²Ð¾ Chrome
-   
-
+https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/";>
+  Install in 
Firefox
+
+https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie";>
+  Install in 
Chrome
+
+  
 
 
-  ÐÐ ÐÐÐÐÐ£ÐÐÐÐ ÐÐ ÐÐ ÐÐ¨ÐÐ
+ÐÑÐ¸ÑÐ°Ð²ÑÐ²Ð°ÑÐµ Ð³ÑÐµÑÐºÐ¸
 
-ÐÐºÐ¾ ÑÐµ ÑÑÐ´ÑÑÐ¸ÑÐµ ÑÐ¾ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð¸ ÑÐ¾ Snowflake 
ÐºÐ°ÐºÐ¾ ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸Ð»Ð¸ Ð¿ÑÐ¾ÐºÑÐ¸,
-Ð²Ðµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ ÑÐ°Ð·Ð¼Ð¸ÑÐ»ÐµÑÐµ Ð´Ð° Ð¿ÑÐ¸ÑÐ°Ð²Ð¸ÑÐµ 
Ð³ÑÐµÑÐºÐ°. ÐÐ° Ð´Ð° Ð³Ð¾ Ð½Ð°Ð¿ÑÐ°Ð²Ð¸ÑÐµ ÑÐ¾Ð°, ÑÑÐµÐ±Ð° Ð´Ð°,
+  If you encounter problems with 
Snowflake as a client or a proxy,
+  please consider filing a bug.  To do so, you will have to,
 
-
-ÐÐ»Ð¸ https://trac.torproject.org/projects/tor/register";>ÑÐ¾Ð·Ð´Ð°Ð´ÐµÑÐµ
-  ÑÐ¼ÐµÑÐºÐ° Ð¸Ð»Ð¸ https://trac.torproject.org/projects/tor/login";>Ð½Ð°ÑÐ°Ð²ÐµÑÐµ ÑÐµ
-  ÐºÐ¾ÑÐ¸ÑÑÐµÑÑÐ¸ ÑÐ° ÑÐ¿Ð¾Ð´ÐµÐ»ÐµÐ½Ð°ÑÐ° cypherpunks - 
Ð¿ÑÐ¸ÐºÑÐ¸Ð²Ð°Ñ Ð½Ð° ÑÐ¾Ð¾Ð±ÑÐ°ÑÐ°ÑÑÐ¼ÐµÑÐºÐ° ÑÐ¾ Ð»Ð¾Ð·Ð¸Ð½Ð

[tor-commits] [translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot

2019-10-17 Thread translation

commit 0b2aeca04b6484f2abface0da966585970be9e1c
Author: Translation commit bot 
Date:   Thu Oct 17 15:47:00 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
---
 code_of_conduct+fr.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code_of_conduct+fr.po b/code_of_conduct+fr.po
index 109d27c4e..894af7691 100644
--- a/code_of_conduct+fr.po
+++ b/code_of_conduct+fr.po
@@ -520,8 +520,8 @@ msgid ""
 "Sustained disruption of any community events, including talks, "
 "presentations, and online conversations."
 msgstr ""
-"Perturbation durable de tout Ã©vÃ©nement communautaire, y compris des "
-"causeries, des prÃ©sentations et des conversations en ligne."
+"Perturbation continue de tout Ã©vÃ©nement communautaire, dont les 
confÃ©rences,"
+" les prÃ©sentations et les conversations en ligne."
 
 #. type: Bullet: '  * '
 #: ../code_of_conduct.txt:177

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

[tor-commits] [translation/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed

2019-10-17 Thread translation

commit 824fa730e6eeff649ed164516ce8ea20207aab76
Author: Translation commit bot 
Date:   Thu Oct 17 15:22:59 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
---
 mk/network-settings.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mk/network-settings.dtd b/mk/network-settings.dtd
index cf9fdc5f5..89dfcdc4b 100644
--- a/mk/network-settings.dtd
+++ b/mk/network-settings.dtd
@@ -69,7 +69,7 @@
 
 
 
-
+
 
 
 
@@ -79,5 +79,5 @@
 
 
 
-
+
 

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

[tor-commits] [translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings

2019-10-17 Thread translation

commit a3d4432d2cf6bd678dc468c9fa7efbfc25c671cf
Author: Translation commit bot 
Date:   Thu Oct 17 15:22:53 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
---
 mk/network-settings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/network-settings.dtd b/mk/network-settings.dtd
index add1b04b3..89dfcdc4b 100644
--- a/mk/network-settings.dtd
+++ b/mk/network-settings.dtd
@@ -79,5 +79,5 @@
 
 
 
-
+
 

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

[tor-commits] [translation/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed

2019-10-17 Thread translation

commit ffc4c5de5d2f27ef7c8cc231db4f4ef0679451ec
Author: Translation commit bot 
Date:   Thu Oct 17 14:22:51 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
---
 fr/network-settings.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fr/network-settings.dtd b/fr/network-settings.dtd
index 02c074b7b..22f103bba 100644
--- a/fr/network-settings.dtd
+++ b/fr/network-settings.dtd
@@ -71,7 +71,7 @@
 
 
-
+
 
 
 
@@ -81,5 +81,5 @@ Selon votre position gÃ©ographique, un pont pourrait 
fonctionner mieux quâun a
 
 
 
-
+
 

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

[tor-commits] [translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings

2019-10-17 Thread translation

commit 62264a1c23058394822a62a7d8987d241f397fe1
Author: Translation commit bot 
Date:   Thu Oct 17 14:22:45 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
---
 fr/network-settings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fr/network-settings.dtd b/fr/network-settings.dtd
index dcbf95983..22f103bba 100644
--- a/fr/network-settings.dtd
+++ b/fr/network-settings.dtd
@@ -81,5 +81,5 @@ Selon votre position gÃ©ographique, un pont pourrait 
fonctionner mieux quâun a
 
 
 
-
+
 

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

[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release

2019-10-17 Thread translation

commit 74649801a5978a7b2da0be1ec848086197ce0f5c
Author: Translation commit bot 
Date:   Thu Oct 17 14:18:38 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 he.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/he.po b/he.po
index 1268d380c..3dad683b8 100644
--- a/he.po
+++ b/he.po
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-10-05 16:50+0200\n"
-"PO-Revision-Date: 2019-10-06 02:05+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-10-17 13:53+\n"
+"Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc

2019-10-17 Thread translation

commit cc6c7fa4a669bbe77db0c0a0bfa104749f85cab4
Author: Translation commit bot 
Date:   Thu Oct 17 14:17:24 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 he.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/he.po b/he.po
index 2a61cc5c1..83273a4c6 100644
--- a/he.po
+++ b/he.po
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-10-05 16:50+0200\n"
-"PO-Revision-Date: 2019-10-06 02:05+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-10-17 13:53+\n"
+"Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,7 +86,7 @@ msgstr "××ª××× ×××©××ª×ª ×¢×××¨ Electrum"
 msgid ""
 "When you reboot Tails, all of Electrum's data will be lost, including your 
Bitcoin wallet.\n"
 "It is strongly recommended to only run Electrum when its persistence feature 
is activated."
-msgstr ""
+msgstr "×××©×¨ ××ª× ×××ª×× ××ª Tails, ×× ×× ×ª×× ×× ×©× 
Electrum ×××××, ×××× ××¨× ×§ ××××§××× ×©××.\n×××××¥ 
×××× ×××¨××¥ ××ª Electrum ×¨×§ ×××©×¨ ×××¤××× ×××ª××× 
×©×× ××©××¤×¢×."
 
 #: config/chroot_local-includes/usr/local/bin/electrum:65
 msgid "Do you want to start Electrum anyway?"

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

[tor-commits] [tor/master] Print summary at the end of the configure script

2019-10-17 Thread nickm

commit 7fcf999c6350b1437962c978ee1fe88af9d38b7d
Author: David Goulet 
Date:   Thu Aug 8 10:08:02 2019 -0400

Print summary at the end of the configure script

Signed-off-by: David Goulet 
---
 changes/ticket31373 |   3 +
 configure.ac| 127 +
 m4/pprint.m4| 228 
 3 files changed, 358 insertions(+)

diff --git a/changes/ticket31373 b/changes/ticket31373
new file mode 100644
index 0..1f2dea3cd
--- /dev/null
+++ b/changes/ticket31373
@@ -0,0 +1,3 @@
+  o Minor feature (configure, build system):
+- Output enabled/disabled features at the end of the configure process in a
+  pleasing way. Closes ticket 31373.
diff --git a/configure.ac b/configure.ac
index 9ec123f51..cc64be5ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,6 +8,8 @@ AC_INIT([tor],[0.4.2.0-alpha-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
+configure_flags="$*"
+
 # DO NOT EDIT THIS DEFINITION BY HAND UNLESS YOU KNOW WHAT YOU'RE DOING.
 #
 # The update_versions.py script updates this definition when the
@@ -2519,3 +2521,128 @@ 
https://trac.torproject.org/projects/tor/wiki/doc/TorFragileHardening
 fi
 
 AC_OUTPUT
+
+#
+# Mini-report on what will be built.
+#
+
+PPRINT_INIT
+PPRINT_SET_INDENT(1)
+PPRINT_SET_TS(65)
+
+AS_ECHO
+AS_ECHO("Tor Version: ${PPRINT_COLOR_BLDBLU}Tor $PACKAGE_VERSION 
$PPRINT_COLOR_RST")
+AS_ECHO
+
+PPRINT_SUBTITLE([Build Features])
+
+PPRINT_PROP_STRING([Compiler], [$CC])
+PPRINT_PROP_STRING([Host OS], [$host_os])
+AS_ECHO
+
+test "x$enable_gcc_warnings" = "xyes" && value=1 || value=0
+PPRINT_PROP_BOOL([Verbose Warnings (--enable-gcc-warnings)], $value)
+
+test "x$enable_fatal_warnings" = "xyes" && value=1 || value=0
+PPRINT_PROP_BOOL([Warnings are fatal (--enable-fatal-warnings)], $value)
+
+test "x$enable_rust" = "xyes" && value=1 || value=0
+PPRINT_PROP_BOOL([Rust support (--enable-rust)], $value)
+
+test "x$enable_android" = "xyes" && value=1 || value=0
+PPRINT_PROP_BOOL([Android support (--enable-android)], $value)
+
+test "x$enable_systemd" = "xyes" && value=1 || value=0
+PPRINT_PROP_BOOL([Systemd support (--enable-systemd)], $value)
+
+AS_ECHO
+PPRINT_SUBTITLE([Static Build])
+
+test "x$enable_static_tor" = "xyes" && value=1 || value=0
+PPRINT_PROP_BOOL([tor (--enable-static-tor)], $value)
+
+if test "x$enable_static_libevent" = "xyes"; then
+  PPRINT_PROP_STRING([libevent], [$TOR_LIBDIR_libevent])
+else
+  PPRINT_PROP_BOOL([libevent (--enable-static-libevent)], $value)
+fi
+
+if test "x$enable_static_openssl" = "xyes"; then
+  PPRINT_PROP_STRING([libssl], [$TOR_LIBDIR_openssl])
+else
+  PPRINT_PROP_BOOL([libssl (--enable-static-openssl)], $value)
+fi
+
+if test "x$enable_static_zlib" = "xyes"; then
+  PPRINT_PROP_STRING([zlib1g], [$TOR_LIBDIR_zlib])
+else
+  PPRINT_PROP_BOOL([zlib1g (--enable-static-zlib)], $value)
+fi
+
+AS_ECHO
+PPRINT_SUBTITLE([Optional Libraries])
+
+test "x$enable_nss" = "xyes" && value=1 || value=0
+PPRINT_PROP_BOOL([libnss (--enable-nss)], $value)
+
+test "x$enable_seccomp" != "xno" && value=1 || value=0
+PPRINT_PROP_BOOL([libseccomp (--disable-seccomp)], $value)
+
+test "x$enable_libscrypt" != "xno" && value=1 || value=0
+PPRINT_PROP_BOOL([libscrypt (--disable-libscrypt)], $value)
+
+AS_ECHO
+PPRINT_SUBTITLE([Hardening])
+
+test "x$enable_gcc_hardening" != "xno" && value=1 || value=0
+PPRINT_PROP_BOOL([Compiler Hardening (--disable-gcc-hardening)], $value)
+
+test "x$enable_linker_hardening" != "xno" && value=1 || value=0
+PPRINT_PROP_BOOL([Linker Hardening (--disable-linker-hardening)], $value)
+
+test "x$enable_fragile_hardening" = "xyes" && value=1 || value=0
+PPRINT_PROP_BOOL([Fragile Hardening (--enable-fragile-hardening, dev only)], 
$value)
+
+AS_ECHO
+PPRINT_SUBTITLE([Modules])
+
+test "x$enable_module_dirauth" != "xno" && value=1 || value=0
+PPRINT_PROP_BOOL([Directory Authority (--disable-module-dirauth)], $value)
+
+AS_ECHO
+PPRINT_SUBTITLE([Documentation])
+
+test "x$enable_manpage" != "xno" && value=1 || value=0
+PPRINT_PROP_BOOL([Man Pages (--disable-manpage)], $value)
+
+test "x$enable_html_manual" != "xno" && value=1 || value=0
+PPRINT_PROP_BOOL([HTML Manual (--disable-html-manual)], $value)
+
+AS_ECHO
+PPRINT_SUBTITLE([Tests])
+
+test "x$enable_unittests" != "xno" && value=1 || value=0
+PPRINT_PROP_BOOL([Unit tests (--disable-unittests)], $value)
+
+test "x$enable_asserts_in_tests" = "xno" && value=1 || value=0
+PPRINT_PROP_BOOL([assert()s disabled (--disable-asserts-in-tests, dev only)], 
$value)
+
+test "x$enable_coverage" = "xyes" && value=1 || value=0
+PPRINT_PROP_BOOL([Code Coverage (--enable-coverage)], $value)
+
+test "x$enable_libfuzzer" = "xyes" && value=1 || value=0
+PPRINT_PROP_BOOL([libFuzzer support (--enable-libfuzzer)], $value)
+
+test "x$enable_oss_fuzz" = "xyes" && value=1 || value=0
+PPRINT_PROP_BOOL([OSS-Fuzz support (--enable-oss-fuzz)], $value)
+
+AS_ECHO
+PPRINT_SUBTITLE([Install Directories])

1 2 >

1 - 100 of 136 matches

Mail list logo