[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

[translation]

commit d6fa0e8aada7f3d5a60c00595ee71c02e89d34a8
Author: Translation commit bot 
Date:   Thu Dec 20 07:45:24 2018 +

Update translations for donatepages-messagespot
---
 locale/he/LC_MESSAGES/messages.po | 9 +
 1 file changed, 9 insertions(+)

diff --git a/locale/he/LC_MESSAGES/messages.po 
b/locale/he/LC_MESSAGES/messages.po
index 91e1b4bb6..c328a12cf 100644
--- a/locale/he/LC_MESSAGES/messages.po
+++ b/locale/he/LC_MESSAGES/messages.po
@@ -47,12 +47,16 @@ msgid ""
 "be collected and retained by third-party service providers and/or the Tor "
 "Project, as described below."
 msgstr ""
+"אם תספק מידע אישי כחלק מתהליך התרומה, הוא 
עשוי להיאסף ולהישמר ע\"י ספקי "
+"שירות צד־שלישי או ע\"י מיזם Tor, כמתואר למטה."
 
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:67
 msgid ""
 "The Tor Project has very little influence over how third-party service "
 "providers, such as PayPal, may collect and use your information."
 msgstr ""
+"למיזם Tor יש השפעה קטנה מאוד על איך ספקי 
שירות צד־שלישי, כגון PayPal, עשויים"
+" לאסוף ולהשתמש במידע שלך."
 
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:69
 msgid ""
@@ -60,6 +64,9 @@ msgid ""
 "links\" target=\"_blank\" href=\"https://www.paypal.com/webapps/mpp/ua;
 "/privacy-full\">policies, especially if you have privacy concerns."
 msgstr ""
+"אנו ממליצים לך להיוודע אל https://www.paypal.com/webapps/mpp/ua/privacy-full\;>המדינ
יויות "
+"שלהם, במיוחד אם יש לך דאגות לגבי פרטיוּת."
 
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:74
 msgid ""
@@ -79,6 +86,8 @@ msgid ""
 "The Tor Project will never have access to your financial data, such as your "
 "credit card information.We aim to be careful with your information."
 msgstr ""
+"למיזם Tor אף פעם לא תהיה גישה אל הנתונים 
הכספיים שלך, כגון מידע כרטיס האשראי"
+" שלך. אנו מכוונים להיות זהירים עם המידע 
שלך."
 
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:83
 msgid ""

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

[tor-commits] [snowflake/master] Use chunk.byteLength as appropriate for ArrayBuffers.

[dcf]

commit ab34f8e889e9b516f55dc255a8dd125a46725021
Author: David Fifield 
Date:   Tue Dec 4 17:11:29 2018 -0700

Use chunk.byteLength as appropriate for ArrayBuffers.

Without this, running with non-dummy rate limiter (e.g. ?ratelimit=1000)
would try to add undefined to a number resulting in NaN.
---
 proxy/proxypair.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee
index 4f401b0..d3340ed 100644
--- a/proxy/proxypair.coffee
+++ b/proxy/proxypair.coffee
@@ -171,7 +171,7 @@ class ProxyPair
  @relay.bufferedAmount < @MAX_BUFFER &&
  @c2rSchedule.length > 0
 chunk = @c2rSchedule.shift()
-@rateLimit.update chunk.length
+@rateLimit.update chunk.byteLength
 @relay.send chunk
 busy = true
   # websocket --> WebRTC
@@ -179,7 +179,7 @@ class ProxyPair
  @client.bufferedAmount < @MAX_BUFFER &&
  @r2cSchedule.length > 0
 chunk = @r2cSchedule.shift()
-@rateLimit.update chunk.length
+@rateLimit.update chunk.byteLength
 @client.send chunk
 busy = true
 



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

[tor-commits] [snowflake/master] Bump last updated date.

[dcf]

commit 01bdcd6b28a497895e28fcf0b43dfa158506eec1
Author: David Fifield 
Date:   Wed Dec 19 21:34:06 2018 -0700

Bump last updated date.
---
 proxy/static/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proxy/static/index.html b/proxy/static/index.html
index da25032..9b4175e 100644
--- a/proxy/static/index.html
+++ b/proxy/static/index.html
@@ -72,7 +72,7 @@ 
href="https://gitweb.torproject.org/pluggable-transports/snowflake.git/;>
 gitweb.torproject.org/pluggable-transports/snowflake.git
 
 
-Last update: 2018-12-05
+Last update: 2018-12-19
 
 
 

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

[tor-commits] [snowflake/master] Set binaryType="arraybuffer" for RTCDataChannel, just as with WebSocket.

[dcf]

commit aa668bdc92ca76ead1e2816aebe8665377857bba
Author: David Fifield 
Date:   Tue Dec 4 15:28:19 2018 -0700

Set binaryType="arraybuffer" for RTCDataChannel, just as with WebSocket.

The binaryType can be "arraybuffer" or "blob", and "blob" is the
default. The code is only aware of "arraybuffer": I discovered a problem
while running snowflake.html in debug mode; this code fails:
if DEBUG
  # Go sends only raw bytes...
  if '[object ArrayBuffer]' == recv.toString()
bytes = new Uint8Array recv
line = String.fromCharCode.apply(null, bytes)
  line = line.trim()
  log 'WebRTC --> websocket data: ' + line
with the error:
TypeError: line.trim is not a function[Learn More] 
snowflake.js:497:16
because recv is of type Blob, not ArrayBuffer.

Despite the unexpected type, the code seemed to work as expected when
not in debug mode. Though the two types provide different interfaces,
they are both valid to pass on to WebSocket.send. The only other thing
we did with it was try to read the .length member for rate-limiting
purposes:
@rateLimit.update chunk.length
but .length is incorrect for either type: Blob uses .size and
ArrayBuffer uses .byteLength. It worked anyway, because
DummyRateLimit.update doesn't actually look at its argument.

We were already setting binaryType="arraybuffer" for WebSocket
connections.
---
 proxy/proxypair.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee
index 2adbc23..e3a7f46 100644
--- a/proxy/proxypair.coffee
+++ b/proxy/proxypair.coffee
@@ -88,6 +88,7 @@ class ProxyPair
   # TODO: Change this for multiplexing.
   snowflake.reset()
 channel.onerror = -> log 'Data channel error!'
+channel.binaryType = "arraybuffer"
 channel.onmessage = @onClientToRelayMessage
 
   # Assumes WebRTC datachannel is connected.



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

[snowflake/master] Log WebSocket→WebRTC messages in debug mode.

[dcf]

commit 7c519b2975642dbe36f35216cbf48b334499408b
Author: David Fifield 
Date:   Tue Dec 4 15:48:13 2018 -0700

Log WebSocket→WebRTC messages in debug mode.

Same as the other direction.
---
 proxy/proxypair.coffee | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee
index 195f8fe..4f401b0 100644
--- a/proxy/proxypair.coffee
+++ b/proxy/proxypair.coffee
@@ -139,8 +139,9 @@ class ProxyPair
 
   # websocket --> WebRTC
   onRelayToClientMessage: (event) =>
+if DEBUG
+  log 'websocket --> WebRTC data: ' + event.data.byteLength + ' bytes'
 @r2cSchedule.push event.data
-# log 'websocket --> WebRTC data: ' + event.data.byteLength + ' bytes'
 @flush()
 
   onError: (event) =>



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

[tor-commits] [snowflake/master] Test ProxyPair with ArrayBuffers, not strings.

[dcf]

commit 297ae7b1b8800f7c70d31da034ae3802c39273c9
Author: David Fifield 
Date:   Tue Dec 4 16:55:12 2018 -0700

Test ProxyPair with ArrayBuffers, not strings.
---
 proxy/spec/proxypair.spec.coffee | 29 +
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/proxy/spec/proxypair.spec.coffee b/proxy/spec/proxypair.spec.coffee
index 4cbb38d..566c6f1 100644
--- a/proxy/spec/proxypair.spec.coffee
+++ b/proxy/spec/proxypair.spec.coffee
@@ -2,6 +2,25 @@
 jasmine tests for Snowflake proxypair
 ###
 
+# Replacement for MessageEvent constructor.
+# https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent/MessageEvent
+MessageEvent = (type, init) ->
+  init
+
+# Asymmetic matcher that checks that two arrays have the same contents.
+arrayMatching = (sample) -> {
+  asymmetricMatch: (other) ->
+a = new Uint8Array(sample)
+b = new Uint8Array(other)
+if a.length != b.length
+  return false
+for _, i in a
+  if a[i] != b[i]
+return false
+true
+  jasmineToString: ->
+''
+}
 
 describe 'ProxyPair', ->
   fakeRelay = Parse.address '0.0.0.0:12345'
@@ -76,17 +95,19 @@ describe 'ProxyPair', ->
   }
   spyOn pp.client, 'send'
   spyOn pp.relay, 'send'
-  pp.c2rSchedule.push 'foo'
+  msg = new MessageEvent("message", { data: Uint8Array.from([1, 2, 
3]).buffer })
+  pp.onClientToRelayMessage(msg)
   pp.flush()
   expect(pp.client.send).not.toHaveBeenCalled()
-  expect(pp.relay.send).toHaveBeenCalledWith 'foo'
+  expect(pp.relay.send).toHaveBeenCalledWith arrayMatching([1, 2, 3])
 
 it 'proxies data from relay to client', ->
   spyOn pp.client, 'send'
   spyOn pp.relay, 'send'
-  pp.r2cSchedule.push 'bar'
+  msg = new MessageEvent("message", { data: Uint8Array.from([4, 5, 
6]).buffer })
+  pp.onRelayToClientMessage(msg)
   pp.flush()
-  expect(pp.client.send).toHaveBeenCalledWith 'bar'
+  expect(pp.client.send).toHaveBeenCalledWith arrayMatching([4, 5, 6])
   expect(pp.relay.send).not.toHaveBeenCalled()
 
 it 'sends nothing with nothing to flush', ->



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

[tor-commits] [snowflake/master] Only console.log the number of bytes, not the literal message.

[dcf]

commit f06104d182454730c4a0916702b7ee83bce822b8
Author: David Fifield 
Date:   Tue Dec 4 15:50:54 2018 -0700

Only console.log the number of bytes, not the literal message.

It doesn't really help to have a bunch TLS application records
interpreted as a string written to the console.
---
 proxy/proxypair.coffee | 12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee
index e3a7f46..195f8fe 100644
--- a/proxy/proxypair.coffee
+++ b/proxy/proxypair.coffee
@@ -132,21 +132,15 @@ class ProxyPair
 
   # WebRTC --> websocket
   onClientToRelayMessage: (msg) =>
-line = recv = msg.data
 if DEBUG
-  # Go sends only raw bytes...
-  if '[object ArrayBuffer]' == recv.toString()
-bytes = new Uint8Array recv
-line = String.fromCharCode.apply(null, bytes)
-  line = line.trim()
-  log 'WebRTC --> websocket data: ' + line
-@c2rSchedule.push recv
+  log 'WebRTC --> websocket data: ' + msg.data.byteLength + ' bytes'
+@c2rSchedule.push msg.data
 @flush()
 
   # websocket --> WebRTC
   onRelayToClientMessage: (event) =>
 @r2cSchedule.push event.data
-# log 'websocket-->WebRTC data: ' + event.data
+# log 'websocket --> WebRTC data: ' + event.data.byteLength + ' bytes'
 @flush()
 
   onError: (event) =>



___
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 28752: Don't download tor-android-binary resources during build

[gk]

commit 9b0b7b5159e670e04d5705350f33f8b2aa056634
Author: sisbell 
Date:   Sun Dec 16 12:57:25 2018 -0800

Bug 28752: Don't download tor-android-binary resources during build
---
 projects/firefox/build | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index da82862..b9d9d5a 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -99,9 +99,14 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] 
.mozconfig
 
 [% IF c("var/android") %]
   export GRADLE_MAVEN_REPOSITORIES="file:///var/tmp/gradle-dependencies"
+  gradle_repo=/var/tmp/gradle-dependencies
   # Move Gradle Repo to hard-coded location. This location is embedded in the 
file
   # chrome/toolkit/content/global/buildconfig.html so needs to be standard for 
reproducibility
-  mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] 
/var/tmp/gradle-dependencies
+  mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] $gradle_repo
+  # The download script assumes the artifact package name is the complete URL 
path.
+  # In some cases this is incorrect, so copy those artifacts to the correct 
location
+  cp -r $gradle_repo/guardianproject/gpmaven/master/* $gradle_repo
+  # Move orbot files so they will be included in the apk during the build
   cp $rootdir/[% c('input_files_by_name/orbot') %]/* mobile/android/app
   # Prepare building the multi-locale .apk
   mkdir -p /var/tmp/dist/locales

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

[tor-commits] [research-web/master] Add irl's modern-collector report.

[karsten]

commit cf03e0df6edfd948abd674e473ef5230bf06cc46
Author: Karsten Loesing 
Date:   Wed Dec 19 22:03:44 2018 +0100

Add irl's modern-collector report.
---
 techreports.bib | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/techreports.bib b/techreports.bib
index 97dda56..8841ce0 100644
--- a/techreports.bib
+++ b/techreports.bib
@@ -1,3 +1,13 @@
+@techreport{tor-2018-12-001,
+  author = {Iain R. Learmonth and Karsten Loesing},
+  title = {Towards Modernising Data Collection and Archive for the {Tor} 
Network},
+  institution = {The Tor Project},
+  number = {2018-12-001},
+  year = {2018},
+  month = {December},
+  url = 
{https://research.torproject.org/techreports/modern-collector-2018-12-19.pdf},
+}
+
 @techreport{tor-2017-04-001,
   author = {Karin Herm},
   title = {Privacy analysis of {Tor}'s in-memory statistics},

___
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.5] test_rebind: wait for tor to timeout, even if it is logging a lot

[nickm]

commit 315c21d2e200fc45e4886fb7ab32e01a3a8354e9
Author: Nick Mathewson 
Date:   Mon Dec 17 09:53:17 2018 -0500

test_rebind: wait for tor to timeout, even if it is logging a lot

Fixes bug 28883; bugfix on 0.3.5.4-alpha.
---
 changes/ticket28883 | 4 
 src/test/test_rebind.py | 6 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/changes/ticket28883 b/changes/ticket28883
new file mode 100644
index 0..1d8b6cb41
--- /dev/null
+++ b/changes/ticket28883
@@ -0,0 +1,4 @@
+  o Minor bugfixes (testing):
+- Make sure that test_rebind.py actually obeys its timeout, even
+  when it receives a large number of log messages. Fixes bug 28883;
+  bugfix on 0.3.5.4-alpha.
diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py
index 2215b4225..92a346775 100644
--- a/src/test/test_rebind.py
+++ b/src/test/test_rebind.py
@@ -11,7 +11,6 @@ import time
 
 LOG_TIMEOUT = 60.0
 LOG_WAIT = 0.1
-LOG_CHECK_LIMIT = LOG_TIMEOUT / LOG_WAIT
 
 def fail(msg):
 logging.error('FAIL')
@@ -25,8 +24,8 @@ def try_connecting_to_socksport():
 socks_socket.close()
 
 def wait_for_log(s):
-log_checked = 0
-while log_checked < LOG_CHECK_LIMIT:
+cutoff = time.time() + LOG_TIMEOUT
+while time.time() < cutoff:
 l = tor_process.stdout.readline()
 l = l.decode('utf8')
 if s in l:
@@ -37,7 +36,6 @@ def wait_for_log(s):
 # avoid busy-waiting
 if len(s) == 0:
 time.sleep(LOG_WAIT)
-log_checked += 1
 fail('Could not find "{}" in logs after {} seconds'.format(s, LOG_TIMEOUT))
 
 def pick_random_port():



___
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.5] Merge branch 'maint-0.3.5' into release-0.3.5

[nickm]

commit bc6f14913340bee158932488492e1d729add145b
Merge: 6d375e1cb b7018b1a2
Author: Nick Mathewson 
Date:   Wed Dec 19 15:36:08 2018 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

 changes/ticket28883 | 4 
 src/test/test_rebind.py | 6 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

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

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

[nickm]

commit b7018b1a24fbdaed2805e11b0343e03445f8cb7e
Merge: 26bbeb298 315c21d2e
Author: Nick Mathewson 
Date:   Wed Dec 19 15:36:03 2018 -0500

Merge branch 'ticket28883_035' into maint-0.3.5

 changes/ticket28883 | 4 
 src/test/test_rebind.py | 6 ++
 2 files changed, 6 insertions(+), 4 deletions(-)




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

[tor-commits] [tor/master] test_rebind: wait for tor to timeout, even if it is logging a lot

[nickm]

commit 315c21d2e200fc45e4886fb7ab32e01a3a8354e9
Author: Nick Mathewson 
Date:   Mon Dec 17 09:53:17 2018 -0500

test_rebind: wait for tor to timeout, even if it is logging a lot

Fixes bug 28883; bugfix on 0.3.5.4-alpha.
---
 changes/ticket28883 | 4 
 src/test/test_rebind.py | 6 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/changes/ticket28883 b/changes/ticket28883
new file mode 100644
index 0..1d8b6cb41
--- /dev/null
+++ b/changes/ticket28883
@@ -0,0 +1,4 @@
+  o Minor bugfixes (testing):
+- Make sure that test_rebind.py actually obeys its timeout, even
+  when it receives a large number of log messages. Fixes bug 28883;
+  bugfix on 0.3.5.4-alpha.
diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py
index 2215b4225..92a346775 100644
--- a/src/test/test_rebind.py
+++ b/src/test/test_rebind.py
@@ -11,7 +11,6 @@ import time
 
 LOG_TIMEOUT = 60.0
 LOG_WAIT = 0.1
-LOG_CHECK_LIMIT = LOG_TIMEOUT / LOG_WAIT
 
 def fail(msg):
 logging.error('FAIL')
@@ -25,8 +24,8 @@ def try_connecting_to_socksport():
 socks_socket.close()
 
 def wait_for_log(s):
-log_checked = 0
-while log_checked < LOG_CHECK_LIMIT:
+cutoff = time.time() + LOG_TIMEOUT
+while time.time() < cutoff:
 l = tor_process.stdout.readline()
 l = l.decode('utf8')
 if s in l:
@@ -37,7 +36,6 @@ def wait_for_log(s):
 # avoid busy-waiting
 if len(s) == 0:
 time.sleep(LOG_WAIT)
-log_checked += 1
 fail('Could not find "{}" in logs after {} seconds'.format(s, LOG_TIMEOUT))
 
 def pick_random_port():



___
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.5'

[nickm]

commit 1c47459e5a5ed6d404a8034502543e7e4a67be38
Merge: ed0bc85ed b7018b1a2
Author: Nick Mathewson 
Date:   Wed Dec 19 15:36:08 2018 -0500

Merge branch 'maint-0.3.5'

 changes/ticket28883 | 4 
 src/test/test_rebind.py | 6 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'ticket28883_035' into maint-0.3.5

[nickm]

commit b7018b1a24fbdaed2805e11b0343e03445f8cb7e
Merge: 26bbeb298 315c21d2e
Author: Nick Mathewson 
Date:   Wed Dec 19 15:36:03 2018 -0500

Merge branch 'ticket28883_035' into maint-0.3.5

 changes/ticket28883 | 4 
 src/test/test_rebind.py | 6 ++
 2 files changed, 6 insertions(+), 4 deletions(-)




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

[tor-commits] [tor/maint-0.3.5] test_rebind: wait for tor to timeout, even if it is logging a lot

[nickm]

commit 315c21d2e200fc45e4886fb7ab32e01a3a8354e9
Author: Nick Mathewson 
Date:   Mon Dec 17 09:53:17 2018 -0500

test_rebind: wait for tor to timeout, even if it is logging a lot

Fixes bug 28883; bugfix on 0.3.5.4-alpha.
---
 changes/ticket28883 | 4 
 src/test/test_rebind.py | 6 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/changes/ticket28883 b/changes/ticket28883
new file mode 100644
index 0..1d8b6cb41
--- /dev/null
+++ b/changes/ticket28883
@@ -0,0 +1,4 @@
+  o Minor bugfixes (testing):
+- Make sure that test_rebind.py actually obeys its timeout, even
+  when it receives a large number of log messages. Fixes bug 28883;
+  bugfix on 0.3.5.4-alpha.
diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py
index 2215b4225..92a346775 100644
--- a/src/test/test_rebind.py
+++ b/src/test/test_rebind.py
@@ -11,7 +11,6 @@ import time
 
 LOG_TIMEOUT = 60.0
 LOG_WAIT = 0.1
-LOG_CHECK_LIMIT = LOG_TIMEOUT / LOG_WAIT
 
 def fail(msg):
 logging.error('FAIL')
@@ -25,8 +24,8 @@ def try_connecting_to_socksport():
 socks_socket.close()
 
 def wait_for_log(s):
-log_checked = 0
-while log_checked < LOG_CHECK_LIMIT:
+cutoff = time.time() + LOG_TIMEOUT
+while time.time() < cutoff:
 l = tor_process.stdout.readline()
 l = l.decode('utf8')
 if s in l:
@@ -37,7 +36,6 @@ def wait_for_log(s):
 # avoid busy-waiting
 if len(s) == 0:
 time.sleep(LOG_WAIT)
-log_checked += 1
 fail('Could not find "{}" in logs after {} seconds'.format(s, LOG_TIMEOUT))
 
 def pick_random_port():



___
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.5] Merge branch 'ticket28883_035' into maint-0.3.5

[nickm]

commit b7018b1a24fbdaed2805e11b0343e03445f8cb7e
Merge: 26bbeb298 315c21d2e
Author: Nick Mathewson 
Date:   Wed Dec 19 15:36:03 2018 -0500

Merge branch 'ticket28883_035' into maint-0.3.5

 changes/ticket28883 | 4 
 src/test/test_rebind.py | 6 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

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

[tor-commits] [metrics-web/master] Take out "We're hiring" link from start page.

[karsten]

commit 54930cb95f685f7a42610edd4ae2a39f2add7116
Author: Karsten Loesing 
Date:   Wed Dec 19 21:05:01 2018 +0100

Take out "We're hiring" link from start page.
---
 src/main/resources/web/jsps/index.jsp | 5 -
 1 file changed, 5 deletions(-)

diff --git a/src/main/resources/web/jsps/index.jsp 
b/src/main/resources/web/jsps/index.jsp
index fbccd7d..3fa49b8 100644
--- a/src/main/resources/web/jsps/index.jsp
+++ b/src/main/resources/web/jsps/index.jsp
@@ -6,11 +6,6 @@
 
 
   
-
-  
-We're hiring  The Tor Project is seeking an 
experienced Data Architect to take our metrics work to the next level. https://www.torproject.org/about/jobs-metrics-data-architect.html.en; 
target="_blank">Read the job posting.
-  
-
   
 Welcome to Tor Metrics!
 

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

[tor-commits] [metrics-web/master] Use readr to speed up drawing graphs.

[karsten]

commit 2c44721c9ab903183558b92d7a4e17674fcb79be
Author: Karsten Loesing 
Date:   Mon Dec 17 21:03:16 2018 +0100

Use readr to speed up drawing graphs.

Over two years ago, in commit 1f90b72 from October 2016, we made our
user graphs faster by avoiding to read the large .csv file on demand.
Instead we read it once as part of the daily update, saved it to disk
as .RData file using R's save() function, and loaded it back to memory
using R's load() function when drawing a graph.

This approach worked okay. It just had two disadvantages:

 1. We had to write a small amount of R code for each graph type,
which is why we only did it for graphs with large .csv files.
 2. Running these small R script as part of the daily update made it
harder to move away from Ant towards a Java-only execution model.

The new approach implemented in this commit uses read_csv() fromt the
readr package which reads CSV files several times faster than
read.csv().

Requires installing the readr package from CRAN, which is available on
Debian in stretch-backports and later as r-cran-readr.

Implements #28799.
---
 build.xml  |  14 ---
 src/main/R/clients/split-clients.R |  12 ---
 src/main/R/rserver/graphs.R| 169 +
 src/main/R/rserver/rserve-init.R   |   1 +
 src/main/R/webstats/write-RData.R  |  16 
 5 files changed, 136 insertions(+), 76 deletions(-)

diff --git a/build.xml b/build.xml
index 89c8b31..250417e 100644
--- a/build.xml
+++ b/build.xml
@@ -362,8 +362,6 @@
 
 
 
-
-
 
 
@@ -410,10 +408,6 @@
 
 
 
-
-
-  
-
   
 
   
@@ -426,13 +420,7 @@
 
   
 
-
-
-
 
-
-  
-
   
 
   
@@ -482,8 +470,6 @@
   
 
 
-  
-  
   
 
   
diff --git a/src/main/R/clients/split-clients.R 
b/src/main/R/clients/split-clients.R
deleted file mode 100644
index 9f80902..000
--- a/src/main/R/clients/split-clients.R
+++ /dev/null
@@ -1,12 +0,0 @@
-dir.create("RData", showWarnings = FALSE)
-
-c <- read.csv("clients.csv", stringsAsFactors = FALSE)
-data <- c[c$node == 'relay', !(names(c) %in% c("node"))]
-save(data, file = "RData/clients-relay.RData")
-data <- c[c$node == 'bridge', !(names(c) %in% c("node"))]
-save(data, file = "RData/clients-bridge.RData")
-
-u <- read.csv("userstats-combined.csv", stringsAsFactors = FALSE)
-data <- u[, !(names(u) %in% c("node", "version"))]
-save(data, file = "RData/userstats-bridge-combined.RData")
-
diff --git a/src/main/R/rserver/graphs.R b/src/main/R/rserver/graphs.R
index 7501a95..e541c30 100644
--- a/src/main/R/rserver/graphs.R
+++ b/src/main/R/rserver/graphs.R
@@ -348,6 +348,9 @@ robust_call <- function(wrappee, filename) {
})
 }
 
+# Disable readr's automatic progress bar.
+options(readr.show_progress = FALSE)
+
 prepare_networksize <- function(start_p, end_p) {
   read.csv(paste(stats_dir, "networksize.csv", sep = ""),
 colClasses = c("date" = "Date")) %>%
@@ -863,8 +866,19 @@ write_bandwidth_flags <- function(start_p = NULL, end_p = 
NULL, path_p) {
 
 plot_userstats <- function(start_p, end_p, node_p, variable_p, value_p,
 events_p, path_p) {
-  load(paste(rdata_dir, "clients-", node_p, ".RData", sep = ""))
-  c <- data
+  c <- read_csv(file = paste(stats_dir, "clients.csv", sep = ""),
+  col_types = cols(
+date = col_date(format = ""),
+node = col_character(),
+country = col_character(),
+transport = col_character(),
+version = col_character(),
+lower = col_double(),
+upper = col_double(),
+clients = col_double(),
+frac = col_skip()),
+  na = character()) %>%
+filter(node == node_p)
   u <- c[c$date >= start_p & c$date <= end_p, c("date", "country", "transport",
   "version", "lower", "upper", "clients")]
   u <- rbind(u, data.frame(date = start_p,
@@ -1011,14 +1025,24 @@ plot_userstats_bridge_version <- function(start_p, 
end_p, version_p, path_p) {
 
 write_userstats_relay_country <- function(start_p = NULL, end_p = NULL,
 country_p = NULL, events_p = NULL, path_p) {
-  load(paste(rdata_dir, "clients-relay.RData", sep = ""))
-  u <- data %>%
+  read_csv(file = paste(stats_dir, "clients.csv", sep = ""),
+  col_types = cols(
+date = col_date(format = ""),
+node = col_character(),
+country = col_character(),
+transport = col_character(),
+version = col_character(),
+lower = col_double(),
+upper = col_double(),
+clients = col_double(),
+frac = col_double())) %>%
+filter(node == "relay") %>%
 filter(if (!is.null(start_p)) date >= as.Date(start_p) else TRUE) %>%
 filter(if (!is.null(end_p)) date <= as.Date(end_p) else TRUE) %>%
 filter(if (!is.null(country_p))
   country == ifelse(country_p == "all", "", country_p) else TRUE) %>%
-

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

[translation]

commit ebbe5ac01596e6886aa6394f5fdd2d332c928502
Author: Translation commit bot 
Date:   Wed Dec 19 17:45:23 2018 +

Update translations for donatepages-messagespot
---
 locale/ka/LC_MESSAGES/messages.po | 27 ---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/locale/ka/LC_MESSAGES/messages.po 
b/locale/ka/LC_MESSAGES/messages.po
index bb1642f34..a84a95a6b 100644
--- a/locale/ka/LC_MESSAGES/messages.po
+++ b/locale/ka/LC_MESSAGES/messages.po
@@ -409,6 +409,8 @@ msgstr ""
 msgid ""
 "The paid staff of the Tor Project is very small: about 47 people in total."
 msgstr ""
+"ანაზღაურების მქონე თანამშრ
ომელი Tor-პროქტში მხოლოდ მცირე რ
აოდენობითაა: ჯამში"
+" დაახლოებით 47 ადამიანი."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:90
 msgid ""
@@ -570,6 +572,8 @@ msgid ""
 "I would like to know more about how Tor works, what onion services are, or "
 "how to run a relay."
 msgstr ""
+"მსურს ვიხილო უფრო ვრცლად, რ
ოგორ მუშაობს Tor, რას წარ
მოადგენს onion-"
+"მომსახურებები ან როგორ 
ხდება გადამცემის გაშვება."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:158
 msgid ""
@@ -701,6 +705,9 @@ msgid ""
 " foundations, research institutions, private companies, and over 20,000 "
 "personal donations from people like you."
 msgstr ""
+"Tor-ს ფინანსურად მხარს უჭერს 
შეერთებული შტატების სამთავრ
ობო, არასამთავრობო "
+"და კერძო ფონდები, კვლევითი და 
კერძო დაწესებულებები, აგრ
ეთვე 20,000 ისეთივე "
+"რიგითი შემომწირველი, როგორ
იც თქვენ ბრძანდებით."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:212
 msgid ""
@@ -748,7 +755,7 @@ msgstr "რა ოდენობის თანხას 
ხარჯავს
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:228
 msgid "The Tor Project spends about $4 million annually."
-msgstr ""
+msgstr "Tor-პროექტი საჭიროებს 
დაახლოებით $4 მილიონს 
ყოველწლიურად."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:230
 #, php-format
@@ -803,6 +810,13 @@ msgid ""
 "  Phone number: 206-420-3136\n"
 "  Contact person: Isabela Bagueros, Executive Director"
 msgstr ""
+"Tor-პროექტის საგადასახადო 
ID-ნომერი (EIN #): 20-8096820\n"
+"  მისამართი:\n"
+"  The Tor Project, Inc.\n"
+"  217 First Avenue South #4903\n"
+"  Seattle, WA  98194\n"
+"  სატელეფონო ნომერი: 
206-420-3136\n"
+"  საკონტაქტო პირი: Isabela 
Bagueros, Executive Director"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:264
 msgid "If I am not in the United States, can I still donate?"
@@ -1085,6 +1099,8 @@ msgid ""
 "(Also, if you wanted, you could give us $4,999 in late 2018 and $4,999 in "
 "early 2019.)"
 msgstr ""
+"(ასევე, სურვილის შემთხვევაში 
შეგიძლიათ $4,999 შეიტანოთ 2018 წლის 
ბოლოსკენ და"
+" 2019 წლის დასაწყისშიც კვლავ $4,999.)"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:403
 msgid ""
@@ -1256,6 +1272,8 @@ msgid ""
 "Our mailing address is The Tor Project, 217 First Avenue South #4903, "
 "Seattle WA 98194, USA"
 msgstr ""
+"ჩვენი საფოსტო მონაცემებია The 
Tor Project, 217 First Avenue South #4903, "
+"Seattle WA 98194, USA"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:486
 msgid "Do you accept cash donations?"
@@ -1849,7 +1867,7 @@ msgstr "კომენტარები"
 
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:463
 msgid "Donating:"
-msgstr ""
+msgstr "შემოწირულობა:"
 
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:470
 msgid "Donate"
@@ -1915,7 +1933,7 @@ 

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

[translation]

commit 1606aa3dc7a7bc4d4b473f817c5db1f37b679560
Author: Translation commit bot 
Date:   Wed Dec 19 16:16:27 2018 +

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

diff --git a/gl/gl.po b/gl/gl.po
index 328b6d67b..6c41f0a6b 100644
--- a/gl/gl.po
+++ b/gl/gl.po
@@ -3,14 +3,22 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR , YEAR.
 # 
+# Translators:
+# Tor Project , 2016
+# Xan VFR, 2016
+# Miguel Anxo Bouzada , 2016
+# Xosé M. Lamas , 2017
+# Uberius Crypto , 2018
+# Rodrigo Boado , 2018
+# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-04 09:46+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Uberius Crypto , 2018\n"
+"PO-Revision-Date: 2016-11-18 21:29+\n"
+"Last-Translator: Rodrigo Boado , 2018\n"
 "Language-Team: Galician (https://www.transifex.com/otf/teams/1519/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -109,7 +117,7 @@ msgstr ""
 
 #: ../data/greeter.ui.h:23
 msgid "Default Settings"
-msgstr ""
+msgstr "Axustes por defecto"
 
 #: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"

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

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

[translation]

commit 248fe4558ff9b85124bb7f14e5073221b7f5b271
Author: Translation commit bot 
Date:   Wed Dec 19 15:45:21 2018 +

Update translations for donatepages-messagespot
---
 locale/it/LC_MESSAGES/messages.po | 5 +
 1 file changed, 5 insertions(+)

diff --git a/locale/it/LC_MESSAGES/messages.po 
b/locale/it/LC_MESSAGES/messages.po
index 8c1b6e749..9e8c0bcfc 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -1127,12 +1127,17 @@ msgid ""
 "do anything else that would publicly identify you as someone who has "
 "donated."
 msgstr ""
+"Ciò significa che non riporteremo il tuo nome sul nostro sito, nessun grazie"
+" su Twitter, o qualsiasi altra cosa che ti identificherebbe pubblicamente "
+"come donatore."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:417
 msgid ""
 "If we decide we would like to publicly name you as a donor, we will ask you "
 "first, and will not do it until and unless you say it's okay."
 msgstr ""
+"Se decidiamo che ci piacerebbe parlare di te pubblicamente, prima te lo "
+"chiederemmo, e non lo faremmo finchè e se ci dicessi che va bene."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:423
 msgid ""

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

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

[translation]

commit cfbf966817e8d57783cddee3a3a384ec769106d2
Author: Translation commit bot 
Date:   Wed Dec 19 15:15:21 2018 +

Update translations for donatepages-messagespot
---
 locale/it/LC_MESSAGES/messages.po | 44 +++
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/locale/it/LC_MESSAGES/messages.po 
b/locale/it/LC_MESSAGES/messages.po
index 0b009118f..8c1b6e749 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -7,12 +7,12 @@
 # erinm, 2018
 # Giuseppe Pignataro (Fastbyte01) , 2018
 # Emanuele Trotta , 2018
-# Random_R, 2018
 # Edoardo (chap) , 2018
+# Random_R, 2018
 # 
 msgid ""
 msgstr ""
-"Last-Translator: Edoardo (chap) , 2018\n"
+"Last-Translator: Random_R, 2018\n"
 "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -404,6 +404,8 @@ msgstr ""
 msgid ""
 "The paid staff of the Tor Project is very small: about 47 people in total."
 msgstr ""
+"Il personale retribuito del Progetto Tor è molto ristretto: circa 47 persone"
+" in totale."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:90
 msgid ""
@@ -562,6 +564,8 @@ msgid ""
 "I would like to know more about how Tor works, what onion services are, or "
 "how to run a relay."
 msgstr ""
+"Mi piacerebbe sapere di più su come funziona Tor, cosa sono i servizi "
+"nascosti, o come gestire un relay."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:158
 msgid ""
@@ -674,6 +678,9 @@ msgid ""
 "href=\"https://www.torproject.org/about/financials.html.en\;>financial "
 "statements, and its Form 990."
 msgstr ""
+"Ecco il https://www.torproject.org/about/financials.html.en\;>bilancio "
+"d'esercizio e il Form 990 del Progetto Tor."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:206
 msgid "Where does the Tor Project's money come from?"
@@ -685,6 +692,9 @@ msgid ""
 " foundations, research institutions, private companies, and over 20,000 "
 "personal donations from people like you."
 msgstr ""
+"Tor è supportato da agenzie di finanziamento del governo degli Stati Uniti, "
+"ONG, fondazioni private, istituti di ricerca, aziende private e oltre 20.000"
+" donazioni personali da persone come te."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:212
 msgid ""
@@ -731,7 +741,7 @@ msgstr "Quanti soldi spende il Progetto Tor ogni anno e a 
cosa serve?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:228
 msgid "The Tor Project spends about $4 million annually."
-msgstr ""
+msgstr "Il Progetto Tor spende circa $4 milioni all'anno."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:230
 #, php-format
@@ -786,6 +796,13 @@ msgid ""
 "  Phone number: 206-420-3136\n"
 "  Contact person: Isabela Bagueros, Executive Director"
 msgstr ""
+"Tax ID Number del Progetto Tor(EIN #): 20-8096820\n"
+"  Indirizzo:\n"
+"  The Tor Project, Inc.\n"
+"  217 First Avenue South #4903\n"
+"  Seattle, WA  98194\n"
+"  Numero di telefono: 206-420-3136\n"
+"  Referente: Isabela Bagueros, Executive Director"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:264
 msgid "If I am not in the United States, can I still donate?"
@@ -815,7 +832,7 @@ msgstr ""
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:280
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:560
 msgid "No, sorry."
-msgstr ""
+msgstr "No, spiacenti."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:282
 msgid ""
@@ -1032,6 +1049,8 @@ msgid ""
 "Is the Tor Project required to identify me as a donor to the United States "
 "government, or to any other authority?"
 msgstr ""
+"Il Progetto Tor è obbligato a identificarmi come donatore al governo degli "
+"Stati Uniti o a qualsiasi altra autorità?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:391
 msgid ""
@@ -1039,6 +1058,10 @@ msgid ""
 "required to report the donation amount and your name and address (if we have"
 " it) to the IRS, on Schedule B of the Form 990, which is filed annually."
 msgstr ""
+"Se doni $5.000 o più al Progetto Tor in un solo anno, siamo obbligati a "
+"segnalare l'ammontare della donazione e il tuo nome e indirizzo (se li "
+"conosciamo) all'IRS, nello Schedule B del Form 990, che viene compilato "
+"annualmente."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:393
 msgid ""
@@ -1046,24 +1069,33 @@ msgid ""
 "from the copy of the 990 that's made 

[tor-commits] [webwml/master] Update contact details - clean up merge conflict

[hiro]

commit e33a332fd7404f133a44b61b564866a9d01913b6
Author: hiro 
Date:   Wed Dec 19 12:23:57 2018 +0100

Update contact details - clean up merge conflict
---
 about/en/contact.wml | 5 -
 1 file changed, 5 deletions(-)

diff --git a/about/en/contact.wml b/about/en/contact.wml
index 8dbd42c7..7234f855 100644
--- a/about/en/contact.wml
+++ b/about/en/contact.wml
@@ -157,13 +157,8 @@ sub   4096R/C00942E4 2017-03-13
 Mailing Address
 Should you need to reach us via old-fashioned mail, our mailing
 address is:
-<<< HEAD
-The Tor Project
-217 First Ave South #4903
-===
 The Tor Project, Inc.
 P.O. Box 4903
->>> Update contact details
 Seattle, WA 98194 USA
 
 

___
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

[translation]

commit ba6b79d8d61d09b568124b6f5af28ff4e25ca167
Author: Translation commit bot 
Date:   Wed Dec 19 10:45:14 2018 +

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

diff --git a/bn/LC_MESSAGES/bridgedb.po b/bn/LC_MESSAGES/bridgedb.po
index e08a9234c..e609f7c26 100644
--- a/bn/LC_MESSAGES/bridgedb.po
+++ b/bn/LC_MESSAGES/bridgedb.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: 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-11-27 18:52+\n"
+"PO-Revision-Date: 2018-12-19 10:20+\n"
 "Last-Translator: code smite \n"
 "Language-Team: Bengali 
(http://www.transifex.com/otf/torproject/language/bn/)\n"
 "MIME-Version: 1.0\n"
@@ -47,7 +47,7 @@ msgstr "সোর্স কোড"
 
 #: bridgedb/https/templates/base.html:85
 msgid "Changelog"
-msgstr "পরিবর্তণের তালিকা"
+msgstr "পরিবর্তনের তালিকা"
 
 #: bridgedb/https/templates/base.html:88
 msgid "Contact"

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

[tor-commits] [webwml/master] Update contact details

[hiro]

commit 1cd1d458f26521b93642f7d9084b8fa424fced9a
Author: hiro 
Date:   Wed Dec 19 09:51:56 2018 +0100

Update contact details
---
 about/en/contact.wml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/about/en/contact.wml b/about/en/contact.wml
index 82beb88b..8dbd42c7 100644
--- a/about/en/contact.wml
+++ b/about/en/contact.wml
@@ -157,8 +157,13 @@ sub   4096R/C00942E4 2017-03-13
 Mailing Address
 Should you need to reach us via old-fashioned mail, our mailing
 address is:
+<<< HEAD
 The Tor Project
 217 First Ave South #4903
+===
+The Tor Project, Inc.
+P.O. Box 4903
+>>> Update contact details
 Seattle, WA 98194 USA
 
 

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

[tor-commits] [translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed

[translation]

commit 68cab514fbf736937c468204ac3ab3246ae66f96
Author: Translation commit bot 
Date:   Wed Dec 19 08:47:35 2018 +

Update translations for tbmanual-contentspot_completed
---
 contents+he.po | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/contents+he.po b/contents+he.po
index efccba83f..823a3979f 100644
--- a/contents+he.po
+++ b/contents+he.po
@@ -111,6 +111,12 @@ msgid ""
 "href=\"https://www.torproject.org/docs/faq#EntryGuards\;>FAQ and https://support.torproject.org/tbb/tbb-2/\;>Support Portal."
 msgstr ""
+"במעגל, צומת השומר או צומת הכניסה הוא הצומת 
הראשון והוא נבחר אוטומטית ואקראית"
+" ע\"י Tor. אבל הוא שונה מצמתים אחרים במעגל. על 
מנת להימנע ממתקפות פרופיל, "
+"צומת השומר משתנה רק לאחר 2-3 חודשים, ובשונה 
מצמתים אחרים, אשר משתנים עם כל "
+"תחום חדש. לעוד מידע אודות שומרים, היווץ בhttps://www.torproject.org/docs/faq#EntryGuards\;>שאלות נ
פוצות "
+"ובhttps://support.torproject.org/tbb/tbb-2/\;>פורטל 
התמיכה."
 
 #: https//tb-manual.torproject.org/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)

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

[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

[translation]

commit 25b8dfea4f9567dcb9a2a4b05fc57e76971a81f9
Author: Translation commit bot 
Date:   Wed Dec 19 08:47:28 2018 +

Update translations for tbmanual-contentspot
---
 contents+he.po | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/contents+he.po b/contents+he.po
index efccba83f..823a3979f 100644
--- a/contents+he.po
+++ b/contents+he.po
@@ -111,6 +111,12 @@ msgid ""
 "href=\"https://www.torproject.org/docs/faq#EntryGuards\;>FAQ and https://support.torproject.org/tbb/tbb-2/\;>Support Portal."
 msgstr ""
+"במעגל, צומת השומר או צומת הכניסה הוא הצומת 
הראשון והוא נבחר אוטומטית ואקראית"
+" ע\"י Tor. אבל הוא שונה מצמתים אחרים במעגל. על 
מנת להימנע ממתקפות פרופיל, "
+"צומת השומר משתנה רק לאחר 2-3 חודשים, ובשונה 
מצמתים אחרים, אשר משתנים עם כל "
+"תחום חדש. לעוד מידע אודות שומרים, היווץ בhttps://www.torproject.org/docs/faq#EntryGuards\;>שאלות נ
פוצות "
+"ובhttps://support.torproject.org/tbb/tbb-2/\;>פורטל 
התמיכה."
 
 #: https//tb-manual.torproject.org/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)

___
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

[translation]

commit 0bda6886f21da12986d5b668d1d1cf37cf53e904
Author: Translation commit bot 
Date:   Wed Dec 19 08:19:58 2018 +

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

diff --git a/contents+he.po b/contents+he.po
index 96279395b..53475e9f5 100644
--- a/contents+he.po
+++ b/contents+he.po
@@ -3963,6 +3963,8 @@ msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
 "found in our "
 msgstr ""
+"סימן מסחרי, הערות זכויות יוצרים וכללים 
עבור שימוש ע\"י צדדים שלישיים יכולים "
+"להימצא במקומות "
 
 #: templates/layout.html:7
 msgid "Tor Project | Support"

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

[tor-commits] [translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed

[translation]

commit 8c35168f65c31ae15be4a79f2987be36db0a4d4d
Author: Translation commit bot 
Date:   Wed Dec 19 08:17:32 2018 +

Update translations for tbmanual-contentspot_completed
---
 contents+he.po | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/contents+he.po b/contents+he.po
index f62669844..efccba83f 100644
--- a/contents+he.po
+++ b/contents+he.po
@@ -193,6 +193,8 @@ msgid ""
 "Tor Browser features “New Identity” and “New Tor Circuit for this 
Site” "
 "options, located in the main menu (hamburger menu)."
 msgstr ""
+"דפדפן Tor מתווה אפשרויות ”זהות חדשה“ 
ו”מעגל Tor חדש עבור אתר זה“, הממוקמות "
+"בתפריט הראשי (תפריט המבורגר)."
 
 #: https//tb-manual.torproject.org/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)
@@ -440,6 +442,10 @@ msgid ""
 "mirrors, either through [EFF](https://tor.eff.org) or [Calyx "
 "Institute](https://tor.calyxinstitute.org)."
 msgstr ""
+"אם אינך מצליח להוריד את דפדפן Tor מהאתר 
הרשמי של מיזם Tor, אתה יכול במקום "
+"לנסות להוריד אותו מאחת מהמַרְאוֹת הרשמיות 
שלנו, דרך "
+"[EFF](https://tor.eff.org) או [Calyx "
+"Institute](https://tor.calyxinstitute.org)."
 
 #: https//tb-manual.torproject.org/en-US/downloading/
 #: (content/downloading/contents+en-US.lrtopic.body)
@@ -719,6 +725,9 @@ msgid ""
 " of the URL bar, then select 'Tor Network Settings...' to access these "
 "options."
 msgstr ""
+"אם אתה מפעיל את דפדפן Tor בפעם הראשונה, לחץ 
על 'הגדר' כדי לפתוח את החלון של "
+"הגדרות רשת Tor. אחרת, לחץ על Torbutton מימין 
לשורת הכתובת, ואז בחר 'הגדרות "
+"רשת Tor...' כדי להשיג גישה אל אפשרויות אלו."
 
 #: https//tb-manual.torproject.org/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)
@@ -727,6 +736,8 @@ msgid ""
 "Then, select 'Provide a bridge I know' and enter each bridge address on a "
 "separate line."
 msgstr ""
+"בחלון של הגדרות רשת Tor, בחר 'Tor מצונזר במדינ
ה שלי.' לאחר מכן, בחר 'סַפֵּק "
+"גשר שאני מכיר' והכנס כל כתובת גשר בשורה נ
פרדת."
 
 #: https//tb-manual.torproject.org/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)
@@ -1121,6 +1132,9 @@ msgid ""
 "website with https and onion service, it will show an icon of a green onion "
 "and a padlock."
 msgstr ""
+"בעת גישה אל אתר המשתמש בשירות בצל, דפדפן Tor 
יַרְאֶה בשורת הכתובת צלמית של "
+"בצל ירוק קטן המציגה את מצב החיבור שלך: 
מאובטח ושימוש בשירות בצל. בגישה אל "
+"אתר עם https ושירות בצל, הוא יַרְאֶה צלמית של 
בצל ירוק ומנעול."
 
 #: https//tb-manual.torproject.org/en-US/onion-services/
 #: (content/onion-services/contents+en-US.lrtopic.body)
@@ -2152,6 +2166,9 @@ msgid ""
 "There you will find translation guidelines and resources that will help you "
 "contribute to Tor translations."
 msgstr ""
+"לפני שתתרגם, אנא קרא את דף מיזם Tor בכתובת 
[Localization Lab "
+"Wiki](https://wiki.localizationlab.org/index.php/Tor). שם תימצא 
קווים מנחים "
+"של תרגום וכן משאבים שיעזרו לך לתרום אל 
תרגומי Tor."
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2195,6 +2212,8 @@ msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
 "found in our "
 msgstr ""
+"סימן מסחרי, הערות זכויות יוצרים וכללים 
עבור שימוש ע\"י צדדים שלישיים יכולים "
+"להימצא במקומות "
 
 #: templates/layout.html:7
 msgid "Tor Project | Tor Browser Manual"

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

[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

[translation]

commit f2341b5c149af49c6a29f7f0f021d1a33f9ca535
Author: Translation commit bot 
Date:   Wed Dec 19 08:17:23 2018 +

Update translations for tbmanual-contentspot
---
 contents+he.po | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/contents+he.po b/contents+he.po
index f62669844..efccba83f 100644
--- a/contents+he.po
+++ b/contents+he.po
@@ -193,6 +193,8 @@ msgid ""
 "Tor Browser features “New Identity” and “New Tor Circuit for this 
Site” "
 "options, located in the main menu (hamburger menu)."
 msgstr ""
+"דפדפן Tor מתווה אפשרויות ”זהות חדשה“ 
ו”מעגל Tor חדש עבור אתר זה“, הממוקמות "
+"בתפריט הראשי (תפריט המבורגר)."
 
 #: https//tb-manual.torproject.org/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)
@@ -440,6 +442,10 @@ msgid ""
 "mirrors, either through [EFF](https://tor.eff.org) or [Calyx "
 "Institute](https://tor.calyxinstitute.org)."
 msgstr ""
+"אם אינך מצליח להוריד את דפדפן Tor מהאתר 
הרשמי של מיזם Tor, אתה יכול במקום "
+"לנסות להוריד אותו מאחת מהמַרְאוֹת הרשמיות 
שלנו, דרך "
+"[EFF](https://tor.eff.org) או [Calyx "
+"Institute](https://tor.calyxinstitute.org)."
 
 #: https//tb-manual.torproject.org/en-US/downloading/
 #: (content/downloading/contents+en-US.lrtopic.body)
@@ -719,6 +725,9 @@ msgid ""
 " of the URL bar, then select 'Tor Network Settings...' to access these "
 "options."
 msgstr ""
+"אם אתה מפעיל את דפדפן Tor בפעם הראשונה, לחץ 
על 'הגדר' כדי לפתוח את החלון של "
+"הגדרות רשת Tor. אחרת, לחץ על Torbutton מימין 
לשורת הכתובת, ואז בחר 'הגדרות "
+"רשת Tor...' כדי להשיג גישה אל אפשרויות אלו."
 
 #: https//tb-manual.torproject.org/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)
@@ -727,6 +736,8 @@ msgid ""
 "Then, select 'Provide a bridge I know' and enter each bridge address on a "
 "separate line."
 msgstr ""
+"בחלון של הגדרות רשת Tor, בחר 'Tor מצונזר במדינ
ה שלי.' לאחר מכן, בחר 'סַפֵּק "
+"גשר שאני מכיר' והכנס כל כתובת גשר בשורה נ
פרדת."
 
 #: https//tb-manual.torproject.org/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)
@@ -1121,6 +1132,9 @@ msgid ""
 "website with https and onion service, it will show an icon of a green onion "
 "and a padlock."
 msgstr ""
+"בעת גישה אל אתר המשתמש בשירות בצל, דפדפן Tor 
יַרְאֶה בשורת הכתובת צלמית של "
+"בצל ירוק קטן המציגה את מצב החיבור שלך: 
מאובטח ושימוש בשירות בצל. בגישה אל "
+"אתר עם https ושירות בצל, הוא יַרְאֶה צלמית של 
בצל ירוק ומנעול."
 
 #: https//tb-manual.torproject.org/en-US/onion-services/
 #: (content/onion-services/contents+en-US.lrtopic.body)
@@ -2152,6 +2166,9 @@ msgid ""
 "There you will find translation guidelines and resources that will help you "
 "contribute to Tor translations."
 msgstr ""
+"לפני שתתרגם, אנא קרא את דף מיזם Tor בכתובת 
[Localization Lab "
+"Wiki](https://wiki.localizationlab.org/index.php/Tor). שם תימצא 
קווים מנחים "
+"של תרגום וכן משאבים שיעזרו לך לתרום אל 
תרגומי Tor."
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2195,6 +2212,8 @@ msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
 "found in our "
 msgstr ""
+"סימן מסחרי, הערות זכויות יוצרים וכללים 
עבור שימוש ע\"י צדדים שלישיים יכולים "
+"להימצא במקומות "
 
 #: templates/layout.html:7
 msgid "Tor Project | Tor Browser Manual"

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