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

2018-08-29 Thread translation 
commit 28ff8b12385bf5d8584519becef330bc7191b2ea
Author: Translation commit bot 
Date:   Thu Aug 30 02:49:25 2018 +

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

diff --git a/contents+de.po b/contents+de.po
index 76ef9550b..80cd013e4 100644
--- a/contents+de.po
+++ b/contents+de.po
@@ -95,12 +95,12 @@ msgstr ""
 #: http//localhost/operators/operators-3/
 #: (content/operators/operators-3/contents+en.lrquestion.description)
 msgid "## If you control multiple relays, include then in the family"
-msgstr ""
+msgstr "## Wenn du mehrere Relays betreibst, füge sie der Familie hinzu"
 
 #: http//localhost/operators/operators-3/
 #: (content/operators/operators-3/contents+en.lrquestion.description)
 msgid "* Edit /usr/local/etc/tor/torrc to look like the following:"
-msgstr ""
+msgstr "* Bearbeite /usr/local/etc/tor/torrc folgendermaßen:"
 
 #: http//localhost/misc/misc-15/
 #: (content/misc/misc-15/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] [tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 26670: Make canvas permission respect FPI

2018-08-29 Thread gk 
commit 79db24856a23ec7ae1f6d8cf46919a499ae5bb9f
Author: Arthur Edelstein 
Date:   Wed Aug 29 09:56:57 2018 -0700

Bug 26670: Make canvas permission respect FPI
---
 browser/base/content/browser.js | 21 -
 dom/canvas/CanvasUtils.cpp  | 23 ---
 dom/ipc/PBrowser.ipdl   |  4 ++--
 dom/ipc/TabParent.cpp   |  4 ++--
 dom/ipc/TabParent.h |  2 +-
 5 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index fbfbf3e809ca..443619533567 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -6824,7 +6824,7 @@ var CanvasPermissionPromptHelper = {
   },
 
   // aSubject is an nsIBrowser (e10s) or an nsIDOMWindow (non-e10s).
-  // aData is an URL string.
+  // aData is an Origin string.
   observe(aSubject, aTopic, aData) {
 if (aTopic != this._permissionsPrompt) {
   return;
@@ -6838,7 +6838,6 @@ var CanvasPermissionPromptHelper = {
   browser = aSubject.QueryInterface(Ci.nsIBrowser);
 }
 
-let uri = Services.io.newURI(aData);
 if (gBrowser.selectedBrowser !== browser) {
   // Must belong to some other window.
   return;
@@ -6846,17 +6845,21 @@ var CanvasPermissionPromptHelper = {
 
 let message = gNavigatorBundle.getFormattedString("canvas.siteprompt", 
["<>"], 1);
 
-function setCanvasPermission(aURI, aPerm, aPersistent) {
-  Services.perms.add(aURI, "canvas", aPerm,
-  aPersistent ? Ci.nsIPermissionManager.EXPIRE_NEVER
-  : 
Ci.nsIPermissionManager.EXPIRE_SESSION);
+let principal = Services.scriptSecurityManager
+.createCodebasePrincipalFromOrigin(aData);
+
+function setCanvasPermission(aPerm, aPersistent) {
+  Services.perms.addFromPrincipal(
+principal, "canvas", aPerm,
+aPersistent ? Ci.nsIPermissionManager.EXPIRE_NEVER
+: Ci.nsIPermissionManager.EXPIRE_SESSION);
 }
 
 let mainAction = {
   label: gNavigatorBundle.getString("canvas.allow"),
   accessKey: gNavigatorBundle.getString("canvas.allow.accesskey"),
   callback(state) {
-setCanvasPermission(uri, Ci.nsIPermissionManager.ALLOW_ACTION,
+setCanvasPermission(Ci.nsIPermissionManager.ALLOW_ACTION,
 state && state.checkboxChecked);
   }
 };
@@ -6865,7 +6868,7 @@ var CanvasPermissionPromptHelper = {
   label: gNavigatorBundle.getString("canvas.notAllow"),
   accessKey: gNavigatorBundle.getString("canvas.notAllow.accesskey"),
   callback(state) {
-setCanvasPermission(uri, Ci.nsIPermissionManager.DENY_ACTION,
+setCanvasPermission(Ci.nsIPermissionManager.DENY_ACTION,
 state && state.checkboxChecked);
   }
 }];
@@ -6881,7 +6884,7 @@ var CanvasPermissionPromptHelper = {
 
 let options = {
   checkbox,
-  name: uri.asciiHost,
+  name: principal.URI.host,
   learnMoreURL: Services.urlFormatter.formatURLPref("app.support.baseURL") 
+ "fingerprint-permission",
 };
 PopupNotifications.show(browser, aTopic, message, this._notificationIcon,
diff --git a/dom/canvas/CanvasUtils.cpp b/dom/canvas/CanvasUtils.cpp
index 0a8d7f0e2e59..ca8d91d92181 100644
--- a/dom/canvas/CanvasUtils.cpp
+++ b/dom/canvas/CanvasUtils.cpp
@@ -58,8 +58,13 @@ bool IsImageExtractionAllowed(nsIDocument *aDocument, 
JSContext *aCx)
 // Documents with system principal can always extract canvas data.
 nsPIDOMWindowOuter *win = aDocument->GetWindow();
 nsCOMPtr sop(do_QueryInterface(win));
-if (sop && nsContentUtils::IsSystemPrincipal(sop->GetPrincipal())) {
-return true;
+if (!sop) {
+  return false;
+}
+
+nsCOMPtr principal(sop->GetPrincipal());
+if (principal && nsContentUtils::IsSystemPrincipal(principal)) {
+  return true;
 }
 
 // Always give permission to chrome scripts (e.g. Page Inspector).
@@ -127,9 +132,9 @@ bool IsImageExtractionAllowed(nsIDocument *aDocument, 
JSContext *aCx)
 // Check if the site has permission to extract canvas data.
 // Either permit or block extraction if a stored permission setting exists.
 uint32_t permission;
-rv = permissionManager->TestPermission(topLevelDocURI,
-   PERMISSION_CANVAS_EXTRACT_DATA,
-   );
+rv = permissionManager->TestPermissionFromPrincipal(principal,
+
PERMISSION_CANVAS_EXTRACT_DATA,
+);
 NS_ENSURE_SUCCESS(rv, false);
 switch (permission) {
 case nsIPermissionManager::ALLOW_ACTION:
@@ -165,16 +170,20 @@ bool IsImageExtractionAllowed(nsIDocument *aDocument, 
JSContext *aCx)
 nsContentUtils::LogMessageToConsole(message.get());
 
 // Prompt the user

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

2018-08-29 Thread translation 
commit 710f53db349bf9a6d65c9167203655b72bef1457
Author: Translation commit bot 
Date:   Wed Aug 29 21:16:44 2018 +

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

diff --git a/lt/android_strings.dtd b/lt/android_strings.dtd
index 3888dda2d..698fc4031 100644
--- a/lt/android_strings.dtd
+++ b/lt/android_strings.dtd
@@ -391,7 +391,7 @@
 
 
 
-
+
 
 
 

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

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

2018-08-29 Thread gk 
commit 3c6862f6cc8a7dc59b9eba41638100638ecb33b0
Author: Georg Koppen 
Date:   Tue Aug 28 21:51:27 2018 +

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

Disable wasm for now until we have it properly reviewed in #21549.
---
 browser/app/profile/000-tor-browser.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/browser/app/profile/000-tor-browser.js 
b/browser/app/profile/000-tor-browser.js
index 17c9d614b61c..2b5ebe8cf949 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -231,6 +231,8 @@ pref("mathml.disabled", false);
 // Until we address at least the linkability concerns in #19417 let's disable
 // asmjs.
 pref("javascript.options.asmjs", false);
+// Unless we audit wasm properly in #21549 let's disable it.
+pref("javascript.options.wasm", false);
 // Mozilla keeps still finding critical bugs in Graphite code. Disable it for
 // now, see bug 21726.
 pref("gfx.font_rendering.graphite.enabled", false);

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

[tor-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] squash! Bug 4234: Use the Firefox Update Process for Tor Browser.

2018-08-29 Thread gk 
commit 7b269d1c44ba383444a1bfed3acb67ab3cac5071
Author: Kathy Brade 
Date:   Wed Aug 22 13:51:29 2018 -0400

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

Also fix bug 27221: purge the startup cache if the Tor Browser
version changed (even if the Firefox version and build ID did
not change), e.g., after a minor Tor Browser update.
---
 toolkit/xre/nsAppRunner.cpp | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index d036bc915c80..114aedd0 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -3208,6 +3208,13 @@ CheckCompatibility(nsIFile* aProfileDir, const 
nsCString& aVersion,
   if (NS_FAILED(rv) || !aVersion.Equals(buf))
 return false;
 
+#ifdef TOR_BROWSER_VERSION
+  nsAutoCString tbVersion(TOR_BROWSER_VERSION);
+  rv = parser.GetString("Compatibility", "LastTorBrowserVersion", buf);
+  if (NS_FAILED(rv) || !tbVersion.Equals(buf))
+return false;
+#endif
+
   rv = parser.GetString("Compatibility", "LastOSABI", buf);
   if (NS_FAILED(rv) || !aOSABI.Equals(buf))
 return false;
@@ -3304,6 +3311,13 @@ WriteVersion(nsIFile* aProfileDir, const nsCString& 
aVersion,
   PR_Write(fd, kHeader, sizeof(kHeader) - 1);
   PR_Write(fd, aVersion.get(), aVersion.Length());
 
+#ifdef TOR_BROWSER_VERSION
+  nsAutoCString tbVersion(TOR_BROWSER_VERSION);
+  static const char kTorBrowserVersionHeader[] = NS_LINEBREAK 
"LastTorBrowserVersion=";
+  PR_Write(fd, kTorBrowserVersionHeader, sizeof(kTorBrowserVersionHeader) - 1);
+  PR_Write(fd, tbVersion.get(), tbVersion.Length());
+#endif
+
   static const char kOSABIHeader[] = NS_LINEBREAK "LastOSABI=";
   PR_Write(fd, kOSABIHeader, sizeof(kOSABIHeader) - 1);
   PR_Write(fd, aOSABI.get(), aOSABI.Length());

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

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

2018-08-29 Thread gk 
commit d7442e6576b00951a7e60b97cb3308da17caa996
Author: Georg Koppen 
Date:   Tue Aug 28 21:57:47 2018 +

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

Disable WebVR for now until we have it properly audited in #21607.
---
 browser/app/profile/000-tor-browser.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/browser/app/profile/000-tor-browser.js 
b/browser/app/profile/000-tor-browser.js
index 46c56ea0cede..17c9d614b61c 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -151,6 +151,7 @@ pref("media.webspeech.synth.enabled", false); // Bug 10283: 
Disable SpeechSynthe
 pref("dom.webaudio.enabled", false); // Bug 13017: Disable Web Audio API
 pref("dom.maxHardwareConcurrency", 1); // Bug 21675: Spoof single-core cpu
 pref("dom.w3c_touch_events.enabled", 0); // Bug 10286: Always disable Touch API
+pref("dom.vr.enabled", false); // Bug 21607: Disable WebVR for now
 // Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575)
 pref("security.webauth.webauthn", false); // Bug 26614: Disable Web 
Authentication API for now
 pref("browser.cache.frecency_experiment", -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 'ticket27246_035_01_squashed'

2018-08-29 Thread nickm 
commit 94605f08fb89ea79409225362d2fa0f8a07435d7
Merge: 810152b20 6c0c08bbb
Author: Nick Mathewson 
Date:   Wed Aug 29 15:05:05 2018 -0400

Merge branch 'ticket27246_035_01_squashed'

 changes/ticket27246  |  4 +++
 src/core/or/circuitbuild.c   | 21 -
 src/feature/dirauth/dirvote.c|  5 ++-
 src/feature/nodelist/microdesc.c |  2 +-
 src/feature/nodelist/microdesc_st.h  | 10 --
 src/feature/nodelist/nodelist.c  | 31 +++
 src/feature/nodelist/nodelist.h  |  1 +
 src/feature/nodelist/routerinfo_st.h |  9 +-
 src/feature/nodelist/routerlist.c|  5 +--
 src/feature/nodelist/routerparse.c   | 16 +++---
 src/feature/relay/router.c   | 60 +---
 src/feature/relay/router.h   |  4 +++
 src/test/test_dir.c  | 14 ++---
 src/test/test_hs_service.c   |  4 +--
 src/test/test_router.c   |  8 +++--
 15 files changed, 161 insertions(+), 33 deletions(-)

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

[tor-commits] [tor/master] Expand the comments on ASN.1-encoded TAP keys

2018-08-29 Thread nickm 
commit 6c0c08bbb506f47bf97bba82e4421592f71455d7
Author: Nick Mathewson 
Date:   Wed Aug 29 15:04:54 2018 -0400

Expand the comments on ASN.1-encoded TAP keys
---
 src/feature/nodelist/microdesc_st.h  | 6 +-
 src/feature/nodelist/routerinfo_st.h | 6 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/feature/nodelist/microdesc_st.h 
b/src/feature/nodelist/microdesc_st.h
index 40b562f26..d23da1313 100644
--- a/src/feature/nodelist/microdesc_st.h
+++ b/src/feature/nodelist/microdesc_st.h
@@ -53,8 +53,12 @@ struct microdesc_t {
 
   /* Fields in the microdescriptor. */
 
-  /* Public RSA key for onions in ASN.1 encoded. */
+  /**
+   * Public RSA TAP key for onions, ASN.1 encoded.  We store this
+   * in its encoded format since storing it as a crypto_pk_t uses
+   * significantly more memory. */
   char *onion_pkey;
+  /** Length of onion_pkey, in bytes. */
   size_t onion_pkey_len;
 
   /** As routerinfo_t.onion_curve25519_pkey */
diff --git a/src/feature/nodelist/routerinfo_st.h 
b/src/feature/nodelist/routerinfo_st.h
index 18ea0fade..6d4d118ad 100644
--- a/src/feature/nodelist/routerinfo_st.h
+++ b/src/feature/nodelist/routerinfo_st.h
@@ -27,8 +27,12 @@ struct routerinfo_t {
   tor_addr_t ipv6_addr;
   uint16_t ipv6_orport;
 
-  /* Public RSA key for onions in ASN.1 encoded. */
+  /**
+   * Public RSA TAP key for onions, ASN.1 encoded.  We store this
+   * in its encoded format since storing it as a crypto_pk_t uses
+   * significantly more memory. */
   char *onion_pkey;
+  /** Length of onion_pkey, in bytes. */
   size_t onion_pkey_len;
 
   crypto_pk_t *identity_pkey;  /**< Public RSA key for signing. */



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

[tor-commits] [tor/master] Changes for 27246

2018-08-29 Thread nickm 
commit 7f1895c39a860437f4a1ec830f26d7d568facb63
Author: Nick Mathewson 
Date:   Wed Aug 29 15:02:59 2018 -0400

Changes for 27246
---
 changes/ticket27246 | 4 
 1 file changed, 4 insertions(+)

diff --git a/changes/ticket27246 b/changes/ticket27246
new file mode 100644
index 0..c0d665d4c
--- /dev/null
+++ b/changes/ticket27246
@@ -0,0 +1,4 @@
+  o Minor features (memory usage):
+- When not using them, store legacy TAP public onion keys in
+  DER-encoded format, rather than as expanded public keys. This should
+  save several megabytes on typical clients. Closes ticket 27246.



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

[tor-commits] [tor/master] router: Keep RSA onion public key in ASN.1 format

2018-08-29 Thread nickm 
commit 2f6bc74914d60b62b8e61904aae16c84c2b1181d
Author: David Goulet 
Date:   Thu Aug 23 14:05:42 2018 -0400

router: Keep RSA onion public key in ASN.1 format

The OpenSSL "RSA" object is currently 408 bytes compares to the ASN.1 
encoding
which is 140 for a 1024 RSA key.

We save 268 bytes per descriptor (routerinfo_t) *and* microdescriptor
(microdesc_t). Scaling this to 6000 relays, and considering client usually
only have microdescriptors, we save 1.608 MB of RAM which is considerable 
for
mobile client.

This commit makes it that we keep the RSA onion public key (used for TAP
handshake) in ASN.1 format instead of an OpenSSL RSA object.

Changes is done in both routerinfo_t and microdesc_t.

Closes #27246

Signed-off-by: David Goulet 
---
 src/core/or/circuitbuild.c   | 21 -
 src/feature/dirauth/dirvote.c|  5 ++-
 src/feature/nodelist/microdesc.c |  2 +-
 src/feature/nodelist/microdesc_st.h  |  6 ++--
 src/feature/nodelist/nodelist.c  | 31 +++
 src/feature/nodelist/nodelist.h  |  1 +
 src/feature/nodelist/routerinfo_st.h |  5 ++-
 src/feature/nodelist/routerlist.c|  5 +--
 src/feature/nodelist/routerparse.c   | 16 +++---
 src/feature/relay/router.c   | 60 +---
 src/feature/relay/router.h   |  4 +++
 src/test/test_dir.c  | 14 ++---
 src/test/test_hs_service.c   |  4 +--
 src/test/test_router.c   |  8 +++--
 14 files changed, 149 insertions(+), 33 deletions(-)

diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c
index e22ddabde..670d21c85 100644
--- a/src/core/or/circuitbuild.c
+++ b/src/core/or/circuitbuild.c
@@ -2864,6 +2864,8 @@ extend_info_new(const char *nickname,
 extend_info_t *
 extend_info_from_node(const node_t *node, int for_direct_connect)
 {
+  crypto_pk_t *rsa_pubkey = NULL;
+  extend_info_t *info = NULL;
   tor_addr_port_t ap;
   int valid_addr = 0;
 
@@ -2911,25 +2913,28 @@ extend_info_from_node(const node_t *node, int 
for_direct_connect)
   /* Retrieve the curve25519 pubkey. */
   const curve25519_public_key_t *curve_pubkey =
 node_get_curve25519_onion_key(node);
+  rsa_pubkey = node_get_rsa_onion_key(node);
 
-  if (valid_addr && node->ri)
-return extend_info_new(node->ri->nickname,
+  if (valid_addr && node->ri) {
+info = extend_info_new(node->ri->nickname,
node->identity,
ed_pubkey,
-   node->ri->onion_pkey,
+   rsa_pubkey,
curve_pubkey,
,
ap.port);
-  else if (valid_addr && node->rs && node->md)
-return extend_info_new(node->rs->nickname,
+  } else if (valid_addr && node->rs && node->md) {
+info = extend_info_new(node->rs->nickname,
node->identity,
ed_pubkey,
-   node->md->onion_pkey,
+   rsa_pubkey,
curve_pubkey,
,
ap.port);
-  else
-return NULL;
+  }
+
+  crypto_pk_free(rsa_pubkey);
+  return info;
 }
 
 /** Release storage held by an extend_info_t struct. */
diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c
index 6477f34ba..553b375e1 100644
--- a/src/feature/dirauth/dirvote.c
+++ b/src/feature/dirauth/dirvote.c
@@ -3754,8 +3754,10 @@ dirvote_create_microdescriptor(const routerinfo_t *ri, 
int consensus_method)
   size_t keylen;
   smartlist_t *chunks = smartlist_new();
   char *output = NULL;
+  crypto_pk_t *rsa_pubkey = router_get_rsa_onion_pkey(ri->onion_pkey,
+  ri->onion_pkey_len);
 
-  if (crypto_pk_write_public_key_to_string(ri->onion_pkey, , )<0)
+  if (crypto_pk_write_public_key_to_string(rsa_pubkey, , )<0)
 goto done;
   summary = policy_summarize(ri->exit_policy, AF_INET);
   if (ri->declared_family)
@@ -3826,6 +3828,7 @@ dirvote_create_microdescriptor(const routerinfo_t *ri, 
int consensus_method)
   }
 
  done:
+  crypto_pk_free(rsa_pubkey);
   tor_free(output);
   tor_free(key);
   tor_free(summary);
diff --git a/src/feature/nodelist/microdesc.c b/src/feature/nodelist/microdesc.c
index d9630b4f1..aa5e6b1db 100644
--- a/src/feature/nodelist/microdesc.c
+++ b/src/feature/nodelist/microdesc.c
@@ -874,7 +874,7 @@ microdesc_free_(microdesc_t *md, const char *fname, int 
lineno)
   //tor_assert(md->held_by_nodes == 0);
 
   if (md->onion_pkey)
-crypto_pk_free(md->onion_pkey);
+tor_free(md->onion_pkey);
   tor_free(md->onion_curve25519_pkey);
   tor_free(md->ed25519_identity_pkey);
   if (md->body && md->saved_location != SAVED_IN_CACHE)
diff --git a/src/feature/nodelist/microdesc_st.h 
b/src/feature/nodelist/microdesc_st.h
index e9dc3e017..40b562f26 100644

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

2018-08-29 Thread translation 
commit be88f4a08f47b73fffdb0252acbea078cb45258b
Author: Translation commit bot 
Date:   Wed Aug 29 17:48:30 2018 +

Update translations for torcheck_completed
---
 eo/torcheck.po | 23 +++
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/eo/torcheck.po b/eo/torcheck.po
index 3b5d531da..6b6f60478 100644
--- a/eo/torcheck.po
+++ b/eo/torcheck.po
@@ -5,14 +5,15 @@
 # Chris Kerr , 2013
 # Eduardo Trápani , 2014
 # Leopoldo Sabbatini , 2014
-# Michael Moroni , 2013
+# Mara Monstro , 2018
+# Michael Moroni , 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2014-12-23 17:31+\n"
-"Last-Translator: Leopoldo Sabbatini \n"
-"Language-Team: Esperanto 
(http://www.transifex.com/projects/p/torproject/language/eo/)\n"
+"PO-Revision-Date: 2018-08-29 17:26+\n"
+"Last-Translator: Mara Monstro \n"
+"Language-Team: Esperanto 
(http://www.transifex.com/otf/torproject/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,8 +30,8 @@ msgid ""
 "the Internet anonymously."
 msgstr "Bonvolu iri al la https://www.torproject.org/\;>paĝaro de 
Tor por pli da informo pri sekura uzado de Tor. Vi nun povos retumi 
anonime."
 
-msgid "There is a security update available for the Tor Browser Bundle."
-msgstr "Haveblas sekureca ĝisdatigo por la retesplorila pako de Tor."
+msgid "There is a security update available for Tor Browser."
+msgstr "Haveblas sekureca ĝisdatigo por la retesplorilo de Tor."
 
 msgid ""
 "https://www.torproject.org/download/download-easy.html\;>Click "
@@ -96,5 +97,11 @@ msgstr "JavaScript estas aktiva"
 msgid "JavaScript is disabled."
 msgstr "JavaScript estas malaktiva"
 
-msgid "However, it does not appear to be the Tor Browser Bundle."
-msgstr "Tamen, ŝajnas ke vi ne uzas Tor Browser Bundle."
+msgid "However, it does not appear to be Tor Browser."
+msgstr "Tamen ŝajnas, ke ĝi ne estas la retesplorilo de Tor."
+
+msgid "Run a Relay"
+msgstr "Funkciigi plusendilon"
+
+msgid "Stay Anonymous"
+msgstr "Resti sennoma"

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

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

2018-08-29 Thread translation 
commit 43fdef26a9afa09c522df3ed9b8e915828c3a38b
Author: Translation commit bot 
Date:   Wed Aug 29 17:48:24 2018 +

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

diff --git a/eo/torcheck.po b/eo/torcheck.po
index 46869e72a..6b6f60478 100644
--- a/eo/torcheck.po
+++ b/eo/torcheck.po
@@ -5,13 +5,14 @@
 # Chris Kerr , 2013
 # Eduardo Trápani , 2014
 # Leopoldo Sabbatini , 2014
+# Mara Monstro , 2018
 # Michael Moroni , 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2017-09-19 10:35+\n"
-"Last-Translator: runasand \n"
+"PO-Revision-Date: 2018-08-29 17:26+\n"
+"Last-Translator: Mara Monstro \n"
 "Language-Team: Esperanto 
(http://www.transifex.com/otf/torproject/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +31,7 @@ msgid ""
 msgstr "Bonvolu iri al la https://www.torproject.org/\;>paĝaro de 
Tor por pli da informo pri sekura uzado de Tor. Vi nun povos retumi 
anonime."
 
 msgid "There is a security update available for Tor Browser."
-msgstr ""
+msgstr "Haveblas sekureca ĝisdatigo por la retesplorilo de Tor."
 
 msgid ""
 "https://www.torproject.org/download/download-easy.html\;>Click "
@@ -97,10 +98,10 @@ msgid "JavaScript is disabled."
 msgstr "JavaScript estas malaktiva"
 
 msgid "However, it does not appear to be Tor Browser."
-msgstr ""
+msgstr "Tamen ŝajnas, ke ĝi ne estas la retesplorilo de Tor."
 
 msgid "Run a Relay"
-msgstr ""
+msgstr "Funkciigi plusendilon"
 
 msgid "Stay Anonymous"
-msgstr ""
+msgstr "Resti sennoma"

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

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

2018-08-29 Thread translation 
commit 24779d1f8b966122d2785ae19dd063ccb1561a5d
Author: Translation commit bot 
Date:   Wed Aug 29 17:47:23 2018 +

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

diff --git a/el/el.po b/el/el.po
index e1c8f68a9..b7736f3cf 100644
--- a/el/el.po
+++ b/el/el.po
@@ -10,7 +10,7 @@
 # Sofia K., 2016
 # ilias_ , 2016
 # Adrian Pappas , 2017
-# Michael T. , 2017
+# A Papac , 2017
 # 49b67765f7beecf7587147363d590d62, 2017
 # Evgenios Kostis , 2017
 # Elektra M. , 2017
@@ -58,7 +58,7 @@ msgid ""
 " will not be able to track your internet activity, including the names and "
 "addresses of the websites you visit."
 msgstr ""
-"Ο παροχέας δικτύου σου, και οποιοσδήποτε 
άλλος που παρακολουθεί τοπικά την "
+"Ο πάροχος δικτύου σου, και οποιοσδήποτε 
άλλος που παρακολουθεί τοπικά την "
 "σύνδεσή σου, δεν θα μπορεί να ανιχνέυσει 
την δικτυακή σου δραστηριότητα, "
 "συμπεριλαμβανομένων των ονομάτων και διευ
θύνσεων των ιστοσελίδων που "
 "επισκέπτεσαι."

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

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

2018-08-29 Thread translation 
commit 1ae46e183290b9b620b74651dd935b8a6038895d
Author: Translation commit bot 
Date:   Wed Aug 29 17:46:27 2018 +

Update translations for tails-openpgp-applet
---
 eo/openpgp-applet.pot | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/eo/openpgp-applet.pot b/eo/openpgp-applet.pot
index bb8fff5cf..3563c0fec 100644
--- a/eo/openpgp-applet.pot
+++ b/eo/openpgp-applet.pot
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the OpenPGP_Applet 
package.
 # 
 # Translators:
+# Mara Monstro , 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2015-11-23 02:23+\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2018-08-29 17:38+\n"
+"Last-Translator: Mara Monstro \n"
 "Language-Team: Esperanto 
(http://www.transifex.com/otf/torproject/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: bin/openpgp-applet:160
 msgid "You are about to exit OpenPGP Applet. Are you sure?"
-msgstr ""
+msgstr "Vi estas elironta OpenPGP. Ĉu vi certas?"
 
 #: bin/openpgp-applet:172
 msgid "OpenPGP encryption applet"
@@ -51,7 +52,7 @@ msgstr "_Administri ŝlosilojn"
 
 #: bin/openpgp-applet:248
 msgid "_Open Text Editor"
-msgstr ""
+msgstr "_Malfermi tekstredaktilon"
 
 #: bin/openpgp-applet:292
 msgid "The clipboard does not contain valid input data."
@@ -63,7 +64,7 @@ msgstr "Nekonata fido"
 
 #: bin/openpgp-applet:343
 msgid "Marginal Trust"
-msgstr ""
+msgstr "Bagatela fido"
 
 #: bin/openpgp-applet:345
 msgid "Full Trust"
@@ -71,7 +72,7 @@ msgstr "Plena fido"
 
 #: bin/openpgp-applet:347
 msgid "Ultimate Trust"
-msgstr ""
+msgstr "Plejaltgrada fido"
 
 #: bin/openpgp-applet:400
 msgid "Name"

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

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

2018-08-29 Thread translation 
commit cca2d82133c971f764cba39a3eba40b027b30867
Author: Translation commit bot 
Date:   Wed Aug 29 17:45:15 2018 +

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

diff --git a/eo/LC_MESSAGES/bridgedb.po b/eo/LC_MESSAGES/bridgedb.po
index 2e0fbbf8e..3f284e32e 100644
--- a/eo/LC_MESSAGES/bridgedb.po
+++ b/eo/LC_MESSAGES/bridgedb.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # identity, 2012
+# Mara Monstro , 2018
 # Rico Chan , 2014
 # trio , 2011
 msgid ""
@@ -11,8 +12,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2018-04-12 18:54+\n"
-"Last-Translator: Marcus Griep \n"
+"PO-Revision-Date: 2018-08-29 17:31+\n"
+"Last-Translator: Mara Monstro \n"
 "Language-Team: Esperanto 
(http://www.transifex.com/otf/torproject/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,7 +55,7 @@ msgstr "kontakto"
 
 #: bridgedb/https/templates/bridges.html:35
 msgid "Select All"
-msgstr ""
+msgstr "elekti ĉion"
 
 #: bridgedb/https/templates/bridges.html:40
 msgid "Show QRCode"
@@ -331,7 +332,7 @@ msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr ""
+msgstr "Por enigi retpontojn en Tor Browser, unue iru al la %s elŝuta paĝo 
de Tor Browser %s kaj poste sekvu la instruojn tie por elŝuti kaj startigi Tor 
Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:151

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

[tor-commits] [translation-tools/master] remove deleted component. ref #27384

2018-08-29 Thread emmapeel 
commit 7d975d9a0b11ea0c039879258d0662f00692fdb1
Author: emma peel 
Date:   Wed Aug 29 15:28:16 2018 +

remove deleted component. ref #27384
---
 config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config b/config
index 97ee9cc..223804d 100644
--- a/config
+++ b/config
@@ -29,7 +29,6 @@ torbutton-branddtd torbutton-branddtd_completed
 torbutton-torbuttonproperties torbutton-torbuttonproperties_completed
 torbutton-torbuttondtd torbutton-torbuttondtd_completed
 torbutton-aboutdialogdtd torbutton-aboutdialogdtd_completed
-torbutton-abouttorproperties torbutton-abouttorproperties_completed
 torbutton-abouttbupdatedtd torbutton-abouttbupdatedtd_completed
 torbutton-browseronboardingproperties 
torbutton-browseronboardingproperties_completed
 torcheck torcheck_completed

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

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

2018-08-29 Thread translation 
commit 52a0d56e1a52a5d2a1fd16d02d0596d6e3b84c98
Author: Translation commit bot 
Date:   Wed Aug 29 15:18:37 2018 +

Update translations for torcheck_completed
---
 hi/torcheck.po | 73 --
 1 file changed, 61 insertions(+), 12 deletions(-)

diff --git a/hi/torcheck.po b/hi/torcheck.po
index ed354a877..fcae361f3 100644
--- a/hi/torcheck.po
+++ b/hi/torcheck.po
@@ -1,17 +1,19 @@
 # TorCheck gettext template
-# Copyright (C) 2008-2012 The Tor Project, Inc
+# Copyright (C) 2008-2013 The Tor Project, Inc
 # 
 # Translators:
-# meghana , 2013
-# inoui.im , 2013
-# ubaid , 2012
+# Aayush M , 2018
+# Bineet kumar gaur , 2014
+# Meghana S , 2013
+# Tabish Faiyaz , 2013
+# ubaid buchh , 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2013-11-06 09:10+\n"
-"Last-Translator: runasand \n"
-"Language-Team: Hindi 
(http://www.transifex.com/projects/p/torproject/language/hi/)\n"
+"PO-Revision-Date: 2018-08-29 15:00+\n"
+"Last-Translator: Aayush M \n"
+"Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,8 +21,8 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Congratulations. Your browser is configured to use Tor."
-msgstr "बधाई हो.आपका ब्राउज़र टॉर 
का उपयोग करने के लिए 
कॉन्फ़िगर है."
+msgid "Congratulations. This browser is configured to use Tor."
+msgstr "बाधाई हो। यह ब्रौसेर तोर 
के उपयोग के लिये कॉन्फ़िगर 
हैं।"
 
 msgid ""
 "Please refer to the https://www.torproject.org/\;>Tor website "
@@ -28,8 +30,8 @@ msgid ""
 "the Internet anonymously."
 msgstr "टोर का सुरक्षित रूप से 
उपयोग करने के लिये और अधिक 
जानकारी के लिए  https://www.torproject.org/\;>Tor website  पर जाएँ। अ
ब आप गुमनाम रूप से इंटरनेट 
ब्राउज़ कर सकते हैं।"
 
-msgid "There is a security update available for the Tor Browser Bundle."
-msgstr "टोर ब्राउज़र बंडल के लिए 
एक सुरक्षा अद्यतन उपलब्ध है।"
+msgid "There is a security update available for Tor Browser."
+msgstr "टोर ब्राउज़र के लिए एक 
सुरक्षा अद्यतन उपलब्ध है।"
 
 msgid ""
 "https://www.torproject.org/download/download-easy.html\;>Click "
@@ -37,7 +39,7 @@ msgid ""
 msgstr "https://www.torproject.org/download/download-easy.html\;>डाउनलोड
 पृष्ठ पर जाने के लिए यहां 
क्लिक करें"
 
 msgid "Sorry. You are not using Tor."
-msgstr "आप के कंप्यूटर पर टोर 
संस्थापित नहीं है ।"
+msgstr "खेद है। आप  टोर का उपयोग 
नहीं कर रहे हैं ।"
 
 msgid ""
 "If you are attempting to use a Tor client, please refer to the ___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2018-08-29 Thread translation 
commit c8f9a1e7a0c345d99908fd48812dd4e867e8d756
Author: Translation commit bot 
Date:   Wed Aug 29 15:18:32 2018 +

Update translations for torcheck
---
 hi/torcheck.po | 31 ---
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/hi/torcheck.po b/hi/torcheck.po
index 1dcea83f0..fcae361f3 100644
--- a/hi/torcheck.po
+++ b/hi/torcheck.po
@@ -2,6 +2,7 @@
 # Copyright (C) 2008-2013 The Tor Project, Inc
 # 
 # Translators:
+# Aayush M , 2018
 # Bineet kumar gaur , 2014
 # Meghana S , 2013
 # Tabish Faiyaz , 2013
@@ -10,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2017-09-19 09:16+\n"
-"Last-Translator: runasand \n"
+"PO-Revision-Date: 2018-08-29 15:00+\n"
+"Last-Translator: Aayush M \n"
 "Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +31,7 @@ msgid ""
 msgstr "टोर का सुरक्षित रूप से 
उपयोग करने के लिये और अधिक 
जानकारी के लिए  https://www.torproject.org/\;>Tor website  पर जाएँ। अ
ब आप गुमनाम रूप से इंटरनेट 
ब्राउज़ कर सकते हैं।"
 
 msgid "There is a security update available for Tor Browser."
-msgstr ""
+msgstr "टोर ब्राउज़र के लिए एक 
सुरक्षा अद्यतन उपलब्ध है।"
 
 msgid ""
 "https://www.torproject.org/download/download-easy.html\;>Click "
@@ -70,37 +71,37 @@ msgstr "एग्ज़ित रिले के बारे 
में अधि
 msgid ""
 "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, "
 "development, and education of online anonymity and privacy."
-msgstr ""
+msgstr "टोर प्रोजेक्ट एक यूएस 501 (सी) 
(3) गैर-लाभकारी है जो ऑनलाइन 
नामांकन और गोपनीयता के अ
नुसंधान, विकास और शिक्षा के 
लिए समर्पित है।"
 
 msgid "Learn More "
-msgstr ""
+msgstr "और अधिक जानें "
 
 msgid "Go"
-msgstr ""
+msgstr "आगे बढ़ो"
 
 msgid "Short User Manual"
-msgstr ""
+msgstr "लघु उपयोगकर्ता मैनुअल"
 
 msgid "Donate to Support Tor"
-msgstr ""
+msgstr "टोर का समर्थन करने के लिए 
दान करें"
 
 msgid "Tor Q Site"
-msgstr ""
+msgstr "टोर प्रश्न और उत्तर साइट"
 
 msgid "Volunteer"
-msgstr ""
+msgstr "स्वयंसेवक"
 
 msgid "JavaScript is enabled."
-msgstr ""
+msgstr "जावास्क्रिप्ट सक्षम है।"
 
 msgid "JavaScript is disabled."
-msgstr ""
+msgstr "जावास्क्रिप्ट अक्षम है।"
 
 msgid "However, it does not appear to be Tor Browser."
-msgstr ""
+msgstr "हालांकि, यह टोर ब्राउज़र 
प्रतीत नहीं होता है।"
 
 msgid "Run a Relay"
-msgstr ""
+msgstr "एक रिले चलाएं"
 
 msgid "Stay Anonymous"
-msgstr ""
+msgstr "अनामिक रहें "

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

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

2018-08-29 Thread translation 
commit d580c330c89bf4859462f01f93106e35f1da2ce1
Author: Translation commit bot 
Date:   Wed Aug 29 15:18:15 2018 +

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

diff --git a/hi/abouttbupdate.dtd b/hi/abouttbupdate.dtd
index f7b3f2ed8..e9015925a 100644
--- a/hi/abouttbupdate.dtd
+++ b/hi/abouttbupdate.dtd
@@ -1,10 +1,10 @@
-
-
-
-
+
+
+
+
 
-
+
 
-
-
-
+
+
+

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

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

2018-08-29 Thread translation 
commit 964b01d7ddef28a26c9f6c97a485fd1dc48df8b6
Author: Translation commit bot 
Date:   Wed Aug 29 15:18:20 2018 +

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

diff --git a/hi/abouttbupdate.dtd b/hi/abouttbupdate.dtd
new file mode 100644
index 0..e9015925a
--- /dev/null
+++ b/hi/abouttbupdate.dtd
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+

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

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

2018-08-29 Thread translation 
commit ca352d8d31a3da9f5c623b0889d49073e3837be0
Author: Translation commit bot 
Date:   Wed Aug 29 15:17:41 2018 +

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

diff --git a/hi/brand.dtd b/hi/brand.dtd
new file mode 100644
index 0..94924ea37
--- /dev/null
+++ b/hi/brand.dtd
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+

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

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

2018-08-29 Thread nickm 
commit a28c14aad547fd1b254bdbf2acc1ff2b67551a96
Merge: 64c3c6a79 b40f9967f
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc Makefile.am
index 08cb8e3e7,34493765d..dcb445c97
--- a/Makefile.am
+++ b/Makefile.am
@@@ -118,19 -118,18 +118,20 @@@ test-network: need-chutney-path $(TESTI
  
  # Run all available tests using automake's test-driver
  # only run IPv6 tests if we can ping6 ::1 (localhost)
 +# only run IPv6 tests if we can ping ::1 (localhost)
  # some IPv6 tests will fail without an IPv6 DNS server (see #16971 and #17011)
  # only run mixed tests if we have a tor-stable binary
 -# Try both the BSD and the Linux ping6 syntax, because they're incompatible
 +# Try the syntax for BSD ping6, Linux ping6, and Linux ping -6,
 +# because they're incompatible
  test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
mkdir -p $(TEST_NETWORK_ALL_LOG_DIR)
+   rm -f $(TEST_NETWORK_ALL_LOG_DIR)/*.log 
$(TEST_NETWORK_ALL_LOG_DIR)/*.trs
@flavors="$(TEST_CHUTNEY_FLAVORS)"; \
 -  if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1; then \
 -  echo "ping6 ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
 +  if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1 || ping -6 -c 1 -W 1 ::1 >/dev/null 2>&1; then \
 +  echo "ping6 ::1 or ping ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
flavors="$$flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \
else \
 -  echo "ping6 ::1 failed, skipping IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
 +  echo "ping6 ::1 and ping ::1 failed, skipping IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
skip_flavors="$$skip_flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \
fi; \
if command -v tor-stable >/dev/null 2>&1; then \



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

[tor-commits] [tor/release-0.3.4] Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am

2018-08-29 Thread nickm 
commit 3e298633ca212447b4a230b970a293ce694ed3bb
Author: teor 
Date:   Fri Aug 24 10:20:30 2018 +1000

Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am

Part of 27295.
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index f06d0e373..b19a4bf96 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -128,7 +128,7 @@ test-network-all: need-chutney-path test-driver 
$(TESTING_TOR_BINARY) src/tools/
$(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) 
$(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
done; \
echo "Log and result files are available in 
$(TEST_NETWORK_ALL_LOG_DIR)."; \
-   ! grep -q FAIL test_network_log/*.trs
+   ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
 
 need-stem-path:
@if test ! -d "$$STEM_SOURCE_DIR"; then \



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

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

2018-08-29 Thread nickm 
commit bd1302a37fea363ab6e85054604830b4cf00d4cf
Merge: 4acfc8d4b b40f9967f
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

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

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

2018-08-29 Thread nickm 
commit a28c14aad547fd1b254bdbf2acc1ff2b67551a96
Merge: 64c3c6a79 b40f9967f
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc Makefile.am
index 08cb8e3e7,34493765d..dcb445c97
--- a/Makefile.am
+++ b/Makefile.am
@@@ -118,19 -118,18 +118,20 @@@ test-network: need-chutney-path $(TESTI
  
  # Run all available tests using automake's test-driver
  # only run IPv6 tests if we can ping6 ::1 (localhost)
 +# only run IPv6 tests if we can ping ::1 (localhost)
  # some IPv6 tests will fail without an IPv6 DNS server (see #16971 and #17011)
  # only run mixed tests if we have a tor-stable binary
 -# Try both the BSD and the Linux ping6 syntax, because they're incompatible
 +# Try the syntax for BSD ping6, Linux ping6, and Linux ping -6,
 +# because they're incompatible
  test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
mkdir -p $(TEST_NETWORK_ALL_LOG_DIR)
+   rm -f $(TEST_NETWORK_ALL_LOG_DIR)/*.log 
$(TEST_NETWORK_ALL_LOG_DIR)/*.trs
@flavors="$(TEST_CHUTNEY_FLAVORS)"; \
 -  if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1; then \
 -  echo "ping6 ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
 +  if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1 || ping -6 -c 1 -W 1 ::1 >/dev/null 2>&1; then \
 +  echo "ping6 ::1 or ping ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
flavors="$$flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \
else \
 -  echo "ping6 ::1 failed, skipping IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
 +  echo "ping6 ::1 and ping ::1 failed, skipping IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
skip_flavors="$$skip_flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \
fi; \
if command -v tor-stable >/dev/null 2>&1; then \



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

[tor-commits] [tor/release-0.3.3] Test: avoid spurious failures in make test-network-all

2018-08-29 Thread nickm 
commit 541b89b061455a167e73e6fc61e9df7ee82f4525
Author: teor 
Date:   Fri Aug 24 10:25:25 2018 +1000

Test: avoid spurious failures in make test-network-all

Before running make test-network-all, delete old logs and test result
files, to avoid spurious failures.

Fixes bug 27295; bugfix on 0.2.7.3-rc.
---
 Makefile.am  | 1 +
 changes/bug27295 | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index b19a4bf96..e4be3f26f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,6 +106,7 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
 # Try both the BSD and the Linux ping6 syntax, because they're incompatible
 test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
mkdir -p $(TEST_NETWORK_ALL_LOG_DIR)
+   rm -f $(TEST_NETWORK_ALL_LOG_DIR)/*.log 
$(TEST_NETWORK_ALL_LOG_DIR)/*.trs
@flavors="$(TEST_CHUTNEY_FLAVORS)"; \
if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1; then \
echo "ping6 ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
diff --git a/changes/bug27295 b/changes/bug27295
new file mode 100644
index 0..c5a364877
--- /dev/null
+++ b/changes/bug27295
@@ -0,0 +1,3 @@
+  o Minor bugfixes (testing, chutney):
+- Before running make test-network-all, delete old logs and test result
+  files, to avoid spurious failures. Fixes bug 27295; bugfix on 0.2.7.3-rc.



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

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

2018-08-29 Thread nickm 
commit c41944d06aaba7899ff3e2bb1a97f859e849d2eb
Merge: a7a900685 0ea622aa3
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

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

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

2018-08-29 Thread nickm 
commit 0ea622aa3a678f19759a42e9521a259ef4bcf5a4
Merge: 0483f7f64 a28c14aad
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)




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

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

2018-08-29 Thread translation 
commit 34ec4f536f46cf410079d267c2b98db646f5113c
Author: Translation commit bot 
Date:   Wed Aug 29 15:17:36 2018 +

Update translations for torbutton-branddtd
---
 hi/brand.dtd | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hi/brand.dtd b/hi/brand.dtd
index af9fd6935..94924ea37 100644
--- a/hi/brand.dtd
+++ b/hi/brand.dtd
@@ -6,10 +6,10 @@
 
 
 
-
+
 
 
-
-
-
-
+
+
+
+

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

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

2018-08-29 Thread nickm 
commit b40f9967fa31faa1dcf1a977989e235fbe836015
Merge: 70a07fa90 541b89b06
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc Makefile.am
index 4d2d9d222,e4be3f26f..34493765d
--- a/Makefile.am
+++ b/Makefile.am
@@@ -143,10 -127,9 +144,10 @@@ test-network-all: need-chutney-path tes
done; \
for f in $$flavors; do \
$(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) 
$(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
 +  $(top_srcdir)/src/test/test-network.sh 
$(TEST_NETWORK_WARNING_FLAGS); \
done; \
echo "Log and result files are available in 
$(TEST_NETWORK_ALL_LOG_DIR)."; \
-   ! grep -q FAIL test_network_log/*.trs
+   ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
  
  need-stem-path:
@if test ! -d "$$STEM_SOURCE_DIR"; then \



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

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

2018-08-29 Thread nickm 
commit 6b3b59ad7cc4596f57fa73e1a0355f6e937bd516
Merge: 71f84c93b a28c14aad
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/release-0.3.2] Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am

2018-08-29 Thread nickm 
commit 3e298633ca212447b4a230b970a293ce694ed3bb
Author: teor 
Date:   Fri Aug 24 10:20:30 2018 +1000

Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am

Part of 27295.
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index f06d0e373..b19a4bf96 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -128,7 +128,7 @@ test-network-all: need-chutney-path test-driver 
$(TESTING_TOR_BINARY) src/tools/
$(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) 
$(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
done; \
echo "Log and result files are available in 
$(TEST_NETWORK_ALL_LOG_DIR)."; \
-   ! grep -q FAIL test_network_log/*.trs
+   ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
 
 need-stem-path:
@if test ! -d "$$STEM_SOURCE_DIR"; then \



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

[tor-commits] [tor/release-0.3.4] Test: avoid spurious failures in make test-network-all

2018-08-29 Thread nickm 
commit 541b89b061455a167e73e6fc61e9df7ee82f4525
Author: teor 
Date:   Fri Aug 24 10:25:25 2018 +1000

Test: avoid spurious failures in make test-network-all

Before running make test-network-all, delete old logs and test result
files, to avoid spurious failures.

Fixes bug 27295; bugfix on 0.2.7.3-rc.
---
 Makefile.am  | 1 +
 changes/bug27295 | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index b19a4bf96..e4be3f26f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,6 +106,7 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
 # Try both the BSD and the Linux ping6 syntax, because they're incompatible
 test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
mkdir -p $(TEST_NETWORK_ALL_LOG_DIR)
+   rm -f $(TEST_NETWORK_ALL_LOG_DIR)/*.log 
$(TEST_NETWORK_ALL_LOG_DIR)/*.trs
@flavors="$(TEST_CHUTNEY_FLAVORS)"; \
if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1; then \
echo "ping6 ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
diff --git a/changes/bug27295 b/changes/bug27295
new file mode 100644
index 0..c5a364877
--- /dev/null
+++ b/changes/bug27295
@@ -0,0 +1,3 @@
+  o Minor bugfixes (testing, chutney):
+- Before running make test-network-all, delete old logs and test result
+  files, to avoid spurious failures. Fixes bug 27295; bugfix on 0.2.7.3-rc.



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

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

2018-08-29 Thread nickm 
commit 5b072fd46982291cede10781f4aa0710d14d827d
Merge: 060f6f607 541b89b06
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/release-0.2.9] Test: avoid spurious failures in make test-network-all

2018-08-29 Thread nickm 
commit 541b89b061455a167e73e6fc61e9df7ee82f4525
Author: teor 
Date:   Fri Aug 24 10:25:25 2018 +1000

Test: avoid spurious failures in make test-network-all

Before running make test-network-all, delete old logs and test result
files, to avoid spurious failures.

Fixes bug 27295; bugfix on 0.2.7.3-rc.
---
 Makefile.am  | 1 +
 changes/bug27295 | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index b19a4bf96..e4be3f26f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,6 +106,7 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
 # Try both the BSD and the Linux ping6 syntax, because they're incompatible
 test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
mkdir -p $(TEST_NETWORK_ALL_LOG_DIR)
+   rm -f $(TEST_NETWORK_ALL_LOG_DIR)/*.log 
$(TEST_NETWORK_ALL_LOG_DIR)/*.trs
@flavors="$(TEST_CHUTNEY_FLAVORS)"; \
if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1; then \
echo "ping6 ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
diff --git a/changes/bug27295 b/changes/bug27295
new file mode 100644
index 0..c5a364877
--- /dev/null
+++ b/changes/bug27295
@@ -0,0 +1,3 @@
+  o Minor bugfixes (testing, chutney):
+- Before running make test-network-all, delete old logs and test result
+  files, to avoid spurious failures. Fixes bug 27295; bugfix on 0.2.7.3-rc.



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

[tor-commits] [tor/release-0.3.3] Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am

2018-08-29 Thread nickm 
commit 3e298633ca212447b4a230b970a293ce694ed3bb
Author: teor 
Date:   Fri Aug 24 10:20:30 2018 +1000

Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am

Part of 27295.
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index f06d0e373..b19a4bf96 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -128,7 +128,7 @@ test-network-all: need-chutney-path test-driver 
$(TESTING_TOR_BINARY) src/tools/
$(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) 
$(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
done; \
echo "Log and result files are available in 
$(TEST_NETWORK_ALL_LOG_DIR)."; \
-   ! grep -q FAIL test_network_log/*.trs
+   ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
 
 need-stem-path:
@if test ! -d "$$STEM_SOURCE_DIR"; then \



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

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

2018-08-29 Thread nickm 
commit b40f9967fa31faa1dcf1a977989e235fbe836015
Merge: 70a07fa90 541b89b06
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc Makefile.am
index 4d2d9d222,e4be3f26f..34493765d
--- a/Makefile.am
+++ b/Makefile.am
@@@ -143,10 -127,9 +144,10 @@@ test-network-all: need-chutney-path tes
done; \
for f in $$flavors; do \
$(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) 
$(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
 +  $(top_srcdir)/src/test/test-network.sh 
$(TEST_NETWORK_WARNING_FLAGS); \
done; \
echo "Log and result files are available in 
$(TEST_NETWORK_ALL_LOG_DIR)."; \
-   ! grep -q FAIL test_network_log/*.trs
+   ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
  
  need-stem-path:
@if test ! -d "$$STEM_SOURCE_DIR"; then \



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

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

2018-08-29 Thread nickm 
commit b40f9967fa31faa1dcf1a977989e235fbe836015
Merge: 70a07fa90 541b89b06
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc Makefile.am
index 4d2d9d222,e4be3f26f..34493765d
--- a/Makefile.am
+++ b/Makefile.am
@@@ -143,10 -127,9 +144,10 @@@ test-network-all: need-chutney-path tes
done; \
for f in $$flavors; do \
$(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) 
$(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
 +  $(top_srcdir)/src/test/test-network.sh 
$(TEST_NETWORK_WARNING_FLAGS); \
done; \
echo "Log and result files are available in 
$(TEST_NETWORK_ALL_LOG_DIR)."; \
-   ! grep -q FAIL test_network_log/*.trs
+   ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
  
  need-stem-path:
@if test ! -d "$$STEM_SOURCE_DIR"; then \



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

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

2018-08-29 Thread nickm 
commit a28c14aad547fd1b254bdbf2acc1ff2b67551a96
Merge: 64c3c6a79 b40f9967f
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc Makefile.am
index 08cb8e3e7,34493765d..dcb445c97
--- a/Makefile.am
+++ b/Makefile.am
@@@ -118,19 -118,18 +118,20 @@@ test-network: need-chutney-path $(TESTI
  
  # Run all available tests using automake's test-driver
  # only run IPv6 tests if we can ping6 ::1 (localhost)
 +# only run IPv6 tests if we can ping ::1 (localhost)
  # some IPv6 tests will fail without an IPv6 DNS server (see #16971 and #17011)
  # only run mixed tests if we have a tor-stable binary
 -# Try both the BSD and the Linux ping6 syntax, because they're incompatible
 +# Try the syntax for BSD ping6, Linux ping6, and Linux ping -6,
 +# because they're incompatible
  test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
mkdir -p $(TEST_NETWORK_ALL_LOG_DIR)
+   rm -f $(TEST_NETWORK_ALL_LOG_DIR)/*.log 
$(TEST_NETWORK_ALL_LOG_DIR)/*.trs
@flavors="$(TEST_CHUTNEY_FLAVORS)"; \
 -  if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1; then \
 -  echo "ping6 ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
 +  if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1 || ping -6 -c 1 -W 1 ::1 >/dev/null 2>&1; then \
 +  echo "ping6 ::1 or ping ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
flavors="$$flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \
else \
 -  echo "ping6 ::1 failed, skipping IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
 +  echo "ping6 ::1 and ping ::1 failed, skipping IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
skip_flavors="$$skip_flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \
fi; \
if command -v tor-stable >/dev/null 2>&1; then \



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

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

2018-08-29 Thread nickm 
commit 0ea622aa3a678f19759a42e9521a259ef4bcf5a4
Merge: 0483f7f64 a28c14aad
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)




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

[tor-commits] [tor/release-0.3.2] Test: avoid spurious failures in make test-network-all

2018-08-29 Thread nickm 
commit 541b89b061455a167e73e6fc61e9df7ee82f4525
Author: teor 
Date:   Fri Aug 24 10:25:25 2018 +1000

Test: avoid spurious failures in make test-network-all

Before running make test-network-all, delete old logs and test result
files, to avoid spurious failures.

Fixes bug 27295; bugfix on 0.2.7.3-rc.
---
 Makefile.am  | 1 +
 changes/bug27295 | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index b19a4bf96..e4be3f26f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,6 +106,7 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
 # Try both the BSD and the Linux ping6 syntax, because they're incompatible
 test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
mkdir -p $(TEST_NETWORK_ALL_LOG_DIR)
+   rm -f $(TEST_NETWORK_ALL_LOG_DIR)/*.log 
$(TEST_NETWORK_ALL_LOG_DIR)/*.trs
@flavors="$(TEST_CHUTNEY_FLAVORS)"; \
if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1; then \
echo "ping6 ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
diff --git a/changes/bug27295 b/changes/bug27295
new file mode 100644
index 0..c5a364877
--- /dev/null
+++ b/changes/bug27295
@@ -0,0 +1,3 @@
+  o Minor bugfixes (testing, chutney):
+- Before running make test-network-all, delete old logs and test result
+  files, to avoid spurious failures. Fixes bug 27295; bugfix on 0.2.7.3-rc.



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

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

2018-08-29 Thread nickm 
commit 810152b20f6d773172e1f28ab72a1d4b2fda2d82
Merge: 3d7a705d3 0ea622aa3
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.3.4'

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/release-0.2.9] Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am

2018-08-29 Thread nickm 
commit 3e298633ca212447b4a230b970a293ce694ed3bb
Author: teor 
Date:   Fri Aug 24 10:20:30 2018 +1000

Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am

Part of 27295.
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index f06d0e373..b19a4bf96 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -128,7 +128,7 @@ test-network-all: need-chutney-path test-driver 
$(TESTING_TOR_BINARY) src/tools/
$(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) 
$(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
done; \
echo "Log and result files are available in 
$(TEST_NETWORK_ALL_LOG_DIR)."; \
-   ! grep -q FAIL test_network_log/*.trs
+   ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
 
 need-stem-path:
@if test ! -d "$$STEM_SOURCE_DIR"; then \



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

[tor-commits] [tor/maint-0.3.4] Test: avoid spurious failures in make test-network-all

2018-08-29 Thread nickm 
commit 541b89b061455a167e73e6fc61e9df7ee82f4525
Author: teor 
Date:   Fri Aug 24 10:25:25 2018 +1000

Test: avoid spurious failures in make test-network-all

Before running make test-network-all, delete old logs and test result
files, to avoid spurious failures.

Fixes bug 27295; bugfix on 0.2.7.3-rc.
---
 Makefile.am  | 1 +
 changes/bug27295 | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index b19a4bf96..e4be3f26f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,6 +106,7 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
 # Try both the BSD and the Linux ping6 syntax, because they're incompatible
 test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
mkdir -p $(TEST_NETWORK_ALL_LOG_DIR)
+   rm -f $(TEST_NETWORK_ALL_LOG_DIR)/*.log 
$(TEST_NETWORK_ALL_LOG_DIR)/*.trs
@flavors="$(TEST_CHUTNEY_FLAVORS)"; \
if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1; then \
echo "ping6 ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
diff --git a/changes/bug27295 b/changes/bug27295
new file mode 100644
index 0..c5a364877
--- /dev/null
+++ b/changes/bug27295
@@ -0,0 +1,3 @@
+  o Minor bugfixes (testing, chutney):
+- Before running make test-network-all, delete old logs and test result
+  files, to avoid spurious failures. Fixes bug 27295; bugfix on 0.2.7.3-rc.



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

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

2018-08-29 Thread nickm 
commit a28c14aad547fd1b254bdbf2acc1ff2b67551a96
Merge: 64c3c6a79 b40f9967f
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc Makefile.am
index 08cb8e3e7,34493765d..dcb445c97
--- a/Makefile.am
+++ b/Makefile.am
@@@ -118,19 -118,18 +118,20 @@@ test-network: need-chutney-path $(TESTI
  
  # Run all available tests using automake's test-driver
  # only run IPv6 tests if we can ping6 ::1 (localhost)
 +# only run IPv6 tests if we can ping ::1 (localhost)
  # some IPv6 tests will fail without an IPv6 DNS server (see #16971 and #17011)
  # only run mixed tests if we have a tor-stable binary
 -# Try both the BSD and the Linux ping6 syntax, because they're incompatible
 +# Try the syntax for BSD ping6, Linux ping6, and Linux ping -6,
 +# because they're incompatible
  test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
mkdir -p $(TEST_NETWORK_ALL_LOG_DIR)
+   rm -f $(TEST_NETWORK_ALL_LOG_DIR)/*.log 
$(TEST_NETWORK_ALL_LOG_DIR)/*.trs
@flavors="$(TEST_CHUTNEY_FLAVORS)"; \
 -  if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1; then \
 -  echo "ping6 ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
 +  if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1 || ping -6 -c 1 -W 1 ::1 >/dev/null 2>&1; then \
 +  echo "ping6 ::1 or ping ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
flavors="$$flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \
else \
 -  echo "ping6 ::1 failed, skipping IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
 +  echo "ping6 ::1 and ping ::1 failed, skipping IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
skip_flavors="$$skip_flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \
fi; \
if command -v tor-stable >/dev/null 2>&1; then \

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

[tor-commits] [tor/maint-0.3.3] Test: avoid spurious failures in make test-network-all

2018-08-29 Thread nickm 
commit 541b89b061455a167e73e6fc61e9df7ee82f4525
Author: teor 
Date:   Fri Aug 24 10:25:25 2018 +1000

Test: avoid spurious failures in make test-network-all

Before running make test-network-all, delete old logs and test result
files, to avoid spurious failures.

Fixes bug 27295; bugfix on 0.2.7.3-rc.
---
 Makefile.am  | 1 +
 changes/bug27295 | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index b19a4bf96..e4be3f26f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,6 +106,7 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
 # Try both the BSD and the Linux ping6 syntax, because they're incompatible
 test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
mkdir -p $(TEST_NETWORK_ALL_LOG_DIR)
+   rm -f $(TEST_NETWORK_ALL_LOG_DIR)/*.log 
$(TEST_NETWORK_ALL_LOG_DIR)/*.trs
@flavors="$(TEST_CHUTNEY_FLAVORS)"; \
if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1; then \
echo "ping6 ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
diff --git a/changes/bug27295 b/changes/bug27295
new file mode 100644
index 0..c5a364877
--- /dev/null
+++ b/changes/bug27295
@@ -0,0 +1,3 @@
+  o Minor bugfixes (testing, chutney):
+- Before running make test-network-all, delete old logs and test result
+  files, to avoid spurious failures. Fixes bug 27295; bugfix on 0.2.7.3-rc.



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

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

2018-08-29 Thread nickm 
commit b40f9967fa31faa1dcf1a977989e235fbe836015
Merge: 70a07fa90 541b89b06
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc Makefile.am
index 4d2d9d222,e4be3f26f..34493765d
--- a/Makefile.am
+++ b/Makefile.am
@@@ -143,10 -127,9 +144,10 @@@ test-network-all: need-chutney-path tes
done; \
for f in $$flavors; do \
$(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) 
$(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
 +  $(top_srcdir)/src/test/test-network.sh 
$(TEST_NETWORK_WARNING_FLAGS); \
done; \
echo "Log and result files are available in 
$(TEST_NETWORK_ALL_LOG_DIR)."; \
-   ! grep -q FAIL test_network_log/*.trs
+   ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
  
  need-stem-path:
@if test ! -d "$$STEM_SOURCE_DIR"; then \



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

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

2018-08-29 Thread nickm 
commit a28c14aad547fd1b254bdbf2acc1ff2b67551a96
Merge: 64c3c6a79 b40f9967f
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc Makefile.am
index 08cb8e3e7,34493765d..dcb445c97
--- a/Makefile.am
+++ b/Makefile.am
@@@ -118,19 -118,18 +118,20 @@@ test-network: need-chutney-path $(TESTI
  
  # Run all available tests using automake's test-driver
  # only run IPv6 tests if we can ping6 ::1 (localhost)
 +# only run IPv6 tests if we can ping ::1 (localhost)
  # some IPv6 tests will fail without an IPv6 DNS server (see #16971 and #17011)
  # only run mixed tests if we have a tor-stable binary
 -# Try both the BSD and the Linux ping6 syntax, because they're incompatible
 +# Try the syntax for BSD ping6, Linux ping6, and Linux ping -6,
 +# because they're incompatible
  test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
mkdir -p $(TEST_NETWORK_ALL_LOG_DIR)
+   rm -f $(TEST_NETWORK_ALL_LOG_DIR)/*.log 
$(TEST_NETWORK_ALL_LOG_DIR)/*.trs
@flavors="$(TEST_CHUTNEY_FLAVORS)"; \
 -  if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1; then \
 -  echo "ping6 ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
 +  if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1 || ping -6 -c 1 -W 1 ::1 >/dev/null 2>&1; then \
 +  echo "ping6 ::1 or ping ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
flavors="$$flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \
else \
 -  echo "ping6 ::1 failed, skipping IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
 +  echo "ping6 ::1 and ping ::1 failed, skipping IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
skip_flavors="$$skip_flavors $(TEST_CHUTNEY_FLAVORS_IPV6)"; \
fi; \
if command -v tor-stable >/dev/null 2>&1; then \



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

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

2018-08-29 Thread nickm 
commit b40f9967fa31faa1dcf1a977989e235fbe836015
Merge: 70a07fa90 541b89b06
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc Makefile.am
index 4d2d9d222,e4be3f26f..34493765d
--- a/Makefile.am
+++ b/Makefile.am
@@@ -143,10 -127,9 +144,10 @@@ test-network-all: need-chutney-path tes
done; \
for f in $$flavors; do \
$(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) 
$(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
 +  $(top_srcdir)/src/test/test-network.sh 
$(TEST_NETWORK_WARNING_FLAGS); \
done; \
echo "Log and result files are available in 
$(TEST_NETWORK_ALL_LOG_DIR)."; \
-   ! grep -q FAIL test_network_log/*.trs
+   ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
  
  need-stem-path:
@if test ! -d "$$STEM_SOURCE_DIR"; then \



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

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

2018-08-29 Thread nickm 
commit b40f9967fa31faa1dcf1a977989e235fbe836015
Merge: 70a07fa90 541b89b06
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc Makefile.am
index 4d2d9d222,e4be3f26f..34493765d
--- a/Makefile.am
+++ b/Makefile.am
@@@ -143,10 -127,9 +144,10 @@@ test-network-all: need-chutney-path tes
done; \
for f in $$flavors; do \
$(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) 
$(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
 +  $(top_srcdir)/src/test/test-network.sh 
$(TEST_NETWORK_WARNING_FLAGS); \
done; \
echo "Log and result files are available in 
$(TEST_NETWORK_ALL_LOG_DIR)."; \
-   ! grep -q FAIL test_network_log/*.trs
+   ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
  
  need-stem-path:
@if test ! -d "$$STEM_SOURCE_DIR"; then \



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

[tor-commits] [tor/maint-0.3.3] Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am

2018-08-29 Thread nickm 
commit 3e298633ca212447b4a230b970a293ce694ed3bb
Author: teor 
Date:   Fri Aug 24 10:20:30 2018 +1000

Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am

Part of 27295.
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index f06d0e373..b19a4bf96 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -128,7 +128,7 @@ test-network-all: need-chutney-path test-driver 
$(TESTING_TOR_BINARY) src/tools/
$(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) 
$(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
done; \
echo "Log and result files are available in 
$(TEST_NETWORK_ALL_LOG_DIR)."; \
-   ! grep -q FAIL test_network_log/*.trs
+   ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
 
 need-stem-path:
@if test ! -d "$$STEM_SOURCE_DIR"; then \



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

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

2018-08-29 Thread nickm 
commit 0ea622aa3a678f19759a42e9521a259ef4bcf5a4
Merge: 0483f7f64 a28c14aad
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

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

[tor-commits] [tor/master] Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am

2018-08-29 Thread nickm 
commit 3e298633ca212447b4a230b970a293ce694ed3bb
Author: teor 
Date:   Fri Aug 24 10:20:30 2018 +1000

Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am

Part of 27295.
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index f06d0e373..b19a4bf96 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -128,7 +128,7 @@ test-network-all: need-chutney-path test-driver 
$(TESTING_TOR_BINARY) src/tools/
$(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) 
$(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
done; \
echo "Log and result files are available in 
$(TEST_NETWORK_ALL_LOG_DIR)."; \
-   ! grep -q FAIL test_network_log/*.trs
+   ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
 
 need-stem-path:
@if test ! -d "$$STEM_SOURCE_DIR"; then \



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

[tor-commits] [tor/maint-0.3.4] Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am

2018-08-29 Thread nickm 
commit 3e298633ca212447b4a230b970a293ce694ed3bb
Author: teor 
Date:   Fri Aug 24 10:20:30 2018 +1000

Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am

Part of 27295.
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index f06d0e373..b19a4bf96 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -128,7 +128,7 @@ test-network-all: need-chutney-path test-driver 
$(TESTING_TOR_BINARY) src/tools/
$(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) 
$(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
done; \
echo "Log and result files are available in 
$(TEST_NETWORK_ALL_LOG_DIR)."; \
-   ! grep -q FAIL test_network_log/*.trs
+   ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
 
 need-stem-path:
@if test ! -d "$$STEM_SOURCE_DIR"; then \



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

[tor-commits] [tor/master] Test: avoid spurious failures in make test-network-all

2018-08-29 Thread nickm 
commit 541b89b061455a167e73e6fc61e9df7ee82f4525
Author: teor 
Date:   Fri Aug 24 10:25:25 2018 +1000

Test: avoid spurious failures in make test-network-all

Before running make test-network-all, delete old logs and test result
files, to avoid spurious failures.

Fixes bug 27295; bugfix on 0.2.7.3-rc.
---
 Makefile.am  | 1 +
 changes/bug27295 | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index b19a4bf96..e4be3f26f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,6 +106,7 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
 # Try both the BSD and the Linux ping6 syntax, because they're incompatible
 test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
mkdir -p $(TEST_NETWORK_ALL_LOG_DIR)
+   rm -f $(TEST_NETWORK_ALL_LOG_DIR)/*.log 
$(TEST_NETWORK_ALL_LOG_DIR)/*.trs
@flavors="$(TEST_CHUTNEY_FLAVORS)"; \
if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1; then \
echo "ping6 ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
diff --git a/changes/bug27295 b/changes/bug27295
new file mode 100644
index 0..c5a364877
--- /dev/null
+++ b/changes/bug27295
@@ -0,0 +1,3 @@
+  o Minor bugfixes (testing, chutney):
+- Before running make test-network-all, delete old logs and test result
+  files, to avoid spurious failures. Fixes bug 27295; bugfix on 0.2.7.3-rc.



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

[tor-commits] [tor/maint-0.3.2] Test: avoid spurious failures in make test-network-all

2018-08-29 Thread nickm 
commit 541b89b061455a167e73e6fc61e9df7ee82f4525
Author: teor 
Date:   Fri Aug 24 10:25:25 2018 +1000

Test: avoid spurious failures in make test-network-all

Before running make test-network-all, delete old logs and test result
files, to avoid spurious failures.

Fixes bug 27295; bugfix on 0.2.7.3-rc.
---
 Makefile.am  | 1 +
 changes/bug27295 | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index b19a4bf96..e4be3f26f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,6 +106,7 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
 # Try both the BSD and the Linux ping6 syntax, because they're incompatible
 test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
mkdir -p $(TEST_NETWORK_ALL_LOG_DIR)
+   rm -f $(TEST_NETWORK_ALL_LOG_DIR)/*.log 
$(TEST_NETWORK_ALL_LOG_DIR)/*.trs
@flavors="$(TEST_CHUTNEY_FLAVORS)"; \
if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1; then \
echo "ping6 ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
diff --git a/changes/bug27295 b/changes/bug27295
new file mode 100644
index 0..c5a364877
--- /dev/null
+++ b/changes/bug27295
@@ -0,0 +1,3 @@
+  o Minor bugfixes (testing, chutney):
+- Before running make test-network-all, delete old logs and test result
+  files, to avoid spurious failures. Fixes bug 27295; bugfix on 0.2.7.3-rc.



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

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

2018-08-29 Thread translation 
commit b9d9b6f1dcee0e9e34101e73cc63de2586dbf136
Author: Translation commit bot 
Date:   Wed Aug 29 15:17:31 2018 +

Update translations for torbutton-brandproperties_completed
---
 hi/brand.properties | 16 
 1 file changed, 16 insertions(+)

diff --git a/hi/brand.properties b/hi/brand.properties
new file mode 100644
index 0..174d4251a
--- /dev/null
+++ b/hi/brand.properties
@@ -0,0 +1,16 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+brandShorterName=टॉर विचरक
+brandShortName=टॉर ब्राउज़र
+brandFullName=टॉर ब्राउज़र
+vendorShortName=टोर  परियोजना
+
+homePageSingleStartMain=फ़ायरफ़ॉक्स 
स्टार्ट, अंतर्निहित खोज वाला 
एक तेज़ होम पेज
+homePageImport=%S से अपना होम पेज आयात 
करें
+
+homePageMigrationPageTitle=होम पेज चयन
+homePageMigrationDescription=कृपया उस होम पेज का 
चयन करें जिसका आप उपयोग करना 
चाहते हैं:
+
+syncBrandShortName=सिंक

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

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

2018-08-29 Thread nickm 
commit b40f9967fa31faa1dcf1a977989e235fbe836015
Merge: 70a07fa90 541b89b06
Author: Nick Mathewson 
Date:   Wed Aug 29 11:17:31 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

 Makefile.am  | 3 ++-
 changes/bug27295 | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc Makefile.am
index 4d2d9d222,e4be3f26f..34493765d
--- a/Makefile.am
+++ b/Makefile.am
@@@ -143,10 -127,9 +144,10 @@@ test-network-all: need-chutney-path tes
done; \
for f in $$flavors; do \
$(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) 
$(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
 +  $(top_srcdir)/src/test/test-network.sh 
$(TEST_NETWORK_WARNING_FLAGS); \
done; \
echo "Log and result files are available in 
$(TEST_NETWORK_ALL_LOG_DIR)."; \
-   ! grep -q FAIL test_network_log/*.trs
+   ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
  
  need-stem-path:
@if test ! -d "$$STEM_SOURCE_DIR"; then \

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

[tor-commits] [tor/maint-0.2.9] Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am

2018-08-29 Thread nickm 
commit 3e298633ca212447b4a230b970a293ce694ed3bb
Author: teor 
Date:   Fri Aug 24 10:20:30 2018 +1000

Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am

Part of 27295.
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index f06d0e373..b19a4bf96 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -128,7 +128,7 @@ test-network-all: need-chutney-path test-driver 
$(TESTING_TOR_BINARY) src/tools/
$(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) 
$(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
done; \
echo "Log and result files are available in 
$(TEST_NETWORK_ALL_LOG_DIR)."; \
-   ! grep -q FAIL test_network_log/*.trs
+   ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
 
 need-stem-path:
@if test ! -d "$$STEM_SOURCE_DIR"; then \



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

[tor-commits] [tor/maint-0.3.2] Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am

2018-08-29 Thread nickm 
commit 3e298633ca212447b4a230b970a293ce694ed3bb
Author: teor 
Date:   Fri Aug 24 10:20:30 2018 +1000

Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am

Part of 27295.
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index f06d0e373..b19a4bf96 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -128,7 +128,7 @@ test-network-all: need-chutney-path test-driver 
$(TESTING_TOR_BINARY) src/tools/
$(SHELL) $(top_srcdir)/test-driver --test-name $$f --log-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.log --trs-file 
$(TEST_NETWORK_ALL_LOG_DIR)/$$f.trs $(TEST_NETWORK_ALL_DRIVER_FLAGS) 
$(top_srcdir)/src/test/test-network.sh --flavor $$f $(TEST_NETWORK_FLAGS); \
done; \
echo "Log and result files are available in 
$(TEST_NETWORK_ALL_LOG_DIR)."; \
-   ! grep -q FAIL test_network_log/*.trs
+   ! grep -q FAIL $(TEST_NETWORK_ALL_LOG_DIR)/*.trs
 
 need-stem-path:
@if test ! -d "$$STEM_SOURCE_DIR"; then \



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

[tor-commits] [tor/maint-0.2.9] Test: avoid spurious failures in make test-network-all

2018-08-29 Thread nickm 
commit 541b89b061455a167e73e6fc61e9df7ee82f4525
Author: teor 
Date:   Fri Aug 24 10:25:25 2018 +1000

Test: avoid spurious failures in make test-network-all

Before running make test-network-all, delete old logs and test result
files, to avoid spurious failures.

Fixes bug 27295; bugfix on 0.2.7.3-rc.
---
 Makefile.am  | 1 +
 changes/bug27295 | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index b19a4bf96..e4be3f26f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,6 +106,7 @@ test-network: need-chutney-path $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
 # Try both the BSD and the Linux ping6 syntax, because they're incompatible
 test-network-all: need-chutney-path test-driver $(TESTING_TOR_BINARY) 
src/tools/tor-gencert
mkdir -p $(TEST_NETWORK_ALL_LOG_DIR)
+   rm -f $(TEST_NETWORK_ALL_LOG_DIR)/*.log 
$(TEST_NETWORK_ALL_LOG_DIR)/*.trs
@flavors="$(TEST_CHUTNEY_FLAVORS)"; \
if ping6 -q -c 1 -o ::1 >/dev/null 2>&1 || ping6 -q -c 1 -W 1 ::1 
>/dev/null 2>&1; then \
echo "ping6 ::1 succeeded, running IPv6 flavors: 
$(TEST_CHUTNEY_FLAVORS_IPV6)."; \
diff --git a/changes/bug27295 b/changes/bug27295
new file mode 100644
index 0..c5a364877
--- /dev/null
+++ b/changes/bug27295
@@ -0,0 +1,3 @@
+  o Minor bugfixes (testing, chutney):
+- Before running make test-network-all, delete old logs and test result
+  files, to avoid spurious failures. Fixes bug 27295; bugfix on 0.2.7.3-rc.

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

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

2018-08-29 Thread translation 
commit 5368eac9581c783a9bd58245dfd9d0811f528024
Author: Translation commit bot 
Date:   Wed Aug 29 15:17:27 2018 +

Update translations for torbutton-brandproperties
---
 hi/brand.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hi/brand.properties b/hi/brand.properties
index 05b8a99ff..174d4251a 100644
--- a/hi/brand.properties
+++ b/hi/brand.properties
@@ -7,8 +7,8 @@ brandShortName=टॉर ब्राउज़र
 brandFullName=टॉर ब्राउज़र
 vendorShortName=टोर  परियोजना
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=फ़ायरफ़ॉक्स 
स्टार्ट, अंतर्निहित खोज वाला 
एक तेज़ होम पेज
+homePageImport=%S से अपना होम पेज आयात 
करें
 
 homePageMigrationPageTitle=होम पेज चयन
 homePageMigrationDescription=कृपया उस होम पेज का 
चयन करें जिसका आप उपयोग करना 
चाहते हैं:

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

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

2018-08-29 Thread translation 
commit 70c314f286a1ced5302c560eb6fd97e215814aa6
Author: Translation commit bot 
Date:   Wed Aug 29 15:16:46 2018 +

Update translations for tba-android_stringsdtd
---
 hi/android_strings.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hi/android_strings.dtd b/hi/android_strings.dtd
index 6e211c7ba..ecba20636 100644
--- a/hi/android_strings.dtd
+++ b/hi/android_strings.dtd
@@ -17,7 +17,7 @@
 
 
 
-
+
 
 
 
@@ -667,7 +667,7 @@ just addresses the organization to follow, e.g. "This site 
is run by " -->
 
 
 
-
+
 
 
 

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

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

2018-08-29 Thread translation 
commit 315da6ab13dc4eab0b82f5bbd06f8d9a62b3b0a9
Author: Translation commit bot 
Date:   Wed Aug 29 15:15:33 2018 +

Update translations for https_everywhere_completed
---
 hi/ssl-observatory.dtd | 94 ++
 1 file changed, 94 insertions(+)

diff --git a/hi/ssl-observatory.dtd b/hi/ssl-observatory.dtd
new file mode 100644
index 0..0c3833c1c
--- /dev/null
+++ b/hi/ssl-observatory.dtd
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+https://www.something.com 
पर जाते है, तो ऑब्जर्वेटरी के 
द्वारा प्राप्त किया 
प्रमाणपत्र यह दिखाएगा कि कोई 
www.something.com पर गया, लेकिन वह यह नहीं 
दिखाएगा कि कौन उस वेबसाइट पर 
गया और उन्होंने कौनसे पृष्ठों 
को देखा। अधिक जानकारी के लिए 
माउस को विकल्पों पर ले जाये |">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

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

2018-08-29 Thread translation 
commit 63e63091b8917041a56ccb83719884790b8293c1
Author: Translation commit bot 
Date:   Wed Aug 29 15:15:27 2018 +

Update translations for https_everywhere
---
 hi/ssl-observatory.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hi/ssl-observatory.dtd b/hi/ssl-observatory.dtd
index 686f701c7..0c3833c1c 100644
--- a/hi/ssl-observatory.dtd
+++ b/hi/ssl-observatory.dtd
@@ -46,7 +46,7 @@ to turn it on?">-->
 "चेतावनी दिखाएं जब 
ऑब्जर्वेटरी आपके ब्राउज़र 
द्वारा न पकड़े गए निरस्त 
प्रमाण पत्र का पता लगाता है">
 
 
+"यह ज्ञात प्रमाणपत्र रद्द 
सूची के खिलाफ सबमिट प्रमाण 
पत्र की जांच करेगा। 
दुर्भाग्यवश हम गारंटी नहीं दे 
सकते कि हम प्रत्येक निरस्त 
प्रमाण पत्र को ध्वजांकित 
करेंगे, लेकिन यदि आपको 
चेतावनी दिखाई देती है तो कुछ 
गलत होने का एक अच्छा संकेत है।">
 
 
 

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

[tor-commits] [webwml/master] jobs: remove Bookkeeper and Grants Manager job postings (#27347)

2018-08-29 Thread hiro 
commit 281d0b006b6f2fe21e129b304e191ce39875b288
Author: traumschule 
Date:   Mon Aug 27 22:29:12 2018 +0200

jobs: remove Bookkeeper and Grants Manager job postings (#27347)
---
 about/en/jobs.wml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/about/en/jobs.wml b/about/en/jobs.wml
index 40799633..181fc925 100644
--- a/about/en/jobs.wml
+++ b/about/en/jobs.wml
@@ -18,9 +18,7 @@
 Specifically, we're looking for the following people currently:
 
   Senior Systems 
Administrator
-  Grants Manager
   Grant Writer
-  Bookkeeper/Payroll 
Specialist
 
 
 In the past, we looked for the following people:
@@ -44,6 +42,8 @@
   Fundraising Director
   Project Manager for Network Projects
   Project Manager with Product Experience
+  Bookkeeper/Payroll Specialist
+  Grants Manager
 
 
 About the company:

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

[tor-commits] [webwml/master] jobs: remove both Project Manager job postings (#27227)

2018-08-29 Thread hiro 
commit 3f86924c427376b4f3bd0747d13ce5e470511453
Author: traumschule 
Date:   Tue Aug 21 07:12:15 2018 +0200

jobs: remove both Project Manager job postings (#27227)



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

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

2018-08-29 Thread translation 
commit 9805dc897eacc0d47eba68eab113b74b62215cd8
Author: Translation commit bot 
Date:   Wed Aug 29 14:49:05 2018 +

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

diff --git a/contents+pt_BR.po b/contents+pt_BR.po
index 8460c1487..c1ff2c901 100644
--- a/contents+pt_BR.po
+++ b/contents+pt_BR.po
@@ -271,6 +271,9 @@ msgid ""
 "After a few hours (to give it enough time to propagate), you can query Atlas"
 " to see whether your relay has successfully registered in the network."
 msgstr ""
+"Depois de poucas horas (para ter tempo o bastante para propagar), você pode "
+"consultar o Atlas para ver se seu retransmissor foi registrado com sucesso "
+"na rede."
 
 #: http//localhost/misc/misc-12/
 #: (content/misc/misc-12/contents+en.lrquestion.description)

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

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

2018-08-29 Thread translation 
commit 76fec5fc07ef1c32a7bc91c473d7b24733345c13
Author: Translation commit bot 
Date:   Wed Aug 29 14:47:34 2018 +

Update translations for torbutton-brandproperties
---
 hi/brand.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hi/brand.properties b/hi/brand.properties
index d9f258fe5..05b8a99ff 100644
--- a/hi/brand.properties
+++ b/hi/brand.properties
@@ -10,7 +10,7 @@ vendorShortName=टोर  परियोजना
 homePageSingleStartMain=Firefox Start, a fast home page with built-in search
 homePageImport=Import your home page from %S
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=होम पेज चयन
+homePageMigrationDescription=कृपया उस होम पेज का 
चयन करें जिसका आप उपयोग करना 
चाहते हैं:
 
-syncBrandShortName=Sync
+syncBrandShortName=सिंक

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

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

2018-08-29 Thread translation 
commit c6953a778874a2efa5c6819fa64f634864829cb5
Author: Translation commit bot 
Date:   Wed Aug 29 14:45:30 2018 +

Update translations for https_everywhere
---
 hi/ssl-observatory.dtd | 28 
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/hi/ssl-observatory.dtd b/hi/ssl-observatory.dtd
index 9518e5e9f..686f701c7 100644
--- a/hi/ssl-observatory.dtd
+++ b/hi/ssl-observatory.dtd
@@ -3,9 +3,7 @@
 
 
 
-
+
 
 
 "इस विकल्प के लिए टोर को 
स्थापित और चलाने की आवश्यकता 
है">
 
 
+"जब आप एक नया प्रमाणपत्र देखते 
हैं, तो ऑब्जर्वेटरी को बताएं 
कि आप कौनसे ISP से जुड़े हुए है ">
 
 
+"यह आपके नेटवर्क के 
स्वायत्त सिस्टम नंबर को 
लाएगा और भेज देगा। इससे हमें 
HTTPS के खिलाफ हमलों का पता लगाने 
में मदद मिलेगी, और यह 
निर्धारित करने के लिए कि क्या 
हमारे पास ईरान और सीरिया जैसे 
स्थानों पर नेटवर्क से अवलोकन 
हैं, जहां हमले तुलनात्मक रूप 
से आम हैं।">
 
 
+"चेतावनी दिखाएं जब 
ऑब्जर्वेटरी आपके ब्राउज़र 
द्वारा न पकड़े गए निरस्त 
प्रमाण पत्र का पता लगाता है">
 
 
@@ -53,10 +51,8 @@ to turn it on?">-->
 
 
 
+"HTTPS हर जगह EFF के SSL ऑब्जर्वेटरी 
का उपयोग कर सकता हैं। यह दो 
चीजें करता है: (1)
+'मध्य में आदमी' हमलों का पता 
लगाने और वेब की सुरक्षा में 
सुधार करने में हमारी सहायता 
के लिए ऑब्जर्वेटरी में HTTPS 
प्रमाण पत्र की प्रतियां भेजती 
हैं; और (2) हमें आपको असुरक्षित 
कनेक्शन या आपके ब्राउज़र पर 
हमलों के बारे में चेतावनी 
देता है।">
 
 
 
 
 
+"टोर उपलब्ध नहीं होने पर भी 
प्रमाणपत्र जांचें">
 
 
+"हम अभी भी डेटा को अज्ञात रखने 
की कोशिश करेंगे, लेकिन यह 
विकल्प कम सुरक्षित है">
 
 
+"गैर-सार्वजनिक DNS नामों के लिए 
प्रमाणपत्र जमा करें और 
जांचें">
 
 
+"जब तक यह विकल्प चेक नहीं किया 
जाता है, ऑब्जर्वेटरी उन नामों 
के लिए प्रमाणपत्र रिकॉर्ड 
नहीं करेगी जो इसे DNS सिस्टम के 
माध्यम से हल नहीं कर सकती हैं।">
 
 
 
@@ -89,8 +85,8 @@ Mouseover the options for further details:">-->
 
 
 
-
-
+
+
 
 

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

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

2018-08-29 Thread translation 
commit 4ea249d080e86885c9c8c8d36b075f0bb29d6d54
Author: Translation commit bot 
Date:   Wed Aug 29 14:15:27 2018 +

Update translations for https_everywhere
---
 hi/ssl-observatory.dtd | 21 +
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/hi/ssl-observatory.dtd b/hi/ssl-observatory.dtd
index af4160322..9518e5e9f 100644
--- a/hi/ssl-observatory.dtd
+++ b/hi/ssl-observatory.dtd
@@ -30,13 +30,13 @@ to turn it on?">-->
 "गैर-मानक रूट CA द्वारा 
हस्ताक्षरित प्रमाणपत्र जमा 
करें और जांचें">
 
 
+"इस विकल्प को सक्षम करना एक 
सुरक्षित (और अच्छा विचार) है, 
जब तक आप एक घुसपैठिये नेटवर्क 
या फिर कास्परस्की एंटीवायरस 
सॉफ्टवेयर, जो आपकी ब्राउज़िंग 
का निरिक्षण एक TLS प्रॉक्सी और 
एक निजी रुट प्रमाणकर्ता 
प्राधिकरण द्वारा करना है, का 
इस्तेमाल न करते हो। यदि ऐसे 
नेटवर्क पर सक्षम किया गया, तो 
यह विकल्प सबूत प्रकाशित कर 
सकता है कि उस प्रॉक्सी के 
माध्यम से कौन से https: // डोमेन का 
दौरा किया जा रहा थà
 ¤¾, क्योंकि यह अद्वित्य 
प्रमाणपत्रों का उत्पादन करता 
है | इसलिए हम इसे डिफ़ॉल्ट 
सेटिंग में बंद ही रखते है।">
 
-
+
 
+"अनामिकता के लिए टोर का उपयोग 
कर प्रमाण पत्र जांचें (टोर की 
आवश्यकता है)">
 
+"इस विकल्प के लिए टोर को 
स्थापित और चलाने की आवश्यकता 
है">
 
 
@@ -65,10 +65,7 @@ Mouseover the options for further details:">-->
 
 https://www.something.com, the certificate
-received by the Observatory will indicate that somebody visited
-www.something.com, but not who visited the site, or what specific page they
-looked at.  Mouseover the options for further details:">
+"उदाहरण के लिए, जब आप https://www.something.com 
पर जाते है, तो ऑब्जर्वेटरी के 
द्वारा प्राप्त किया 
प्रमाणपत्र यह दिखाएगा कि कोई 
www.something.com पर गया, लेकिन वह यह नहीं 
दिखाएगा कि कौन उस वेबसाइट पर 
गया और उन्होंने कौनसे पृष्ठों 
को देखा। अधिक जानकारी के लिए 
माउस को विकल्पों पर ले जाये |">
 
 
 
@@ -88,14 +85,14 @@ looked at.  Mouseover the options for further details:">
 
 
 
-
-
+
+
 
 
 
 
 
 
+"स्वयं हस्ताक्षरित 
प्रमाणपत्र जमा करें और 
जांचें">
 
+"यह अनुशंसित है; 
क्रिप्टोग्राफिक समस्याएं 
स्वयं-हस्ताक्षरित एम्बेडेड 
डिवाइसों में विशेष रूप से आम 
हैं।">

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

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

2018-08-29 Thread translation 
commit b6fcde56661eadf57a4e25eff393361c920c552c
Author: Translation commit bot 
Date:   Wed Aug 29 13:46:49 2018 +

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

diff --git a/hi/android_strings.dtd b/hi/android_strings.dtd
index 586f2a7bd..6e211c7ba 100644
--- a/hi/android_strings.dtd
+++ b/hi/android_strings.dtd
@@ -788,7 +788,7 @@ just addresses the organization to follow, e.g. "This site 
is run by " -->
 
 
 
-
+
 
 
 

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

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

2018-08-29 Thread translation 
commit 9994fc95fa2c4720f2681325c32fe1560c2a7960
Author: Translation commit bot 
Date:   Wed Aug 29 13:45:27 2018 +

Update translations for https_everywhere
---
 hi/https-everywhere.dtd | 30 +++---
 hi/ssl-observatory.dtd  |  4 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/hi/https-everywhere.dtd b/hi/https-everywhere.dtd
index 778b03471..dfc2af036 100644
--- a/hi/https-everywhere.dtd
+++ b/hi/https-everywhere.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -13,26 +13,26 @@
 
 
 
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
 
-
-
-
+
+
+
 
 
 
 
-
+
 
-
-
+
+
 
 
 
diff --git a/hi/ssl-observatory.dtd b/hi/ssl-observatory.dtd
index 73b1ae5f0..af4160322 100644
--- a/hi/ssl-observatory.dtd
+++ b/hi/ssl-observatory.dtd
@@ -90,8 +90,8 @@ looked at.  Mouseover the options for further details:">
 
 
 
-
-
+
+
 
 
 

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

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

2018-08-29 Thread translation 
commit 7fb9f5285faf279ed6d2e6f72d9077e8523d07b1
Author: Translation commit bot 
Date:   Wed Aug 29 13:45:35 2018 +

Update translations for https_everywhere_completed
---
 hi/https-everywhere.dtd | 21 ++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/hi/https-everywhere.dtd b/hi/https-everywhere.dtd
index d198adfe9..dfc2af036 100644
--- a/hi/https-everywhere.dtd
+++ b/hi/https-everywhere.dtd
@@ -2,6 +2,7 @@
 
 
 
+
 
 
 
@@ -12,12 +13,26 @@
 
 
 
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
+
+
+
+
 
 
 

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

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

2018-08-29 Thread translation 
commit 86fdb21c60f89f046045b4098dc8200f01c7924e
Author: Translation commit bot 
Date:   Wed Aug 29 11:18:55 2018 +

Update translations for support-portal
---
 contents+ca.po | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/contents+ca.po b/contents+ca.po
index fa5f78899..de2f1d314 100644
--- a/contents+ca.po
+++ b/contents+ca.po
@@ -1048,7 +1048,7 @@ msgstr "limitacions d'ample de banda)"
 #: http//localhost/connecting/connecting-2/
 #: (content/connecting/connecting-2/contents+en.lrquestion.description)
 msgid "# Common log error #4: Clock skew"
-msgstr ""
+msgstr "# Common log error #4: Clock skew"
 
 #: http//localhost/tbb/tbb-23/
 #: (content/tbb/tbb-23/contents+en.lrquestion.description)
@@ -2635,7 +2635,7 @@ msgstr ""
 #: http//localhost/operators/operators-4/
 #: (content/operators/operators-4/contents+en.lrquestion.description)
 msgid "$ lsb_release -c"
-msgstr ""
+msgstr "$ lsb_release -c"
 
 #: http//localhost/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.seo_slug)
@@ -2786,6 +2786,10 @@ msgid ""
 "correctly: even a small mistake will stop Tor Browser from being able to "
 "reach the site."
 msgstr ""
+"Si no podeu arribar al servei de onion que voleu, assegureu-vos que heu "
+"introduït correctament el format de 16 caràcters o, el més nou, l'adreça 
de "
+"onion de 56 caràcters: fins i tot un petit error deixarà que el Navegador "
+"Tor no pugui accedir al lloc."
 
 #: http//localhost/censorship/
 #: (content/censorship/contents+en.lrtopic.seo_slug)
@@ -3893,6 +3897,9 @@ msgid ""
 "complete a TLS handshake with the directory authorities. Using bridges will "
 "likely fix this."
 msgstr ""
+"Si veieu línies com aquesta al registre Tor, significa que Tor no ha pogut "
+"completar una encaixada de mans de TLS amb les autoritats del directori. "
+"Usar ponts probablement solucionarà això."
 
 #: http//localhost/tbb/tbb-23/
 #: (content/tbb/tbb-23/contents+en.lrquestion.description)
@@ -4584,7 +4591,7 @@ msgstr "Cerca"
 
 #: templates/sidenav.html:4 templates/sidenav.html:29
 msgid "Topics"
-msgstr ""
+msgstr "Temes"
 
 #: templates/macros/question.html:11
 msgid "Permalink"

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

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

2018-08-29 Thread translation 
commit 5c7c1c519016b71b6f4a22f6782f8340a710d117
Author: Translation commit bot 
Date:   Wed Aug 29 11:18:11 2018 +

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

diff --git a/ca/abouttbupdate.dtd b/ca/abouttbupdate.dtd
index 515e1e793..5daa4dc06 100644
--- a/ca/abouttbupdate.dtd
+++ b/ca/abouttbupdate.dtd
@@ -4,3 +4,7 @@
 
 
 
+
+
+
+

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

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

2018-08-29 Thread translation 
commit 4fb979e7b511f3da9d282358c92ba6ecc99fef21
Author: Translation commit bot 
Date:   Wed Aug 29 11:18:06 2018 +

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

diff --git a/ca/abouttbupdate.dtd b/ca/abouttbupdate.dtd
index 166210eef..5daa4dc06 100644
--- a/ca/abouttbupdate.dtd
+++ b/ca/abouttbupdate.dtd
@@ -5,6 +5,6 @@
 
 
 
-
-
+
+
 

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

[tor-commits] [chutney/master] Check for src/app and src/or, and fail if they are both present

2018-08-29 Thread teor 
commit de5b491b4b81c14bf3800da88952cfe7e550da0a
Author: teor 
Date:   Wed Aug 29 20:57:46 2018 +1000

Check for src/app and src/or, and fail if they are both present

Otherwise, chutney can easily choose the wrong tor.

Closes 27379.
---
 tools/test-network.sh | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/test-network.sh b/tools/test-network.sh
index 31bf927..b55a737 100755
--- a/tools/test-network.sh
+++ b/tools/test-network.sh
@@ -213,7 +213,11 @@ fi
 
 # Now find the name of the Tor app dir, which changed in Tor 0.3.5
 if [ -d "$TOR_DIR" ]; then
-if [ -d "$TOR_DIR/src/app" ]; then
+if [ -d "$TOR_DIR/src/app" -a -d "$TOR_DIR/src/or" ]; then
+$ECHO "$myname: \$TOR_DIR has a Tor 0.3.5 or later build directory, 
and a Tor 0.3.4 or earlier build directory"
+$ECHO "$myname: Please remove $TOR_DIR/src/app or $TOR_DIR/src/or, or 
set \$CHUTNEY_TOR"
+exit 1
+elif [ -d "$TOR_DIR/src/app" ]; then
 $ECHO "$myname: \$TOR_DIR is a Tor 0.3.5 or later build directory"
 TOR_APP_DIR="$TOR_DIR/src/app"
 elif [ -d "$TOR_DIR/src/or" ]; then

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

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

2018-08-29 Thread translation 
commit 78434517eadcf2dca1cc64be82c0b84ef169b8a5
Author: Translation commit bot 
Date:   Wed Aug 29 10:18:57 2018 +

Update translations for support-portal
---
 contents+ru.po | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/contents+ru.po b/contents+ru.po
index 5dac9f6f4..4d4b59662 100644
--- a/contents+ru.po
+++ b/contents+ru.po
@@ -565,6 +565,8 @@ msgid ""
 "Many exit nodes are configured to block certain types of file sharing "
 "traffic, such as bittorrent."
 msgstr ""
+"Многие выходные узлы настроены на 
блокирование определенного трафика, 
такого"
+" как торренты."
 
 #: http//localhost/tbb/tbb-21/
 #: (content/tbb/tbb-21/contents+en.lrquestion.description)
@@ -577,7 +579,7 @@ msgstr ""
 #: http//localhost/operators/operators-3/
 #: (content/operators/operators-3/contents+en.lrquestion.description)
 msgid "* Run \"pkg install tor\" (as root)."
-msgstr ""
+msgstr "* Используйте команду \"pkg install tor\" (с 
рут-правами)."
 
 #: http//localhost/misc/misc-15/
 #: (content/misc/misc-15/contents+en.lrquestion.seo_slug)
@@ -633,6 +635,8 @@ msgid ""
 "If you are still unable to connect to the onion service, please try again "
 "later."
 msgstr ""
+"Если вы по-прежнему испытываете проблемы 
с подключением к onion-сервису, "
+"пожалуйста, попробуйте позже."
 
 #: http//localhost/tormobile/tormobile-3/
 #: (content/tormobile/tormobile-3/contents+en.lrquestion.description)
@@ -671,6 +675,8 @@ msgid ""
 "You should see one of these common log errors (look for the following lines "
 "in your Tor log):"
 msgstr ""
+"Вы должны увидеть одну из этих 
распространенных ошибок (обратите 
внимание на"
+" следующие строки в журнале Tor):"
 
 #: http//localhost/tbb/tbb-3/
 #: (content/tbb/tbb-3/contents+en.lrquestion.seo_slug)

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

[tor-commits] [chutney/master] Stop providing the hs flag on authorities

2018-08-29 Thread teor 
commit c34e6e5cd56aebfc30cfefe8e2589b0110922eec
Author: teor 
Date:   Sun Aug 26 06:42:42 2018 +1000

Stop providing the hs flag on authorities

Closes 27378.
---
 lib/chutney/TorNet.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index 91ebb6b..bf26978 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -469,7 +469,7 @@ class LocalNodeBuilder(NodeBuilder):
 
 def _getAltAuthLines(self, hasbridgeauth=False):
 """Return a combination of AlternateDirAuthority,
-AlternateHSAuthority and AlternateBridgeAuthority lines for
+and AlternateBridgeAuthority lines for
 this Node, appropriately.  Non-authorities return ""."""
 if not self._env['authority']:
 return ""
@@ -492,14 +492,14 @@ class LocalNodeBuilder(NodeBuilder):
 self._env['dirserver_flags'] += " bridge"
 else:
 # Directory authorities return AlternateDirAuthority with
-# the 'hs' and 'v3ident' flags set.
+# the 'v3ident' flag set.
 #  This next line is needed for 'bridges' but breaks
 # 'basic'
 if hasbridgeauth:
 options = ("AlternateDirAuthority",)
 else:
 options = ("DirAuthority",)
-self._env['dirserver_flags'] += " hs v3ident=%s" % v3id
+self._env['dirserver_flags'] += " v3ident=%s" % v3id
 
 authlines = ""
 for authopt in options:

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

[tor-commits] [torbutton/master] Bug 26520: Fix sec slider/NoScript for TOR_SKIP_LAUNCH=1

2018-08-29 Thread gk 
commit 931f0659c42fe317fd8ccae0d9210f8814dcf8ea
Author: Arthur Edelstein 
Date:   Mon Jul 16 17:58:33 2018 -0700

Bug 26520: Fix sec slider/NoScript for TOR_SKIP_LAUNCH=1

We need to wait for NoScript to have launched before we
send the first settings message from the security slider.
So wait for NoScript to send us a message first.
---
 src/modules/noscript-control.js | 75 -
 1 file changed, 44 insertions(+), 31 deletions(-)

diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js
index 196d14c2..14f78c49 100644
--- a/src/modules/noscript-control.js
+++ b/src/modules/noscript-control.js
@@ -9,6 +9,9 @@ const { LegacyExtensionContext } =
   Cu.import("resource://gre/modules/LegacyExtensionsUtils.jsm", {});
 const { bindPrefAndInit } =
   Cu.import("resource://torbutton/modules/utils.js", {});
+let logger = Components.classes["@torproject.org/torbutton-logger;1"]
+.getService(Components.interfaces.nsISupports).wrappedJSObject;
+let log = (level, msg) => logger.log(level, msg);
 
 // ## NoScript settings
 
@@ -80,34 +83,6 @@ let noscriptSettings = safetyLevel => (
 // The extension ID for NoScript (WebExtension)
 const noscriptID = "{73a6fe31-595d-460b-a920-fcc0f8843232}";
 
-// A mock extension object that can communicate with another extension
-// via the WebExtensions sendMessage/onMessage mechanism.
-let extensionContext = new LegacyExtensionContext({ id : noscriptID });
-
-// The component that handles WebExtensions' sendMessage.
-let messageManager = extensionContext.messenger.messageManagers[0];
-
-// __setNoScriptSettings(settings)__.
-// NoScript listens for internal settings with onMessage. We can send
-// a new settings JSON object according to NoScript's
-// protocol and these are accepted! See the use of
-// `browser.runtime.onMessage.addListener(...)` in NoScript's bg/main.js.
-let sendNoScriptSettings = settings =>
-extensionContext.messenger.sendMessage(messageManager, settings, 
noscriptID);
-
-// __setNoScriptSafetyLevel(safetyLevel)__.
-// Set NoScript settings according to a particular safety level
-// (security slider level): 0 = Standard, 1 = Safer, 2 = Safest
-let setNoScriptSafetyLevel = safetyLevel =>
-sendNoScriptSettings(noscriptSettings(safetyLevel));
-
-// ## Slider binding
-
-// __securitySliderToSafetyLevel(sliderState)__.
-// Converts the "extensions.torbutton.security_slider" pref value
-// to a "safety level" value: 0 = Standard, 1 = Safer, 2 = Safest
-let securitySliderToSafetyLevel = sliderState => [undefined, 2, 1, 1, 
0][sliderState];
-
 // Ensure binding only occurs once.
 let initialized = false;
 
@@ -119,9 +94,47 @@ var initialize = () => {
 return;
   }
   initialized = true;
-  bindPrefAndInit(
-"extensions.torbutton.security_slider",
-sliderState => 
setNoScriptSafetyLevel(securitySliderToSafetyLevel(sliderState)));
+
+  try {
+// A mock extension object that can communicate with another extension
+// via the WebExtensions sendMessage/onMessage mechanism.
+let extensionContext = new LegacyExtensionContext({ id : noscriptID });
+
+// The component that handles WebExtensions' sendMessage.
+let messageManager = extensionContext.messenger.messageManagers[0];
+
+// __setNoScriptSettings(settings)__.
+// NoScript listens for internal settings with onMessage. We can send
+// a new settings JSON object according to NoScript's
+// protocol and these are accepted! See the use of
+// `browser.runtime.onMessage.addListener(...)` in NoScript's bg/main.js.
+let sendNoScriptSettings = settings =>
+extensionContext.messenger.sendMessage(messageManager, settings, 
noscriptID);
+
+// __setNoScriptSafetyLevel(safetyLevel)__.
+// Set NoScript settings according to a particular safety level
+// (security slider level): 0 = Standard, 1 = Safer, 2 = Safest
+let setNoScriptSafetyLevel = safetyLevel =>
+sendNoScriptSettings(noscriptSettings(safetyLevel));
+
+// __securitySliderToSafetyLevel(sliderState)__.
+// Converts the "extensions.torbutton.security_slider" pref value
+// to a "safety level" value: 0 = Standard, 1 = Safer, 2 = Safest
+let securitySliderToSafetyLevel = sliderState =>
+[undefined, 2, 1, 1, 0][sliderState];
+
+// Wait for the first message from NoScript to arrive, and then
+// bind the security_slider pref to the NoScript settings.
+let messageListener = (a,b,c) => {
+  
extensionContext.api.browser.runtime.onMessage.removeListener(messageListener);
+  bindPrefAndInit(
+"extensions.torbutton.security_slider",
+sliderState => 
setNoScriptSafetyLevel(securitySliderToSafetyLevel(sliderState)));
+};
+
extensionContext.api.browser.runtime.onMessage.addListener(messageListener);
+  } catch (e) {
+log(5, e.message);
+  }
 };
 
 // Export initialize() function for external use.

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

2018-08-29 Thread gk 
commit 6417fe352cdd2275664870ce0003fe3dfd2561eb
Author: Georg Koppen 
Date:   Tue Aug 28 22:23:19 2018 +

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

Disable the Web Authentication API for now until we have it
evaluated in #26614.
---
 browser/app/profile/000-tor-browser.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/browser/app/profile/000-tor-browser.js 
b/browser/app/profile/000-tor-browser.js
index 7a0d26aa53cf..46c56ea0cede 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -152,6 +152,7 @@ pref("dom.webaudio.enabled", false); // Bug 13017: Disable 
Web Audio API
 pref("dom.maxHardwareConcurrency", 1); // Bug 21675: Spoof single-core cpu
 pref("dom.w3c_touch_events.enabled", 0); // Bug 10286: Always disable Touch API
 // Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575)
+pref("security.webauth.webauthn", false); // Bug 26614: Disable Web 
Authentication API for now
 pref("browser.cache.frecency_experiment", -1);
 
 // Third party stuff

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

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

2018-08-29 Thread gk 
commit cc1c7ef7e3c4767e5a505fe791a9026855384bb4
Author: Georg Koppen 
Date:   Tue Aug 28 22:32:00 2018 +

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

Enable ReaderView mode again (#27281).
---
 browser/app/profile/000-tor-browser.js | 4 
 1 file changed, 4 deletions(-)

diff --git a/browser/app/profile/000-tor-browser.js 
b/browser/app/profile/000-tor-browser.js
index 082b69a11ffe..7a0d26aa53cf 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -146,10 +146,6 @@ pref("privacy.resistFingerprinting.block_mozAddonManager", 
true); // Bug 26114
 pref("dom.event.highrestimestamp.enabled", true); // Bug #17046: "Highres" 
(but truncated) timestamps prevent uptime leaks
 pref("privacy.suppressModifierKeyEvents", true); // Bug #17009: Suppress ALT 
and SHIFT events"
 pref("ui.use_standins_for_native_colors", true); // 
https://bugzilla.mozilla.org/232227
-// Make Reader View users uniform if they really want to use that feature. See
-// bug 18950 for more details.
-pref("browser.reader.detectedFirstArticle", true);
-pref("reader.parse-on-load.enabled", false);
 pref("privacy.use_utc_timezone", true);
 pref("media.webspeech.synth.enabled", false); // Bug 10283: Disable 
SpeechSynthesis API
 pref("dom.webaudio.enabled", false); // Bug 13017: Disable Web Audio API

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