[tor-commits] [sandboxed-tor-browser/master] dynlib: Search the system library path(s) as the last resort.

2018-02-19 Thread yawning 
commit 824c61cf62f15d00a634e8a050512bb8adafc712
Author: Yawning Angel 
Date:   Tue Feb 20 06:19:52 2018 +

dynlib: Search the system library path(s) as the last resort.

This make the dynlib process more resilient to ld.so.conf having
oddities in it, and more importantly makes this work on my laptop again.
---
 .../sandboxed-tor-browser/internal/dynlib/cache.go | 47 ++
 .../internal/sandbox/application.go|  4 +-
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/cmd/sandboxed-tor-browser/internal/dynlib/cache.go 
b/src/cmd/sandboxed-tor-browser/internal/dynlib/cache.go
index 24dcf47..c664aa9 100644
--- a/src/cmd/sandboxed-tor-browser/internal/dynlib/cache.go
+++ b/src/cmd/sandboxed-tor-browser/internal/dynlib/cache.go
@@ -84,8 +84,9 @@ func (c *Cache) GetLibraryPath(name string) string {
 // ResolveLibraries returns a map of library paths and their aliases for a
 // given set of binaries, based off the ld.so.cache, libraries known to be
 // internal, and a search path.
-func (c *Cache) ResolveLibraries(binaries []string, extraLibs []string, 
ldLibraryPath string, filterFn FilterFunc) (map[string][]string, error) {
+func (c *Cache) ResolveLibraries(binaries []string, extraLibs []string, 
ldLibraryPath, fallbackSearchPath string, filterFn FilterFunc) 
(map[string][]string, error) {
searchPaths := filepath.SplitList(ldLibraryPath)
+   fallbackSearchPaths := filepath.SplitList(fallbackSearchPath)
libraries := make(map[string]string)
 
// Breadth-first iteration of all the binaries, and their dependencies.
@@ -124,25 +125,39 @@ func (c *Cache) ResolveLibraries(binaries []string, 
extraLibs []string, ldLibrar
continue
}
 
-   // Look for the library in the search path.
-   libPath := ""
-   inLdLibraryPath := false
-   for _, d := range searchPaths {
-   maybePath := filepath.Join(d, lib)
-   if FileExists(maybePath) {
-   libPath = maybePath
-   inLdLibraryPath = true
-   break
+   isInPath := func(l string, p []string) string {
+   for _, d := range p {
+   maybePath := filepath.Join(d, l)
+   if FileExists(maybePath) {
+   return maybePath
+   }
}
+   return ""
}
 
-   // Look for the library in the ld.so.cache.
-   if libPath == "" {
-   libPath = c.GetLibraryPath(lib)
-   if libPath == "" {
-   return nil, fmt.Errorf("dynlib: 
Failed to find library: %v", lib)
-   }
+   // Look for the library in the various places.
+   var libPath string
+   var inLdLibraryPath, inCache, inFallbackPath 
bool
+   if libPath = isInPath(lib, searchPaths); 
libPath != "" {
+   inLdLibraryPath = true
+   } else if libPath = c.GetLibraryPath(lib); 
libPath != "" {
+   inCache = true
+   } else if libPath = isInPath(lib, 
fallbackSearchPaths); libPath != "" {
+   inFallbackPath = true
+   } else {
+   return nil, fmt.Errorf("dynlib: Failed 
to find library: %v", lib)
+   }
+
+   var libSrc string
+   switch {
+   case inLdLibraryPath:
+   libSrc = "LD_LIBRARY_PATH"
+   case inCache:
+   libSrc = "ld.so.conf"
+   case inFallbackPath:
+   libSrc = "Filesystem"
}
+   Debugf("dynlib: Found %v (%v).", lib, libSrc)
 
// Register the library, assuming it's not in 
what will
// presumably be `LD_LIBRARY_PATH` inside the 
hugbox.
diff --git

[tor-commits] [chutney/master] Add a bwscanner network for testing bandwidth authorities

2018-02-19 Thread teor 
commit f5745c80ad6ef6072f42b56c9b6ab3e54a98355f
Author: teor 
Date:   Tue Feb 20 10:51:54 2018 +1100

Add a bwscanner network for testing bandwidth authorities

Closes #25228.
Patch by juga.
---
 networks/bwscanner | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/networks/bwscanner b/networks/bwscanner
new file mode 100644
index 000..8ed1789
--- /dev/null
+++ b/networks/bwscanner
@@ -0,0 +1,10 @@
+# By default, Authorities are not configured as exits
+Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
+NonExitRelay = Node(tag="m", relay=1, torrc="relay-non-exit.tmpl")
+ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
+Client = Node(tag="c", client=1, torrc="client_bwscanner.tmpl")
+
+NODES = Authority.getN(3) + \
+  NonExitRelay.getN(21) + ExitRelay.getN(3) + Client.getN(1)
+
+ConfigureNodes(NODES)

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

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

2018-02-19 Thread translation 
commit b1a795483b24b550854396dc6b9ec82d56e81dc6
Author: Translation commit bot 
Date:   Mon Feb 19 21:17:04 2018 +

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

diff --git a/uk.po b/uk.po
index 33ebad7c6..d67466b44 100644
--- a/uk.po
+++ b/uk.po
@@ -19,7 +19,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-13 20:10+0200\n"
-"PO-Revision-Date: 2018-02-07 12:44+\n"
+"PO-Revision-Date: 2018-02-19 20:49+\n"
 "Last-Translator: O Herenko \n"
 "Language-Team: Ukrainian 
(http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"

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

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

2018-02-19 Thread translation 
commit 584de9ea08f02e3c96c19da1047499091656fa7d
Author: Translation commit bot 
Date:   Mon Feb 19 21:17:10 2018 +

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

diff --git a/uk.po b/uk.po
index 33ebad7c6..d67466b44 100644
--- a/uk.po
+++ b/uk.po
@@ -19,7 +19,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-13 20:10+0200\n"
-"PO-Revision-Date: 2018-02-07 12:44+\n"
+"PO-Revision-Date: 2018-02-19 20:49+\n"
 "Last-Translator: O Herenko \n"
 "Language-Team: Ukrainian 
(http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"

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

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

2018-02-19 Thread translation 
commit 5632186a99ed2fbfc83f69b286558e6218917964
Author: Translation commit bot 
Date:   Mon Feb 19 20:16:09 2018 +

Update translations for tails-persistence-setup_completed
---
 uk/uk.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uk/uk.po b/uk/uk.po
index e51750593..75f93680d 100644
--- a/uk/uk.po
+++ b/uk/uk.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2017-05-15 13:51+0200\n"
-"PO-Revision-Date: 2018-02-05 14:08+\n"
+"PO-Revision-Date: 2018-02-19 19:57+\n"
 "Last-Translator: O Herenko \n"
 "Language-Team: Ukrainian 
(http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"

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

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

2018-02-19 Thread translation 
commit c6be40285e3488035d28e411dd8585ff0e9a70cd
Author: Translation commit bot 
Date:   Mon Feb 19 20:16:03 2018 +

Update translations for tails-persistence-setup
---
 uk/uk.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uk/uk.po b/uk/uk.po
index e51750593..75f93680d 100644
--- a/uk/uk.po
+++ b/uk/uk.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2017-05-15 13:51+0200\n"
-"PO-Revision-Date: 2018-02-05 14:08+\n"
+"PO-Revision-Date: 2018-02-19 19:57+\n"
 "Last-Translator: O Herenko \n"
 "Language-Team: Ukrainian 
(http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"

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

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

2018-02-19 Thread translation 
commit b0107a7a38e9ea003270636f140942f067955fbb
Author: Translation commit bot 
Date:   Mon Feb 19 19:45:25 2018 +

Update translations for whisperback
---
 uk/uk.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uk/uk.po b/uk/uk.po
index 3968fb15d..fe1d835ae 100644
--- a/uk/uk.po
+++ b/uk/uk.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-20 12:09+\n"
-"PO-Revision-Date: 2018-01-18 10:14+\n"
+"PO-Revision-Date: 2018-02-19 19:39+\n"
 "Last-Translator: O Herenko \n"
 "Language-Team: Ukrainian 
(http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"

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

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

2018-02-19 Thread translation 
commit ff150e8e88bf8aabf698e64c4fdee53d76fadce9
Author: Translation commit bot 
Date:   Mon Feb 19 19:45:33 2018 +

Update translations for whisperback_completed
---
 uk/uk.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uk/uk.po b/uk/uk.po
index 3968fb15d..fe1d835ae 100644
--- a/uk/uk.po
+++ b/uk/uk.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-20 12:09+\n"
-"PO-Revision-Date: 2018-01-18 10:14+\n"
+"PO-Revision-Date: 2018-02-19 19:39+\n"
 "Last-Translator: O Herenko \n"
 "Language-Team: Ukrainian 
(http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"

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

[tor-commits] [torspec/master] control: HSFETCH does not support v3 yet

2018-02-19 Thread dgoulet 
commit 59d6453f589904b51061a18303cc2b24be77d1f0
Author: David Goulet 
Date:   Mon Feb 19 11:50:29 2018 -0500

control: HSFETCH does not support v3 yet

The HSFETCH command was not implemented for v3 with prop284 work because of
some engineering complexity and lack of use case.

See ticket #20699 for the rationale.

Signed-off-by: David Goulet 
---
 control-spec.txt | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/control-spec.txt b/control-spec.txt
index e085519..ed61218 100644
--- a/control-spec.txt
+++ b/control-spec.txt
@@ -1480,14 +1480,13 @@
 "HSFETCH" SP (HSAddress / "v" Version "-" DescId)
   *[SP "SERVER=" Server] CRLF
 
-HSAddress = (16*Base32Character / 56*Base32Character)
-Version = "2" / "3"
-DescId = (32*Base32Character / 32*Base64Character)
+HSAddress = 16*Base32Character
+Version = "2"
+DescId = 32*Base32Character
 Server = LongName
 
   This command launches hidden service descriptor fetch(es) for the given
-  HSAddress or DescId. For v3, "DescId" is the descriptor blinded key used as
-  an index to query the directory. It can only be used with "Version=3".
+  HSAddress or DescId.
 
   If a DescId is specified, at least one Server MUST also be provided,
   otherwise a 512 error is returned. If no DescId and Server(s) are specified,
@@ -1515,7 +1514,6 @@
  S: 250 OK
 
   [HSFETCH was added in Tor 0.2.7.1-alpha]
-  [HS v3 support added 0.3.3.1-alpha]
 
 3.27. ADD_ONION
 

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

[tor-commits] [webwml/master] Addressing Mike's design doc review comments

2018-02-19 Thread gk 
commit 87df89e20fef80e51e4db2e39afe0334e9522731
Author: Georg Koppen 
Date:   Mon Feb 19 15:58:59 2018 +

Addressing Mike's design doc review comments
---
 projects/torbrowser/design/index.html.en | 135 +--
 1 file changed, 94 insertions(+), 41 deletions(-)

diff --git a/projects/torbrowser/design/index.html.en 
b/projects/torbrowser/design/index.html.en
index 49e710a7..8f1cb695 100644
--- a/projects/torbrowser/design/index.html.en
+++ b/projects/torbrowser/design/index.html.en
@@ -1,5 +1,5 @@
 
-http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;>http://www.w3.org/1999/xhtml;>The Design and Implementation of 
the Tor Browser [DRAFT]The Design and 
Implementation of the Tor Browser [DRAFT]Mike Perrymailto:mikeperry#torproject org">mikeperry#torproject 
orgErinn Clarkmailto:erinn#torproject org">erinn#torproject 
orgSteven Murdochmailto:sjmurdoch#torproject org">sjmurdoch#torproject 
orgGeorg Koppenmailto:gk#torproject org">gk#torproject 
orgJanuary 
25th, 2018Table of 
Contents1. Introduct
 ion1.1. 
Browser Component Overview2. Design Requirements and 
Philosophy2.1. Security Requirements2.2. Privacy 
Requirements2.3. 
Philosophy3. Adversary Model3.1. Adversary 
Goals3.2. Adversary Capabilities - 
Positioning3.3. 
Adversary Capabilities - Attacks4. 
Implementation4.1. Proxy 
Obedience4.2. State Separation4.3. Disk 
Avoidance4.4. Application Data 
Isolation4.5. Cross-Origin Identifier 
Unlinkability4.6. Cross-Origin Fingerprinting 
Unlinkability4.7. Long-Term Unlinkability via "New Identity" 
button4.8. 
Other Security Measures5. Build Security and Package 
Integrity5.1. Achieving Binary Reprod
 ucibility5.2. 
Package Signatures and Verification5.3. Anonymous Verification5.4. Update 
SafetyA. Towards Transparency in Navigation 
TrackingA.1. Deprecation WishlistA.2. Promising 
Standards1. Introduction
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;>http://www.w3.org/1999/xhtml;>The Design and Implementation of 
the Tor Browser [DRAFT]The Design and 
Implementation of the Tor Browser [DRAFT]Mike Perrymailto:mikeperry#torproject org">mikeperry#torproject 
orgErinn Clarkmailto:erinn#torproject org">erinn#torproject 
orgSteven Murdochmailto:sjmurdoch#torproject org">sjmurdoch#torproject 
orgGeorg Koppenmailto:gk#torproject org">gk#torproject 
orgFebruary 
19th, 2018Table of 
Contents1. Introduc
 tion1.1. 
Browser Component Overview2. Design Requirements and 
Philosophy2.1. Security Requirements2.2. Privacy 
Requirements2.3. 
Philosophy3. Adversary Model3.1. Adversary 
Goals3.2. Adversary Capabilities - 
Positioning3.3. 
Adversary Capabilities - Attacks4. 
Implementation4.1. Proxy 
Obedience4.2. State Separation4.3. Disk 
Avoidance4.4. Application Data 
Isolation4.5. Cross-Origin Identifier 
Unlinkability4.6. Cross-Origin Fingerprinting 
Unlinkability4.7. Long-Term Unlinkability via "New Identity" 
button4.8. 
Other Security Measures5. Build Security and Package 
Integrity5.1. Achieving Binary Repro
 ducibility5.2. 
Package Signatures and Verification5.3. Anonymous Verification5.4. Update 
SafetyA. Towards Transparency in Navigation 
TrackingA.1. Deprecation WishlistA.2. Promising 
Standards1. Introduction
 
 This document describes the adversary model,
 design requirements, and implementation  of the Tor Browser. It is 
current as of Tor Browser
@@ -439,7 +439,7 @@ about the user agent.
 Also, JavaScript can be used to query the user's timezone via the
 Date() object, https://www.khronos.org/registry/webgl/specs/1.0/#5.13; 
target="_top">WebGL can
 reveal information about the video card in use, and high precision timing
-information can be used to https://cseweb.ucsd.edu/~hovav/dist/jspriv.pdf; target="_top">fingerprint 
the cpu and
+information can be used to https://cseweb.ucsd.edu/~hovav/dist/jspriv.pdf; target="_top">fingerprint 
the CPU and
 interpreter speed. JavaScript features such as
 https://www.w3.org/TR/resource-timing/; 
target="_top">Resource Timing
 may leak an unknown amount of network timing related information. And, 
moreover,
@@ -707,7 +707,7 @@ a helper application.
 
 Furthermore, we ship a https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-52.5.2esr-7.0-2id=d75b79f6fa920e6a1e3043005dfd50060ea70e57;
 target="_top">patch for Linux users that makes
 sure sftp:// and smb:// URLs are not passed along to the operating system as 
this
-can lead to proxy bypasses on systems that have GIO/GnomeVS support. And proxy
+can lead to proxy bypasses on systems that have GIO/GnomeVFS support. And proxy
 bypass risks due to file:// URLs should be mitigated for macOS and Linux users
 by https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-52.5.2esr-7.0-2id=8db44df10d1d82850e8b4cfe81ac3b5fce32a663;
 target="_top">
 two https://gitweb.torproject.org/tor-browser.git/commit/?h=tor-browser-52.5.2esr-7.0-2id=a8e1fcc8678aa1583f73ef231c99f77cf17196d9;
 target="_top">
@@ -715,7 +715,7 @@ further patches.

[tor-commits] [tor-browser-spec/master] Bump date of design doc update

2018-02-19 Thread gk 
commit f5d6166495bee2dfd595a619189291d8eeec2a7e
Author: Georg Koppen 
Date:   Mon Feb 19 15:56:07 2018 +

Bump date of design doc update
---
 design-doc/design.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/design-doc/design.xml b/design-doc/design.xml
index a58d906..16178c3 100644
--- a/design-doc/design.xml
+++ b/design-doc/design.xml
@@ -29,7 +29,7 @@
  gk#torproject org
 

-   January 25th, 2018
+   February 19th, 2018
  
 
 

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

[tor-commits] [tor-browser/tor-browser-52.6.0esr-8.0-2] Bug 22794: Don't open AF_INET/AF_INET6 sockets when AF_LOCAL is configured

2018-02-19 Thread gk 
commit eafaa94a613a326bd13234540fe88b86451ee3e9
Author: Richard Pospesel 
Date:   Thu Feb 1 16:20:42 2018 -0800

Bug 22794: Don't open AF_INET/AF_INET6 sockets when AF_LOCAL is configured

The initialization path for the SOCKS proxy in firefox involves creating
a generic AF_INET socket, and then replacing it if the actual
configuration requires something else (either AF_INET6 or AF_LOCAL).
With syscall filtering configured to return an error in the event of
AF_INET or AF_INET6 socket creation, this initialization path fails.  We
would like this capability so that we can prevent firefox from making
network requests outside of the Tor proxy.

This patch adds a check in the initial socket creation path to see if
the SOCKS proxy host begins with file:// with the assumption that such
URIs point to a UNIX Domain Socket (on Linux+macOS only).  In that case,
we create an AF_LOCAL socket rather than the requested type.  A similar
check for Windows already exists to determine if the proxy is actually a
named pipe.

In the subsequent replacing step no work occurs as the passed in socket
matches the type we need, so no changes need to be made there.

NOTE: With this change there is still a one-time request for an AF_INET6
socket that occurs.  This code path exists to determine whether the
system supports IPv6; if socket(AF_INET6...) fails then it is assumed
that the system does not.  However, this check only affects code that is
unreachable when using AF_LOCAL sockets so it seems safe to leave as it is.
However, this does mean that Tor Browser will still be incompatible with
seccomp policies which kill the calling thread in the event of a
socket(AF_INET6,...) call.
---
 netwerk/socket/nsSOCKSSocketProvider.cpp | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/netwerk/socket/nsSOCKSSocketProvider.cpp 
b/netwerk/socket/nsSOCKSSocketProvider.cpp
index c62534f7bf3d..bcae1234f486 100644
--- a/netwerk/socket/nsSOCKSSocketProvider.cpp
+++ b/netwerk/socket/nsSOCKSSocketProvider.cpp
@@ -43,6 +43,14 @@ nsSOCKSSocketProvider::CreateV5(nsISupports *aOuter, 
REFNSIID aIID, void **aResu
 return rv;
 }
 
+#if defined(XP_UNIX)
+bool
+static IsUNIXDomainSocketPath(const nsACString& aPath)
+{
+return StringBeginsWith(aPath, NS_LITERAL_CSTRING("file://"));
+}
+#endif
+
 NS_IMETHODIMP
 nsSOCKSSocketProvider::NewSocket(int32_t family,
  const char *host, 
@@ -62,6 +70,13 @@ nsSOCKSSocketProvider::NewSocket(int32_t family,
 sock = CreateNamedPipeLayer();
 } else
 #endif
+#if defined(XP_UNIX)
+nsAutoCString proxyHost;
+proxy->GetHost(proxyHost);
+if(IsUNIXDomainSocketPath(proxyHost)) {
+family = AF_LOCAL;
+}
+#endif
 {
 sock = PR_OpenTCPSocket(family);
 if (!sock) {

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

[tor-commits] [tor-browser/tor-browser-52.6.0esr-8.0-2] Bug 19910: Rip out optimistic data socks handshake variant (#3875)

2018-02-19 Thread gk 
commit 67fa1e520d8cfc420f5bdee4b53b8310df18a977
Author: Kathy Brade 
Date:   Wed Feb 14 10:39:42 2018 -0500

Bug 19910: Rip out optimistic data socks handshake variant (#3875)

This has been shown to cause problems with STARTTLS in XMPP (used
in Tor Messenger) and with Tor Launcher's Moat client. A replacement
will be added to the Tor daemon itself via bug 5915 (Write patch to
make socks handshakes succeed instantly).
---
 netwerk/base/nsSocketTransport2.cpp | 44 -
 netwerk/base/nsSocketTransport2.h   |  4 +---
 netwerk/socket/nsSOCKSIOLayer.cpp   |  3 +--
 3 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/netwerk/base/nsSocketTransport2.cpp 
b/netwerk/base/nsSocketTransport2.cpp
index 4399465fe534..1bfd1fc91525 100644
--- a/netwerk/base/nsSocketTransport2.cpp
+++ b/netwerk/base/nsSocketTransport2.cpp
@@ -1983,26 +1983,7 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t 
outFlags)
 // Update poll timeout in case it was changed
 mPollTimeout = mTimeouts[TIMEOUT_READ_WRITE];
 }
-// Tor 3875: Use optimistic data with SOCKS.
-// To accomplish this, two new states were added that are only used with
-// SOCKS connections:
-//   STATE_SENDINGGET - The SOCKS handshake has proceeded to the
-//"sent connect" state; now it is okay to
-// optimistically send some application data (e.g.,
-// an HTTP GET request).
-//   STATE_SENTGET -Optimistic data has been sent; make a second call
-//to PR_ConnectContinue() to allow the SOCKS
-//handshake to finish.
-else if (mState == STATE_SENDINGGET) {
-if ((mPollFlags & PR_POLL_WRITE) && (outFlags & ~PR_POLL_READ)) {
-mOutput.OnSocketReady(NS_OK);  // Allow application data to be 
sent.
-}
-mPollTimeout = mTimeouts[TIMEOUT_READ_WRITE];
-mPollFlags = (PR_POLL_EXCEPT | PR_POLL_READ);
-mState = STATE_SENTGET;  // Wait for SOCKS handshake response.
-}
-else if (((mState == STATE_CONNECTING) || (mState = STATE_SENTGET)) &&
- !gIOService->IsNetTearingDown()) {
+else if ((mState == STATE_CONNECTING) && !gIOService->IsNetTearingDown()) {
 // We do not need to do PR_ConnectContinue when we are already
 // shutting down.
 
@@ -2026,14 +2007,7 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t 
outFlags)
 Telemetry::PRCONNECTCONTINUE_BLOCKING_TIME_OFFLINE);
 }
 
-bool isUsingSocks = mProxyTransparent && !mProxyHost.IsEmpty();
-if (status == PR_SUCCESS && mState == STATE_CONNECTING) {
-OnSocketConnected();
-if (isUsingSocks) {
-mState = STATE_SENDINGGET;
-}
-}
-else if (status == PR_SUCCESS && mState == STATE_SENTGET) {
+if (status == PR_SUCCESS) {
 //
 // we are connected!
 //
@@ -2060,17 +2034,17 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, 
int16_t outFlags)
 // If the connect is still not ready, then continue polling...
 //
 if ((PR_WOULD_BLOCK_ERROR == code) || (PR_IN_PROGRESS_ERROR == 
code)) {
-if (mState != STATE_SENTGET) {
-// Set up the select flags for connect...
-mPollFlags = (PR_POLL_EXCEPT | PR_POLL_WRITE);
-// Update poll timeout in case it was changed
-mPollTimeout = mTimeouts[TIMEOUT_CONNECT];
-}
+// Set up the select flags for connect...
+mPollFlags = (PR_POLL_EXCEPT | PR_POLL_WRITE);
+// Update poll timeout in case it was changed
+mPollTimeout = mTimeouts[TIMEOUT_CONNECT];
 }
 //
 // The SOCKS proxy rejected our request. Find out why.
 //
-else if (PR_UNKNOWN_ERROR == code && isUsingSocks) {
+else if (PR_UNKNOWN_ERROR == code &&
+ mProxyTransparent &&
+ !mProxyHost.IsEmpty()) {
 code = PR_GetOSError();
 mCondition = ErrorAccordingToNSPR(code);
 }
diff --git a/netwerk/base/nsSocketTransport2.h 
b/netwerk/base/nsSocketTransport2.h
index b4baed233ff1..7c85ccdc409f 100644
--- a/netwerk/base/nsSocketTransport2.h
+++ b/netwerk/base/nsSocketTransport2.h
@@ -201,9 +201,7 @@ private:
 STATE_IDLE,
 STATE_RESOLVING,
 STATE_CONNECTING,
-STATE_TRANSFERRING,
-STATE_SENDINGGET,
-STATE_SENTGET
+STATE_TRANSFERRING
 };
 
 // Safer way to get and automatically release PRFileDesc objects.
diff --git a/netwerk/socket/nsSOCKSIOLayer.cpp 
b/netwerk/socket/nsSOCKSIOLayer.cpp
index a21dfa4a5a11..5429637c1c3a 100644
---

[tor-commits] [tor-browser/tor-browser-52.6.0esr-8.0-2] Bug 22614: Make e10s/non-e10s Tor Browsers indistinguishable

2018-02-19 Thread gk 
commit a91cf5fa9be89c32948f72b87819ff08c43a360e
Author: Fernando Fernandez Mancera 
Date:   Fri Feb 2 11:38:01 2018 +0100

Bug 22614: Make e10s/non-e10s Tor Browsers indistinguishable

e10s in its current form probably brings some fingerprinting risks with it.
E.g. users of accessibility tools (not only those users) won't have e10s
enabled on windows and macOS. In order to solve this issue
"dom.disable_window_showModalDialog" is set to "true".
---
 browser/app/profile/000-tor-browser.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/browser/app/profile/000-tor-browser.js 
b/browser/app/profile/000-tor-browser.js
index ca27504e4b7d..eb26de046874 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -181,7 +181,8 @@ 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("browser.cache.frecency_experiment", -1);
-
+// Make e10s/non-e10s Tor Browsers indistinguishable (Bug: 22614)
+pref("dom.disable_window_showModalDialog", true);
 
 // Third party stuff
 pref("privacy.firstparty.isolate", true); // Always enforce first party 
isolation

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

[tor-commits] [tor-browser/tor-browser-52.6.0esr-8.0-2] Bug 1005640 - Flush StringBundle cache when app-locales change. r=valentin

2018-02-19 Thread gk 
commit 0445d514609fd71e1aad90f67af8355825cda929
Author: Zibi Braniecki 
Date:   Tue Apr 18 01:03:05 2017 -0700

Bug 1005640 - Flush StringBundle cache when app-locales change. r=valentin

StringBundle caches bundles, so when language chain changes we should
flush the cache to enable new strings to be loaded.
This also affects localized prefs like intl.accept_languages.

Then in HttpHandler we have to mark the value as dirty so that next
time it's called it actually recalculates using flushed string bundle
with the new locale.

MozReview-Commit-ID: DKWEDUli4yH

--HG--
extra : rebase_source : 75ecc4204deca066d7492d1494492a91685f36be

This fixes bug 22659 on our side.
---
 intl/strres/nsStringBundle.cpp  |  4 +++-
 netwerk/protocol/http/nsHttpHandler.cpp | 34 +++--
 netwerk/protocol/http/nsHttpHandler.h   |  3 ++-
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/intl/strres/nsStringBundle.cpp b/intl/strres/nsStringBundle.cpp
index ab840a469a4c..a763ba228b66 100644
--- a/intl/strres/nsStringBundle.cpp
+++ b/intl/strres/nsStringBundle.cpp
@@ -529,6 +529,7 @@ nsStringBundleService::Init()
 os->AddObserver(this, "profile-do-change", true);
 os->AddObserver(this, "chrome-flush-caches", true);
 os->AddObserver(this, "xpcom-category-entry-added", true);
+os->AddObserver(this, "intl:app-locales-changed", true);
   }
 
   // instantiate the override service, if there is any.
@@ -546,7 +547,8 @@ nsStringBundleService::Observe(nsISupports* aSubject,
 {
   if (strcmp("memory-pressure", aTopic) == 0 ||
   strcmp("profile-do-change", aTopic) == 0 ||
-  strcmp("chrome-flush-caches", aTopic) == 0)
+  strcmp("chrome-flush-caches", aTopic) == 0 ||
+  strcmp("intl:app-locales-changed", aTopic) == 0)
   {
 flushBundleCache();
   }
diff --git a/netwerk/protocol/http/nsHttpHandler.cpp 
b/netwerk/protocol/http/nsHttpHandler.cpp
index 4276c7144eb3..21ce43d35fd5 100644
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -203,6 +203,7 @@ nsHttpHandler::nsHttpHandler()
 , mProduct("Gecko")
 , mCompatFirefoxEnabled(false)
 , mUserAgentIsDirty(true)
+, mAcceptLanguagesIsDirty(true)
 , mPromptTempRedirect(true)
 , mEnablePersistentHttpsCaching(false)
 , mDoNotTrackEnabled(false)
@@ -466,8 +467,13 @@ nsHttpHandler::AddStandardRequestHeaders(nsHttpRequestHead 
*request, bool isSecu
 
 // Add the "Accept-Language" header.  This header is also exposed to the
 // service worker.
+if (mAcceptLanguagesIsDirty) {
+rv = SetAcceptLanguages();
+MOZ_ASSERT(NS_SUCCEEDED(rv));
+}
+
+// Add the "Accept-Language" header
 if (!mAcceptLanguages.IsEmpty()) {
-// Add the "Accept-Language" header
 rv = request->SetHeader(nsHttp::Accept_Language, mAcceptLanguages,
 false,
 nsHttpHeaderArray::eVarietyRequestOverride);
@@ -1484,16 +1490,10 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const 
char *pref)
 //
 
 if (PREF_CHANGED(INTL_ACCEPT_LANGUAGES)) {
-nsCOMPtr pls;
-prefs->GetComplexValue(INTL_ACCEPT_LANGUAGES,
-NS_GET_IID(nsIPrefLocalizedString),
-getter_AddRefs(pls));
-if (pls) {
-nsXPIDLString uval;
-pls->ToString(getter_Copies(uval));
-if (uval)
-SetAcceptLanguages(NS_ConvertUTF16toUTF8(uval).get());
-}
+// We don't want to set the new accept languages here since
+// this pref is a complex type and it may be racy with flushing
+// string resources.
+mAcceptLanguagesIsDirty = true;
 }
 
 //
@@ -1870,12 +1870,18 @@ PrepareAcceptLanguages(const char *i_AcceptLanguages, 
nsACString _AcceptLangua
 }
 
 nsresult
-nsHttpHandler::SetAcceptLanguages(const char *aAcceptLanguages)
+nsHttpHandler::SetAcceptLanguages()
 {
+mAcceptLanguagesIsDirty = false;
+
+const nsAdoptingCString& acceptLanguages =
+Preferences::GetLocalizedCString(INTL_ACCEPT_LANGUAGES);
+
 nsAutoCString buf;
-nsresult rv = PrepareAcceptLanguages(aAcceptLanguages, buf);
-if (NS_SUCCEEDED(rv))
+nsresult rv = PrepareAcceptLanguages(acceptLanguages.get(), buf);
+if (NS_SUCCEEDED(rv)) {
 mAcceptLanguages.Assign(buf);
+}
 return rv;
 }
 
diff --git a/netwerk/protocol/http/nsHttpHandler.h 
b/netwerk/protocol/http/nsHttpHandler.h
index 155740f3d223..bb30afc500f8 100644
--- a/netwerk/protocol/http/nsHttpHandler.h
+++ b/netwerk/protocol/http/nsHttpHandler.h
@@ -393,7 +393,7 @@ private:
 void PrefsChanged(nsIPrefBranch *prefs, const char *pref);
 
 nsresult SetAccept(const char *);
-nsresult SetAcceptLanguages(const char *);
+nsresult SetAcceptLanguages();
 nsresult

[tor-commits] [tor-browser-build/master] Bug 24341: update platform.arch to avoid error with some runc versions

2018-02-19 Thread gk 
commit 946d493f800fa39fadba61fa0440a35074d0bbd5
Author: Nicolas Vigier 
Date:   Fri Nov 17 23:14:39 2017 +0100

Bug 24341: update platform.arch to avoid error with some runc versions

The runc versions after this commit:
  
https://github.com/opencontainers/runc/commit/1cd050244e004bc9940787f888b4570328703100
and before this commit:
  
https://github.com/opencontainers/runc/commit/e1146182a8cebb5a6133a9e298a5e4acf99652e9
cannot run containers where platform.arch is set to anything else than
amd64 when running on amd64.

The platform.arch is not used for anything so we can set it to amd64 in
all cases to avoid the error with that runc version.
---
 projects/common/runc-config.json | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/projects/common/runc-config.json b/projects/common/runc-config.json
index 7a88805..e75c13d 100644
--- a/projects/common/runc-config.json
+++ b/projects/common/runc-config.json
@@ -2,11 +2,7 @@
"ociVersion": "1.0.0[% IF !c("var_p/runc_spec100") %]-rc1[% END %]",
"platform": {
"os": "linux",
-[% IF c("var/container/arch") == 'i386' -%]
-   "arch": "386"
-[% ELSE -%]
-   "arch": "[% c("var/container/arch") %]"
-[% END -%]
+   "arch": "amd64"
},
"process": {
"terminal": [% IF c("interactive") %]true[% ELSE %]false[% END 
%],



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

[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_24341'

2018-02-19 Thread gk 
commit 166edadb8ea5bae52fa582952402d9e89e564a8d
Merge: 86ea671 946d493
Author: Georg Koppen 
Date:   Mon Feb 19 15:03:26 2018 +

Merge remote-tracking branch 'boklm/bug_24341'

 projects/common/runc-config.json | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

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

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

2018-02-19 Thread translation 
commit 0064158da70553af68061bc5daafb113da6ae079
Author: Translation commit bot 
Date:   Mon Feb 19 14:18:22 2018 +

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

diff --git a/bg.po b/bg.po
index b10b02088..6e79832f7 100644
--- a/bg.po
+++ b/bg.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2017-05-20 10:59+0200\n"
-"PO-Revision-Date: 2017-09-19 22:59+\n"
+"PO-Revision-Date: 2018-02-19 13:58+\n"
 "Last-Translator: Tsvetan Nikolov \n"
 "Language-Team: Bulgarian 
(http://www.transifex.com/otf/torproject/language/bg/)\n"
 "MIME-Version: 1.0\n"

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

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

2018-02-19 Thread translation 
commit b589619e64bf20b9670e8c51fa6a12e6a88a3841
Author: Translation commit bot 
Date:   Mon Feb 19 14:18:17 2018 +

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

diff --git a/bg.po b/bg.po
index b10b02088..6e79832f7 100644
--- a/bg.po
+++ b/bg.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2017-05-20 10:59+0200\n"
-"PO-Revision-Date: 2017-09-19 22:59+\n"
+"PO-Revision-Date: 2018-02-19 13:58+\n"
 "Last-Translator: Tsvetan Nikolov \n"
 "Language-Team: Bulgarian 
(http://www.transifex.com/otf/torproject/language/bg/)\n"
 "MIME-Version: 1.0\n"

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

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

2018-02-19 Thread translation 
commit 622ada0097ccae4ef09e500b7be5e665a1865c98
Author: Translation commit bot 
Date:   Mon Feb 19 14:17:16 2018 +

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

diff --git a/bg.po b/bg.po
index c03b1bbe0..afda3d0f7 100644
--- a/bg.po
+++ b/bg.po
@@ -20,7 +20,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-13 20:10+0200\n"
-"PO-Revision-Date: 2017-12-20 04:08+\n"
+"PO-Revision-Date: 2018-02-19 13:58+\n"
 "Last-Translator: Alex Alex \n"
 "Language-Team: Bulgarian 
(http://www.transifex.com/otf/torproject/language/bg/)\n"
 "MIME-Version: 1.0\n"

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

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

2018-02-19 Thread translation 
commit 62cf2b35814cd7fbaf778149c53dc15bf3732414
Author: Translation commit bot 
Date:   Mon Feb 19 14:16:40 2018 +

Update translations for tor-launcher-properties
---
 bg/torlauncher.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bg/torlauncher.properties b/bg/torlauncher.properties
index a2ab92b55..cbae531db 100644
--- a/bg/torlauncher.properties
+++ b/bg/torlauncher.properties
@@ -4,7 +4,7 @@
 torlauncher.error_title=Тор лънчер
 
 torlauncher.tor_exited_during_startup=Tor спря неочаквано по 
време на стартиране. Това може да е поради 
грешка в torrc файла, бъг в самият Tor или друга 
програма от вашата система или повреден х
ардуер. Докато не разрешите основният 
проблем и не рестартирате Tor, Tor браузърът 
няма да може да се стартира.
-torlauncher.tor_exited=Тор се изключи 
неочаквано.Това може да е поради бъг в 
самият Тор,друга програма в системата ви 
или повреден хардуер.Докато не 
рестартирате Тор браузърът няма да може да 
отваря никакви сайтове.Ако проблемът 
продължава моля изпратете вашият Тор Log към 
нашия екип по поддръжката.
+torlauncher.tor_exited=Тор се изключи неочаквано. 
Това може да е поради бъг в самия Тор, друга 
програма в системата ви или повреден х
ардуер. Докато не рестартирате Тор, 
браузърът няма да може да отваря никакви 
сайтове. Ако проблемът продължи, моля, 
изпратете копие на вашия Тор Log на нашия 
екип по поддръжката.
 torlauncher.tor_exited2=Рестартирането на Тор няма да 
затвори вашите прозорци в браузъра.
 torlauncher.tor_controlconn_failed=Тор няма връзка с 
контролния порт
 torlauncher.tor_failed_to_start=Тор не стартира успешно
@@ -28,8 +28,8 @@ torlauncher.error_bridges_missing=Трябва да 
зададете един и
 torlauncher.error_default_bridges_type_missing=Трябва да 
избереш вид транспорт за избраните мостове.
 torlauncher.error_bridge_bad_default_type=Никой от избраните 
мостове няма траспорт от типса %S в 
наличност. Моля, нагласи настройките си.
 
-torlauncher.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
+torlauncher.bridge_suffix.meek-amazon=(работи в Китай)
+torlauncher.bridge_suffix.meek-azure=(работи в Китай)
 
 torlauncher.connect=Свържи се
 torlauncher.restart_tor=Рестартирайте Тор

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

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

2018-02-19 Thread translation 
commit b00712448c3785b143579dfef02cfc5457829df8
Author: Translation commit bot 
Date:   Mon Feb 19 14:17:11 2018 +

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

diff --git a/bg.po b/bg.po
index c03b1bbe0..afda3d0f7 100644
--- a/bg.po
+++ b/bg.po
@@ -20,7 +20,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-13 20:10+0200\n"
-"PO-Revision-Date: 2017-12-20 04:08+\n"
+"PO-Revision-Date: 2018-02-19 13:58+\n"
 "Last-Translator: Alex Alex \n"
 "Language-Team: Bulgarian 
(http://www.transifex.com/otf/torproject/language/bg/)\n"
 "MIME-Version: 1.0\n"

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

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

2018-02-19 Thread translation 
commit f44857553f65e2c990107b05d8b68afcf479ed76
Author: Translation commit bot 
Date:   Mon Feb 19 14:16:11 2018 +

Update translations for tails-persistence-setup_completed
---
 bg/bg.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bg/bg.po b/bg/bg.po
index efc81fdc8..d18c911b1 100644
--- a/bg/bg.po
+++ b/bg/bg.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Atanas Kovachki , 2014
+# Атанас Ковачки , 2014
 # Gabriel Radev , 2015
 # Ivo, 2017
 # Kaloyan Nikolov , 2016
@@ -18,7 +18,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2017-05-15 13:51+0200\n"
-"PO-Revision-Date: 2017-09-26 14:12+\n"
+"PO-Revision-Date: 2018-02-19 13:58+\n"
 "Last-Translator: Ivo\n"
 "Language-Team: Bulgarian 
(http://www.transifex.com/otf/torproject/language/bg/)\n"
 "MIME-Version: 1.0\n"

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

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

2018-02-19 Thread translation 
commit 4ba29d3bfbfb2295456bf851b2d1ce11ddaa6cb0
Author: Translation commit bot 
Date:   Mon Feb 19 14:16:46 2018 +

Update translations for tor-launcher-properties_completed
---
 bg/torlauncher.properties | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bg/torlauncher.properties b/bg/torlauncher.properties
index 2ffafa2dc..cbae531db 100644
--- a/bg/torlauncher.properties
+++ b/bg/torlauncher.properties
@@ -4,7 +4,7 @@
 torlauncher.error_title=Тор лънчер
 
 torlauncher.tor_exited_during_startup=Tor спря неочаквано по 
време на стартиране. Това може да е поради 
грешка в torrc файла, бъг в самият Tor или друга 
програма от вашата система или повреден х
ардуер. Докато не разрешите основният 
проблем и не рестартирате Tor, Tor браузърът 
няма да може да се стартира.
-torlauncher.tor_exited=Тор се изключи 
неочаквано.Това може да е поради бъг в 
самият Тор,друга програма в системата ви 
или повреден хардуер.Докато не 
рестартирате Тор браузърът няма да може да 
отваря никакви сайтове.Ако проблемът 
продължава моля изпратете вашият Тор Log към 
нашия екип по поддръжката.
+torlauncher.tor_exited=Тор се изключи неочаквано. 
Това може да е поради бъг в самия Тор, друга 
програма в системата ви или повреден х
ардуер. Докато не рестартирате Тор, 
браузърът няма да може да отваря никакви 
сайтове. Ако проблемът продължи, моля, 
изпратете копие на вашия Тор Log на нашия 
екип по поддръжката.
 torlauncher.tor_exited2=Рестартирането на Тор няма да 
затвори вашите прозорци в браузъра.
 torlauncher.tor_controlconn_failed=Тор няма връзка с 
контролния порт
 torlauncher.tor_failed_to_start=Тор не стартира успешно
@@ -28,7 +28,8 @@ torlauncher.error_bridges_missing=Трябва да 
зададете един и
 torlauncher.error_default_bridges_type_missing=Трябва да 
избереш вид транспорт за избраните мостове.
 torlauncher.error_bridge_bad_default_type=Никой от избраните 
мостове няма траспорт от типса %S в 
наличност. Моля, нагласи настройките си.
 
-torlauncher.recommended_bridge=(препоръчително)
+torlauncher.bridge_suffix.meek-amazon=(работи в Китай)
+torlauncher.bridge_suffix.meek-azure=(работи в Китай)
 
 torlauncher.connect=Свържи се
 torlauncher.restart_tor=Рестартирайте Тор

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

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

2018-02-19 Thread translation 
commit eec2b4ffec3977257fd39f22e3a644eb7f3a97f5
Author: Translation commit bot 
Date:   Mon Feb 19 14:16:02 2018 +

Update translations for tails-persistence-setup
---
 bg/bg.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bg/bg.po b/bg/bg.po
index efc81fdc8..d18c911b1 100644
--- a/bg/bg.po
+++ b/bg/bg.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Atanas Kovachki , 2014
+# Атанас Ковачки , 2014
 # Gabriel Radev , 2015
 # Ivo, 2017
 # Kaloyan Nikolov , 2016
@@ -18,7 +18,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2017-05-15 13:51+0200\n"
-"PO-Revision-Date: 2017-09-26 14:12+\n"
+"PO-Revision-Date: 2018-02-19 13:58+\n"
 "Last-Translator: Ivo\n"
 "Language-Team: Bulgarian 
(http://www.transifex.com/otf/torproject/language/bg/)\n"
 "MIME-Version: 1.0\n"

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

[tor-commits] [tor-browser-build/master] Bug 24614: Bump meek tag for moat feature

2018-02-19 Thread gk 
commit 86ea671920a69772ee7adb4a168f06cbd4b21168
Author: Georg Koppen 
Date:   Mon Feb 19 12:12:54 2018 +

Bug 24614: Bump meek tag for moat feature
---
 projects/meek/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/meek/config b/projects/meek/config
index 46f4ec9..f58fbd1 100644
--- a/projects/meek/config
+++ b/projects/meek/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.25
+version: 0.29
 git_url: https://git.torproject.org/pluggable-transports/meek.git
 git_hash: '[% c("version") %]'
 tag_gpg_id: 1

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

[tor-commits] [tor-browser-build/master] Bug 25020: add a tbb_version.json file

2018-02-19 Thread gk 
commit b2201eb2571c885f45bd6632e483310b169759dc
Author: Nicolas Vigier 
Date:   Thu Feb 8 14:55:10 2018 +0100

Bug 25020: add a tbb_version.json file

Add a tbb_version.json file containing informations about the installed
bundle.
---
 projects/tor-browser/build | 4 
 1 file changed, 4 insertions(+)

diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index 59fbda5..655e157 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -198,6 +198,8 @@ echo "pref(\"general.useragent.locale\", \"en-US\");" >> 
defaults/preferences/00
 [% c("var/touch") %] defaults/preferences/000-tor-browser.js
 zip -Xm omni.ja defaults/preferences/000-tor-browser.js
 rm -rf defaults
+# create tbb_version.json file for #25020
+echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% 
c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"en-US"}' > 
../tbb_verson.json
 popd
 
 # Prepare our language packs for using the proper search engines and embed
@@ -327,6 +329,8 @@ cp $rootdir/[% c('input_files_by_name/firefox') 
%]/mar-tools-*.zip "$OUTDIR"/
   [% c("var/touch") %] defaults/preferences/000-tor-browser.js
   zip -Xm omni.ja defaults/preferences/000-tor-browser.js
   rm -rf defaults
+  # create tbb_version.json file for #25020
+  echo '{"version":"[% c("var/torbrowser_version") %]","architecture":"[% 
c("var/mar_osname") %]","channel":"[% c("var/channel") %]","locale":"[% lang 
%]"}' > ../tbb_verson.json
   popd
 
   # Set the update.locale (it is used to replace %LOCALE% within



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

[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_25020'

2018-02-19 Thread gk 
commit 1c625c1dcbfbb1ca0b40d965c081b3f5a8f84046
Merge: 3d47438 b2201eb
Author: Georg Koppen 
Date:   Mon Feb 19 12:09:30 2018 +

Merge remote-tracking branch 'boklm/bug_25020'

 projects/tor-browser/build | 4 
 1 file changed, 4 insertions(+)

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

[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_25178'

2018-02-19 Thread gk 
commit 3d47438b84102e6831c0905764cb96d479e4580a
Merge: 729ad3b 707cf3d
Author: Georg Koppen 
Date:   Mon Feb 19 12:06:56 2018 +

Merge remote-tracking branch 'boklm/bug_25178'

 projects/release/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[tor-commits] [tor-browser-build/master] Bug 25178: re-enable windows-x86_64 build in 'make testbuild'

2018-02-19 Thread gk 
commit 707cf3d03024780124ab9cda854244ca2ffbccaf
Author: Nicolas Vigier 
Date:   Thu Feb 8 15:42:20 2018 +0100

Bug 25178: re-enable windows-x86_64 build in 'make testbuild'
---
 projects/release/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/release/config b/projects/release/config
index 61c6175..e48fb01 100644
--- a/projects/release/config
+++ b/projects/release/config
@@ -29,7 +29,7 @@ targets:
   torbrowser-windows-i686: 1
   torbrowser-windows-x86_64:
 var:
-  torbrowser-windows-x86_64: '[% c("var/alpha") || c("var/nightly") %]'
+  torbrowser-windows-x86_64: '[% ! c("var/release") %]'
   torbrowser-osx-x86_64:
 var:
   torbrowser-osx-x86_64: 1



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