[tor-commits] [sbws/master] globals: remove unused resolve and can_exit_to functions

[juga]

commit bad22915444fbd647acc40f73ea4dab1615a7f1d
Author: juga0 
Date:   Mon Dec 3 21:37:02 2018 +

globals: remove unused resolve and can_exit_to functions

They were used to resolve the IP of the destination and check
whether an exit policy allows to exit to that IP, but when the
destination is a CDN, the IP locally resolved would be different
to the IP resolved in the exit, and when the IP resolved to
IPv6, it was possible that the scanner didn't have IPv6.
The correct method to check whether an exit policy allows to exit
to an IP, would be to resolve the domain via Tor itself using
RESOLVE and ADDRMAP events with that exit.
---
 sbws/globals.py   | 23 ---
 sbws/lib/relaylist.py | 29 -
 2 files changed, 52 deletions(-)

diff --git a/sbws/globals.py b/sbws/globals.py
index 217e1a7..a621b5f 100644
--- a/sbws/globals.py
+++ b/sbws/globals.py
@@ -1,6 +1,5 @@
 import os
 import logging
-import socket
 
 log = logging.getLogger(__name__)
 
@@ -70,25 +69,3 @@ def touch_file(fname, times=None):
 log.debug('Touching %s', fname)
 with open(fname, 'a') as fd:
 os.utime(fd.fileno(), times=times)
-
-
-def resolve(hostname, ipv4_only=False, ipv6_only=False):
-assert not (ipv4_only and ipv6_only)
-results = []
-try:
-results = socket.getaddrinfo(hostname, 0)
-except socket.gaierror:
-log.warn(
-'Unable to resolve %s hostname. Returning empty list of addresses',
-hostname)
-return []
-ret = set()
-for result in results:
-fam, _, _, _, addr = result
-if fam == socket.AddressFamily.AF_INET6 and not ipv4_only:
-ret.add(addr[0])
-elif fam == socket.AddressFamily.AF_INET and not ipv6_only:
-ret.add(addr[0])
-else:
-assert None, 'Unknown address family {}'.format(fam)
-return list(ret)
diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py
index 17761a6..00e67ed 100644
--- a/sbws/lib/relaylist.py
+++ b/sbws/lib/relaylist.py
@@ -1,12 +1,9 @@
 from stem.descriptor.router_status_entry import RouterStatusEntryV3
 from stem.descriptor.server_descriptor import ServerDescriptor
 from stem import Flag, DescriptorUnavailable, ControllerError
-from stem.util.connection import is_valid_ipv4_address
-from stem.util.connection import is_valid_ipv6_address
 import random
 import time
 import logging
-from sbws.globals import resolve
 from threading import Lock
 
 log = logging.getLogger(__name__)
@@ -101,32 +98,6 @@ class Relay:
 return None
 return key.rstrip('=')
 
-def can_exit_to(self, host, port):
-'''
-Returns if this relay can MOST LIKELY exit to the given host:port.
-**host** can be a hostname, but be warned that we will resolve it
-locally and use the first (arbitrary/unknown order) result when
-checking exit policies, which is different than what other parts of the
-code may do (leaving it up to the exit to resolve the name).
-'''
-if not self.exit_policy:
-return False
-assert isinstance(host, str)
-assert isinstance(port, int)
-if not is_valid_ipv4_address(host) and not is_valid_ipv6_address(host):
-# It certainly isn't perfect trying to guess if an exit can connect
-# to an ipv4/6 address based on the DNS result we got locally. But
-# it's the best we can do.
-#
-# Also, only use the first ipv4/6 we get even if there is more than
-# one.
-results = resolve(host)
-if not len(results):
-return False
-host = results[0]
-assert is_valid_ipv4_address(host) or is_valid_ipv6_address(host)
-return self.exit_policy.can_exit_to(host, port)
-
 def can_exit_to_port(self, port):
 """
 Returns True if the relay has an exit policy and the policy accepts



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

[tor-commits] [sbws/master] destination, scanner: choose exits with same flags

[juga]

commit b2eeda230bbcd82eaee419f9aced709274da2012
Author: juga0 
Date:   Thu Nov 22 14:25:50 2018 +

destination, scanner: choose exits with same flags

The flags are: not having a badflag and the policy allows to exit
to a port.
---
 sbws/core/scanner.py| 7 +++
 sbws/lib/destination.py | 3 +--
 sbws/lib/relaylist.py   | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py
index 6188a19..6c63b68 100644
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@ -136,8 +136,8 @@ def _pick_ideal_second_hop(relay, dest, rl, cont, is_exit):
 destination **dest**, pick a second relay that is or is not an exit
 according to **is_exit**.
 '''
-candidates = []
-candidates.extend(rl.exits if is_exit else rl.non_exits)
+candidates = rl.exits_not_bad_allowing_port(dest.port) if is_exit \
+else rl.non_exits
 if not len(candidates):
 return None
 log.debug('Picking a 2nd hop to measure %s from %d choices. is_exit=%s',
@@ -177,8 +177,7 @@ def measure_relay(args, conf, destinations, cb, rl, relay):
 # exit, then pick a non-exit. Otherwise pick an exit.
 helper = None
 circ_fps = None
-if relay.can_exit_to(dest.hostname, dest.port) and \
-relay not in rl.bad_exits:
+if relay.is_exit_not_bad_allowing_port(dest.port):
 helper = _pick_ideal_second_hop(
 relay, dest, rl, cb.controller, is_exit=False)
 if helper:
diff --git a/sbws/lib/destination.py b/sbws/lib/destination.py
index d01fd04..ddbe6c8 100644
--- a/sbws/lib/destination.py
+++ b/sbws/lib/destination.py
@@ -179,8 +179,7 @@ class DestinationList:
 session = requests_utils.make_session(cont, timeout)
 usable_dests = []
 for dest in self._all_dests:
-possible_exits = [e for e in self._rl.exits
-  if e.can_exit_to(dest.hostname, dest.port)]
+possible_exits = self._rl.exits_not_bad_allowing_port(dest.port)
 # Keep the fastest 10% of exits, or 3, whichever is larger
 num_keep = int(max(3, len(possible_exits) * 0.1))
 possible_exits = sorted(
diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py
index 28802a1..17761a6 100644
--- a/sbws/lib/relaylist.py
+++ b/sbws/lib/relaylist.py
@@ -231,7 +231,6 @@ class RelayList:
 self._relays = self._init_relays()
 self._last_refresh = time.time()
 
-
 def exits_not_bad_allowing_port(self, port):
 return [r for r in self.exits
 if r.is_exit_not_bad_allowing_port(port)]



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

[tor-commits] [sbws/master] relaylist: add method to check exit policy with port

[juga]

commit d980582f240801ef2c98011d3066b5af9394c0c5
Author: juga0 
Date:   Thu Nov 22 14:18:40 2018 +

relaylist: add method to check exit policy with port

In order to do not relay on resolving a domain locally to check
the IP in the exit policy.
---
 sbws/lib/relaylist.py | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py
index 9402574..9d5c050 100644
--- a/sbws/lib/relaylist.py
+++ b/sbws/lib/relaylist.py
@@ -127,6 +127,17 @@ class Relay:
 assert is_valid_ipv4_address(host) or is_valid_ipv6_address(host)
 return self.exit_policy.can_exit_to(host, port)
 
+def can_exit_to_port(self, port):
+"""
+Returns True if the relay has an exit policy and the policy accepts
+exiting to the given portself or False otherwise.
+"""
+assert isinstance(port, int)
+# if dind't get the descriptor, there isn't exit policy
+if not self.exit_policy:
+return False
+return self.exit_policy.can_exit_to(port=port)
+
 
 class RelayList:
 ''' Keeps a list of all relays in the current Tor network and updates it



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

[tor-commits] [sbws/master] Merge branch 'bug28458_02'

[juga]

commit c4f7a3a2eff3af53c319a6e7206d7a022be6aca1
Merge: 54afe75 bad2291
Author: juga0 
Date:   Mon Dec 3 22:32:32 2018 +

Merge branch 'bug28458_02'

 CHANGELOG.md|  2 ++
 sbws/core/scanner.py|  7 +++
 sbws/globals.py | 23 ---
 sbws/lib/destination.py |  3 +--
 sbws/lib/relaylist.py   | 43 +--
 5 files changed, 23 insertions(+), 55 deletions(-)

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

[tor-commits] [sbws/master] relaylist: add method to get exits with some flags

[juga]

commit 2e100e818da0ad50bb9ddb4bb72ae4968f286166
Author: juga0 
Date:   Thu Nov 22 14:23:15 2018 +

relaylist: add method to get exits with some flags

The flags are: not have the badflag and the policy allows to exit
to a port.
---
 sbws/lib/relaylist.py | 5 +
 1 file changed, 5 insertions(+)

diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py
index 979ae7f..28802a1 100644
--- a/sbws/lib/relaylist.py
+++ b/sbws/lib/relaylist.py
@@ -230,3 +230,8 @@ class RelayList:
 def _refresh(self):
 self._relays = self._init_relays()
 self._last_refresh = time.time()
+
+
+def exits_not_bad_allowing_port(self, port):
+return [r for r in self.exits
+if r.is_exit_not_bad_allowing_port(port)]



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

[tor-commits] [sbws/master] changelog: closes bug #28458, #28471. Bugfix 1.0.4

[juga]

commit 7b594132e593b56b985c6a647377cb1e2c6b4be5
Author: juga0 
Date:   Thu Nov 22 14:27:27 2018 +

changelog: closes bug #28458, #28471. Bugfix 1.0.4
---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22c4d5d..e86ac9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,8 @@ and this project adheres to [Semantic 
Versioning](http://semver.org/spec/v2.0.0.
   but not found (#28500).
 - Make sbws round to 2 significant figures by default. This implements part
   of proposal 276 (#28451).
+- Stop trying to resolve destination domain locally and unify criteria to
+  choose relays as exits (#28458, #28471). Bugfix 1.0.4
 
 ## [1.0.2] - 2018-11-10
 



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

[tor-commits] [sbws/master] relaylist: add method to check and exit has some flags

[juga]

commit 5796572a204c9723a165de7eb2d7fe471d41fcd8
Author: juga0 
Date:   Thu Nov 22 14:21:10 2018 +

relaylist: add method to check and exit has some flags

The flags are: not having a badexit and the policy allows to exit
to a port.
---
 sbws/lib/relaylist.py | 5 +
 1 file changed, 5 insertions(+)

diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py
index 9d5c050..979ae7f 100644
--- a/sbws/lib/relaylist.py
+++ b/sbws/lib/relaylist.py
@@ -138,6 +138,11 @@ class Relay:
 return False
 return self.exit_policy.can_exit_to(port=port)
 
+def is_exit_not_bad_allowing_port(self, port):
+return (Flag.BADEXIT not in self.flags and
+Flag.EXIT in self.flags and
+self.can_exit_to_port(port))
+
 
 class RelayList:
 ''' Keeps a list of all relays in the current Tor network and updates it



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

[tor-commits] [sbws/master] resultdump: store bandwidth and is_unmeasured

[juga]

commit 35d36883e87a714f8b2aa7ca89095f3508530f8d
Author: juga0 
Date:   Sat Dec 1 10:36:22 2018 +

resultdump: store bandwidth and is_unmeasured

In order to use it in torflow's scaling method.
Tech-debt is growing repeating Relay in relaylist and resultdump,
Relay should have Results, not Result has Relay
---
 sbws/lib/resultdump.py | 25 ++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/sbws/lib/resultdump.py b/sbws/lib/resultdump.py
index 149f6ff..0f7e1af 100644
--- a/sbws/lib/resultdump.py
+++ b/sbws/lib/resultdump.py
@@ -201,7 +201,8 @@ class Result:
 Result class to be happy '''
 def __init__(self, fingerprint, nickname, address, master_key_ed25519,
  average_bandwidth=None, burst_bandwidth=None,
- observed_bandwidth=None):
+ observed_bandwidth=None, consensus_bandwidth=None,
+ consensus_bandwidth_is_unmeasured=None):
 self.fingerprint = fingerprint
 self.nickname = nickname
 self.address = address
@@ -209,13 +210,18 @@ class Result:
 self.average_bandwidth = average_bandwidth
 self.burst_bandwidth = burst_bandwidth
 self.observed_bandwidth = observed_bandwidth
+self.consensus_bandwidth = consensus_bandwidth
+self.consensus_bandwidth_is_unmeasured = \
+consensus_bandwidth_is_unmeasured
 
 def __init__(self, relay, circ, dest_url, scanner_nick, t=None):
 self._relay = Result.Relay(relay.fingerprint, relay.nickname,
relay.address, relay.master_key_ed25519,
relay.average_bandwidth,
relay.burst_bandwidth,
-   relay.observed_bandwidth)
+   relay.observed_bandwidth,
+   relay.consensus_bandwidth,
+   relay.consensus_bandwidth_is_unmeasured)
 self._circ = circ
 self._dest_url = dest_url
 self._scanner = scanner_nick
@@ -238,6 +244,14 @@ class Result:
 return self._relay.observed_bandwidth
 
 @property
+def consensus_bandwidth(self):
+return self._relay.consensus_bandwidth
+
+@property
+def consensus_bandwidth_is_unmeasured(self):
+return self._relay.consensus_bandwidth_is_unmeasured
+
+@property
 def fingerprint(self):
 return self._relay.fingerprint
 
@@ -487,7 +501,9 @@ class ResultSuccess(Result):
 Result.Relay(
 d['fingerprint'], d['nickname'], d['address'],
 d['master_key_ed25519'], d['relay_average_bandwidth'],
-d['relay_burst_bandwidth'], d['relay_observed_bandwidth']),
+d['relay_burst_bandwidth'], d['relay_observed_bandwidth'],
+d['consensus_bandwidth'],
+d['consensus_bandwidth_is_unmeasured']),
 d['circ'], d['dest_url'], d['scanner'],
 t=d['time'])
 
@@ -499,6 +515,9 @@ class ResultSuccess(Result):
 'relay_average_bandwidth': self.relay_average_bandwidth,
 'relay_burst_bandwidth': self.relay_burst_bandwidth,
 'relay_observed_bandwidth': self.relay_observed_bandwidth,
+'consensus_bandwidth': self.consensus_bandwidth,
+'consensus_bandwidth_is_unmeasured':
+self.consensus_bandwidth_is_unmeasured,
 })
 return d
 



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

[tor-commits] [sbws/master] v3bwfile: do not round twice in torflow's scale method

[juga]

commit 619c2f46d93c1171e9d9a0a32a9a76648e8df901
Author: juga0 
Date:   Sat Dec 1 16:50:36 2018 +

v3bwfile: do not round twice in torflow's scale method
---
 sbws/lib/v3bwfile.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py
index 1cf7b63..55f63ec 100644
--- a/sbws/lib/v3bwfile.py
+++ b/sbws/lib/v3bwfile.py
@@ -868,8 +868,8 @@ class V3BWFile(object):
 # Cap maximum bw
 if cap is not None:
 bw_new = min(hlimit, bw_new)
-# remove decimals and avoid 0
-l.bw = max(round(bw_new), 1)
+# avoid 0
+l.bw = max(bw_new, 1)
 return sorted(bw_lines_tf, key=lambda x: x.bw, reverse=reverse)
 
 @staticmethod



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

[tor-commits] [sbws/master] relaylist: add property is_unmeasured

[juga]

commit 9e089b72d8abfb2b2a6c2ec9a66cb01d115205a6
Author: juga0 
Date:   Sat Dec 1 10:25:01 2018 +

relaylist: add property is_unmeasured
---
 sbws/core/scanner.py| 8 
 sbws/lib/destination.py | 3 ++-
 sbws/lib/relaylist.py   | 9 -
 sbws/util/stem.py   | 6 +++---
 tests/integration/lib/test_relaylist.py | 2 +-
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py
index 6188a19..e065666 100644
--- a/sbws/core/scanner.py
+++ b/sbws/core/scanner.py
@@ -143,7 +143,7 @@ def _pick_ideal_second_hop(relay, dest, rl, cont, is_exit):
 log.debug('Picking a 2nd hop to measure %s from %d choices. is_exit=%s',
   relay.nickname, len(candidates), is_exit)
 for min_bw_factor in [2, 1.75, 1.5, 1.25, 1]:
-min_bw = relay.bandwidth * min_bw_factor
+min_bw = relay.consensus_bandwidth * min_bw_factor
 new_candidates = stem_utils.only_relays_with_bandwidth(
 cont, candidates, min_bw=min_bw)
 if len(new_candidates) > 0:
@@ -152,15 +152,15 @@ def _pick_ideal_second_hop(relay, dest, rl, cont, 
is_exit):
 'Found %d candidate 2nd hops with at least %sx the bandwidth '
 'of %s. Returning %s (bw=%s).',
 len(new_candidates), min_bw_factor, relay.nickname,
-chosen.nickname, chosen.bandwidth)
+chosen.nickname, chosen.consensus_bandwidth)
 return chosen
 candidates = sorted(candidates, key=lambda r: r.bandwidth, reverse=True)
 chosen = candidates[0]
 log.debug(
 'Didn\'t find any 2nd hops at least as fast as %s (bw=%s). It\'s '
 'probably really fast. Returning %s (bw=%s), the fastest '
-'candidate we have.', relay.nickname, relay.bandwidth,
-chosen.nickname, chosen.bandwidth)
+'candidate we have.', relay.nickname, relay.consensus_bandwidth,
+chosen.nickname, chosen.consensus_bandwidth)
 return chosen
 
 
diff --git a/sbws/lib/destination.py b/sbws/lib/destination.py
index d01fd04..cfa6cda 100644
--- a/sbws/lib/destination.py
+++ b/sbws/lib/destination.py
@@ -184,7 +184,8 @@ class DestinationList:
 # Keep the fastest 10% of exits, or 3, whichever is larger
 num_keep = int(max(3, len(possible_exits) * 0.1))
 possible_exits = sorted(
-possible_exits, key=lambda e: e.bandwidth, reverse=True)
+possible_exits, key=lambda e: e.consensus_bandwidth,
+reverse=True)
 exits = possible_exits[0:num_keep]
 if len(exits) < 1:
 log.warning("There are no exits to perform usability tests.")
diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py
index 5ec9252..c61e24e 100644
--- a/sbws/lib/relaylist.py
+++ b/sbws/lib/relaylist.py
@@ -83,10 +83,17 @@ class Relay:
 return self._from_desc('observed_bandwidth')
 
 @property
-def bandwidth(self):
+def consensus_bandwidth(self):
 return self._from_ns('bandwidth')
 
 @property
+def consensus_bandwidth_is_unmeasured(self):
+# measured appears only votes, unmeasured appears in consensus
+# therefore is_unmeasured is needed to know whether the bandwidth
+# value in consensus is comming from bwauth measurements or not.
+return self._from_ns('is_unmeasured')
+
+@property
 def address(self):
 return self._from_ns('address')
 
diff --git a/sbws/util/stem.py b/sbws/util/stem.py
index 232be2a..c3fffd1 100644
--- a/sbws/util/stem.py
+++ b/sbws/util/stem.py
@@ -230,10 +230,10 @@ def only_relays_with_bandwidth(controller, relays, 
min_bw=None, max_bw=None):
 assert max_bw is None or max_bw >= 0
 ret = []
 for relay in relays:
-assert hasattr(relay, 'bandwidth')
-if min_bw is not None and relay.bandwidth < min_bw:
+assert hasattr(relay, 'consensus_bandwidth')
+if min_bw is not None and relay.consensus_bandwidth < min_bw:
 continue
-if max_bw is not None and relay.bandwidth > max_bw:
+if max_bw is not None and relay.consensus_bandwidth > max_bw:
 continue
 ret.append(relay)
 return ret
diff --git a/tests/integration/lib/test_relaylist.py 
b/tests/integration/lib/test_relaylist.py
index 8488c8b..a1a5efb 100644
--- a/tests/integration/lib/test_relaylist.py
+++ b/tests/integration/lib/test_relaylist.py
@@ -11,7 +11,7 @@ def test_relay_properties(persistent_launch_tor):
 assert 'Authority' in relay.flags
 assert not relay.exit_policy or not relay.exit_policy.is_exiting_allowed()
 assert relay.average_bandwidth == 1073741824
-assert relay.bandwidth == 0
+assert relay.consensus_bandwidth == 0
 assert relay.address == '127.10.0.1'
 assert relay.master_key_ed25519 == \
 'wLglSEw9/DHfpNrlrqjVRSnGLVWfnm0vYxkryH4aT6Q'

[tor-commits] [sbws/master] v3bwfile, resultdump: support results without new bw

[juga]

commit 54afe75307dfbe6256f4307c080b82e354737317
Author: juga0 
Date:   Mon Dec 3 20:58:23 2018 +

v3bwfile, resultdump: support results without new bw

When parsing results support old ones without new bandwidth
attributes, as descriptor bandwidth burst, consensus_bandwidth
and consensus bandwidth is unmeasured.
---
 sbws/core/generate.py  |  2 +-
 sbws/lib/resultdump.py |  6 +++---
 sbws/lib/v3bwfile.py   | 11 +--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/sbws/core/generate.py b/sbws/core/generate.py
index f9b46cb..283a71f 100644
--- a/sbws/core/generate.py
+++ b/sbws/core/generate.py
@@ -54,7 +54,7 @@ def gen_parser(sub):
 p.add_argument('-m', '--torflow-bw-margin', default=TORFLOW_BW_MARGIN,
type=float,
help="Cap maximum bw when scaling as Torflow. ")
-p.add_argument('-r', '--round-digs', '--torflow-round-digs',
+p.add_argument('-r', '--torflow-round-digs',
default=PROP276_ROUND_DIG, type=int,
help="Number of most significant digits to round bw.")
 p.add_argument('-p', '--secs-recent', default=None, type=int,
diff --git a/sbws/lib/resultdump.py b/sbws/lib/resultdump.py
index 0f7e1af..3756f6f 100644
--- a/sbws/lib/resultdump.py
+++ b/sbws/lib/resultdump.py
@@ -501,9 +501,9 @@ class ResultSuccess(Result):
 Result.Relay(
 d['fingerprint'], d['nickname'], d['address'],
 d['master_key_ed25519'], d['relay_average_bandwidth'],
-d['relay_burst_bandwidth'], d['relay_observed_bandwidth'],
-d['consensus_bandwidth'],
-d['consensus_bandwidth_is_unmeasured']),
+d.get('relay_burst_bandwidth'), d['relay_observed_bandwidth'],
+d.get('consensus_bandwidth'),
+d.get('consensus_bandwidth_is_unmeasured')),
 d['circ'], d['dest_url'], d['scanner'],
 t=d['time'])
 
diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py
index 55f63ec..4590812 100644
--- a/sbws/lib/v3bwfile.py
+++ b/sbws/lib/v3bwfile.py
@@ -848,8 +848,15 @@ class V3BWFile(object):
 # descriptors' bandwidth-observed, because that penalises new
 # relays.
 # See https://trac.torproject.org/projects/tor/ticket/8494
-desc_bw = min(desc_bw_obs, l.desc_bw_bur, l.desc_bw_avg)
-if l.consensus_bandwidth_is_unmeasured:
+if l.desc_bw_bur is not None:
+# Because in previous versions results were not storing
+# desc_bw_bur
+desc_bw = min(desc_bw_obs, l.desc_bw_bur, l.desc_bw_avg)
+else:
+desc_bw = min(desc_bw_obs, l.desc_bw_avg)
+# In previous versions results were not storing consensus_bandwidth
+if l.consensus_bandwidth_is_unmeasured \
+or l.consensus_bandwidth is None:
 min_bandwidth = desc_bw
 # If the relay is measured, use the minimum between the descriptors
 # bandwidth and the consensus bandwidth, so that

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

[tor-commits] [sbws/master] v3bwfile: add consensus bandwidth and is_unmeasured

[juga]

commit a9222fcea717a541e1880e830f7fb58e751130cf
Author: juga0 
Date:   Sat Dec 1 16:32:35 2018 +

v3bwfile: add consensus bandwidth and is_unmeasured

attributes to BWLine. Add methods to obtain them from results.
---
 sbws/lib/v3bwfile.py| 48 ++---
 tests/unit/lib/test_v3bwfile.py |  1 +
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py
index e08ef28..1cf7b63 100644
--- a/sbws/lib/v3bwfile.py
+++ b/sbws/lib/v3bwfile.py
@@ -51,7 +51,9 @@ BW_KEYVALUES_FILE = BW_KEYVALUES_BASIC + \
 ['master_key_ed25519', 'nick', 'rtt', 'time',
  'success', 'error_stream', 'error_circ', 'error_misc']
 BW_KEYVALUES_EXTRA_BWS = ['bw_median', 'bw_mean', 'desc_bw_avg', 'desc_bw_bur',
-  'desc_bw_obs_last', 'desc_bw_obs_mean']
+  'desc_bw_obs_last', 'desc_bw_obs_mean',
+  'consensus_bandwidth',
+  'consensus_bandwidth_is_unmeasured']
 BW_KEYVALUES_EXTRA = BW_KEYVALUES_FILE + BW_KEYVALUES_EXTRA_BWS
 BW_KEYVALUES_INT = ['bw', 'rtt', 'success', 'error_stream',
 'error_circ', 'error_misc'] + BW_KEYVALUES_EXTRA_BWS
@@ -338,6 +340,11 @@ class V3BWLine(object):
 cls.desc_bw_avg_from_results(results_recent)
 kwargs['desc_bw_bur'] = \
 cls.desc_bw_bur_from_results(results_recent)
+kwargs['consensus_bandwidth'] = \
+cls.consensus_bandwidth_from_results(results_recent)
+kwargs['consensus_bandwidth_is_unmeasured'] = \
+cls.consensus_bandwidth_is_unmeasured_from_results(
+results_recent)
 kwargs['desc_bw_obs_last'] = \
 cls.desc_bw_obs_last_from_results(results_recent)
 kwargs['desc_bw_obs_mean'] = \
@@ -438,6 +445,22 @@ class V3BWLine(object):
 return None
 
 @staticmethod
+def consensus_bandwidth_from_results(results):
+"""Obtain the last consensus bandwidth from the results."""
+for r in reversed(results):
+if r.consensus_bandwidth is not None:
+return r.consensus_bandwidth
+return None
+
+@staticmethod
+def consensus_bandwidth_is_unmeasured_from_results(results):
+"""Obtain the last consensus unmeasured flag from the results."""
+for r in reversed(results):
+if r.consensus_bandwidth_is_unmeasured is not None:
+return r.consensus_bandwidth_is_unmeasured
+return None
+
+@staticmethod
 def desc_bw_obs_mean_from_results(results):
 desc_bw_obs_ls = []
 for r in results:
@@ -825,14 +848,23 @@ class V3BWFile(object):
 # descriptors' bandwidth-observed, because that penalises new
 # relays.
 # See https://trac.torproject.org/projects/tor/ticket/8494
-# just applying the formula above:
 desc_bw = min(desc_bw_obs, l.desc_bw_bur, l.desc_bw_avg)
-bw_new = kb_round_x_sig_dig(
-max(
-l.bw_mean / mu,  # ratio
-max(l.bw_mean, mu) / muf  # ratio filtered
-) * desc_bw, \
-digits=num_round_dig)  # convert to KB
+if l.consensus_bandwidth_is_unmeasured:
+min_bandwidth = desc_bw
+# If the relay is measured, use the minimum between the descriptors
+# bandwidth and the consensus bandwidth, so that
+# MaxAdvertisedBandwidth limits the consensus weight
+# The consensus bandwidth in a measured relay has been obtained
+# doing the same calculation as here
+else:
+min_bandwidth = min(desc_bw, l.consensus_bandwidth)
+# Torflow's scaling
+ratio_stream = l.bw_mean / mu
+ratio_stream_filtered = max(l.bw_mean, mu) / muf
+ratio = max(ratio_stream, ratio_stream_filtered)
+bw_scaled = ratio * min_bandwidth
+# round and convert to KB
+bw_new = kb_round_x_sig_dig(bw_scaled, digits=num_round_dig)
 # Cap maximum bw
 if cap is not None:
 bw_new = min(hlimit, bw_new)
diff --git a/tests/unit/lib/test_v3bwfile.py b/tests/unit/lib/test_v3bwfile.py
index da2c8d8..31a5612 100644
--- a/tests/unit/lib/test_v3bwfile.py
+++ b/tests/unit/lib/test_v3bwfile.py
@@ -40,6 +40,7 @@ header_extra_str = LINE_SEP.join(header_extra_ls) + LINE_SEP
 
 # Line produced without any scaling.
 raw_bwl_str = "bw=56 bw_mean=61423 bw_median=55656 "\
+"consensus_bandwidth=60 consensus_bandwidth_is_unmeasured=False "\
 "desc_bw_avg=10 desc_bw_bur=123456 desc_bw_obs_last=524288 "\
 "desc_bw_obs_mean=524288 error_circ=0 error_misc=0 error_stream=1 " \
 

[tor-commits] [sbws/master] tests: add bandwidth and is_unmeasured to results

[juga]

commit d5e4d3a89caaf3d74b4d324fab2e41943cdeb075
Author: juga0 
Date:   Sat Dec 1 15:59:09 2018 +

tests: add bandwidth and is_unmeasured to results
---
 tests/unit/conftest.py   |  9 +++--
 tests/unit/lib/data/results.txt  |  2 +-
 tests/unit/lib/data/results_away.txt | 12 ++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
index 9b2201c..4dd442b 100644
--- a/tests/unit/conftest.py
+++ b/tests/unit/conftest.py
@@ -65,10 +65,13 @@ SCANNER = "test"
 AVG_BW = 966080
 BUR_BW = 1048576
 OBS_BW = 524288
+BW = 60
+UNMEASURED = False
 
 RELAY1 = Result.Relay(FP1, NICK1, IP1, ED25519,
   average_bandwidth=AVG_BW, burst_bandwidth=BUR_BW,
-  observed_bandwidth=OBS_BW)
+  observed_bandwidth=OBS_BW, consensus_bandwidth=BW,
+  consensus_bandwidth_is_unmeasured=UNMEASURED)
 RELAY2 = Result.Relay(FP2, NICK2, IP2, ED25519)
 
 RESULT = Result(RELAY1, CIRC12, DEST_URL, SCANNER, t=TIME1)
@@ -89,7 +92,9 @@ RELAY_DICT = {
 "master_key_ed25519": ED25519,
 "relay_average_bandwidth": AVG_BW,
 "relay_burst_bandwidth": BUR_BW,
-"relay_observed_bandwidth": OBS_BW
+"relay_observed_bandwidth": OBS_BW,
+"consensus_bandwidth": BW,
+"consensus_bandwidth_is_unmeasured": UNMEASURED,
 }
 
 BASE_RESULT_NO_RELAY_DICT = {
diff --git a/tests/unit/lib/data/results.txt b/tests/unit/lib/data/results.txt
index 9bb4909..59a35b4 100644
--- a/tests/unit/lib/data/results.txt
+++ b/tests/unit/lib/data/results.txt
@@ -1,2 +1,2 @@
-{"version": 4, "time": 1523887747, "circ": 
["", 
""], "type": "success", "rtts": 
[0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 
0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 
0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 
0.4635589122772217], "fingerprint": "", 
"scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, 
"duration": 6.1014368534088135}, {"amount": 590009, "duration": 
8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, 
{"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, 
"duration": 5.779450178146362}], "dest_url": "http://y.z;, "nickname": "A", 
"address": "111.111.111.111", "master_key_ed25519": 
"g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 
10, "relay_burst_bandwidth": 123456, "relay_observed_bandwidth": 524288}
+{"version": 4, "time": 1523887747, "circ": 
["", 
""], "type": "success", "rtts": 
[0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 
0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 
0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 
0.4635589122772217], "fingerprint": "", 
"scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, 
"duration": 6.1014368534088135}, {"amount": 590009, "duration": 
8.391342878341675}, {"amount": 321663, "duration": 7.064587831497192}, 
{"amount": 321663, "duration": 8.266003131866455}, {"amount": 321663, 
"duration": 5.779450178146362}], "dest_url": "http://y.z;, "nickname": "A", 
"address": "111.111.111.111", "master_key_ed25519": 
"g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s", "relay_average_bandwidth": 
10, "relay_burst_bandwidth": 123456, "relay_observed_bandwidth": 
524288, "consensus_ba
 ndwidth": 60, "consensus_bandwidth_is_unmeasured": false}
 {"version": 4, "time": 1523974147, "circ": 
["", 
""], "type": "error-stream", "msg": 
"Something bad happened while measuring bandwidth", "fingerprint": 
"", "scanner": 
"IDidntEditTheSBWSConfig", "dest_url": "http://y.z;, "nickname": "A", 
"address": "111.111.111.111", "master_key_ed25519": 
"g+Shk00y9Md0hg1S6ptnuc/wWKbADBgdjT0Kg+TSF3s"}
diff --git a/tests/unit/lib/data/results_away.txt 
b/tests/unit/lib/data/results_away.txt
index 71698e8..6074bd9 100644
--- a/tests/unit/lib/data/results_away.txt
+++ b/tests/unit/lib/data/results_away.txt
@@ -1,7 +1,7 @@
-{"version": 4, "time": 1523887747, "circ": 
["", 
""], "type": "success", "rtts": 
[0.4596822261810303, 0.44872617721557617, 0.4563450813293457, 
0.44872212409973145, 0.4561030864715576, 0.4765200614929199, 
0.4495084285736084, 0.45711588859558105, 0.45520496368408203, 
0.4635589122772217], "fingerprint": "", 
"scanner": "IDidntEditTheSBWSConfig", "downloads": [{"amount": 590009, 
"duration": 6.1014368534088135}, {"amount": 590009, "duration": 
8.391342878341675}, {"amount": 321663, 

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

[translation]

commit 913ee7d7219e55ae9d4d4f42bb2b83fb57e7f3ac
Author: Translation commit bot 
Date:   Mon Dec 3 21:18:12 2018 +

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

diff --git a/pt_BR/torbutton.dtd b/pt_BR/torbutton.dtd
index 70e90ca09..594b4a628 100644
--- a/pt_BR/torbutton.dtd
+++ b/pt_BR/torbutton.dtd
@@ -38,9 +38,9 @@
 
 
 
-
+
 
-
+
 
 
 

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

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

[translation]

commit 7938192de59027298d50df41158008086fddfc28
Author: Translation commit bot 
Date:   Mon Dec 3 21:18:06 2018 +

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

diff --git a/pt_BR/torbutton.dtd b/pt_BR/torbutton.dtd
index 70e90ca09..594b4a628 100644
--- a/pt_BR/torbutton.dtd
+++ b/pt_BR/torbutton.dtd
@@ -38,9 +38,9 @@
 
 
 
-
+
 
-
+
 
 
 

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

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

[translation]

commit 9be8a504b2471a96ed000e62e9b2cff7b3b4bf23
Author: Translation commit bot 
Date:   Mon Dec 3 20:48:08 2018 +

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

diff --git a/pt_BR/torbutton.dtd b/pt_BR/torbutton.dtd
index 415f15177..70e90ca09 100644
--- a/pt_BR/torbutton.dtd
+++ b/pt_BR/torbutton.dtd
@@ -35,9 +35,9 @@
 
 
 
-
+
 
-
+
 
 
 

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

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

[translation]

commit fba8ecd6861600a37a462acc488ed7eef1b20d41
Author: Translation commit bot 
Date:   Mon Dec 3 20:48:13 2018 +

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

diff --git a/pt_BR/torbutton.dtd b/pt_BR/torbutton.dtd
index 415f15177..70e90ca09 100644
--- a/pt_BR/torbutton.dtd
+++ b/pt_BR/torbutton.dtd
@@ -35,9 +35,9 @@
 
 
 
-
+
 
-
+
 
 
 

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

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

[translation]

commit befff35b3fab95c3019efd334f2df68f44dcb676
Author: Translation commit bot 
Date:   Mon Dec 3 20:47:33 2018 +

Update translations for tor-browser-manual
---
 pt_BR/pt_BR.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po
index 72eb276a2..f95ef7379 100644
--- a/pt_BR/pt_BR.po
+++ b/pt_BR/pt_BR.po
@@ -3,7 +3,7 @@
 # wasabicake, 2016
 # Communia , 2016
 # Helder, 2018
-# Jose Victor , 2018
+# jose, 2018
 # Reurison Silva Rodrigues, 2018
 # Malkon F , 2018
 # Alexei Gonçalves de Oliveira , 2018

___
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 eafa205ecf59d9fbe4fca09864c77171fb7af3cb
Author: Translation commit bot 
Date:   Mon Dec 3 20:46:59 2018 +

Update translations for tbmanual-contentspot
---
 contents+pt-BR.po | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index ce465bd00..d3b65daef 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -953,6 +953,8 @@ msgid ""
 "You can see a diagram of the circuit that Tor Browser is using for the "
 "current tab in the site information menu, in the URL bar."
 msgstr ""
+"Você pode ver um diagrama do circuito que o Navegador Tor está usando para 
a"
+" guia atual no menu de informações do site, na barra de URL."
 
 #: 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] [webwml/master] Fix Tor Browser Android download links

[boklm]

commit 08c4159bdfa1110270e92b71ffd9634a413e0bc5
Author: Nicolas Vigier 
Date:   Mon Dec 3 21:42:07 2018 +0100

Fix Tor Browser Android download links
---
 download/en/download-easy.wml | 4 ++--
 download/en/download.wml  | 4 ++--
 projects/en/torbrowser.wml| 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml
index feb2d74c..9e2d6a34 100644
--- a/download/en/download-easy.wml
+++ b/download/en/download-easy.wml
@@ -189,9 +189,9 @@
   the app. We plan on fixing it for the next release.
   
   
-DownloadAndroid
+DownloadAndroid

-  (sig)
+  (sig)
   What's This?
 
   
diff --git a/download/en/download.wml b/download/en/download.wml
index c68e7141..6111632c 100644
--- a/download/en/download.wml
+++ b/download/en/download.wml
@@ -165,9 +165,9 @@ custom configurations. All an apt-get or yum install 
away.
 

   
-DownloadAndroid
+DownloadAndroid
 
-  (sig)
+  (sig)
   What's This?
 
   
diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index 7f3c8ec0..c1011be6 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -531,8 +531,8 @@
   (sig)
64-bit
   (sig)
-  Android
-  (sig)
+  Android
+  (sig)
 
 

(ar)

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

[tor-commits] [webwml/master] Tor Browser for Android now includes Orbot

[boklm]

commit 0107c84cd7a9505295fc257664f9eda85123d721
Author: Nicolas Vigier 
Date:   Mon Dec 3 21:35:50 2018 +0100

Tor Browser for Android now includes Orbot

Remove instructions to install Orbot when using Tor Browser for Android.
---
 download/en/download-easy.wml | 5 -
 download/en/download.wml  | 4 
 2 files changed, 9 deletions(-)

diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml
index 76a75a9d..feb2d74c 100644
--- a/download/en/download-easy.wml
+++ b/download/en/download-easy.wml
@@ -184,11 +184,6 @@
   button below.
   
   
-  Note: For this release, you also need to install Orbot, you can
-  learn more about it
-  https://www.torproject.org/docs/android.html.en;>here.
-  
-  
   Known issue: Our Security Slider is now under ‘Security Settings,
   but because of a small issue, it’s only showing up after you 
restart
   the app. We plan on fixing it for the next release.
diff --git a/download/en/download.wml b/download/en/download.wml
index 16da8209..c68e7141 100644
--- a/download/en/download.wml
+++ b/download/en/download.wml
@@ -181,10 +181,6 @@ custom configurations. All an apt-get or yum install 
away.
   or you can get the apk by clicking on the button below.
   
   
-  Note: For this release, you also need to install Orbot, you 
can
-  learn more about it https://guardianproject.info/apps/orbot;>here.
-  
-  
   Known issue: Our Security Slider is now under ‘Security Settings,
   but because of a small issue, it’s only showing up after you 
restart
  the app. We plan on fixing it for the next release.

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

[tor-commits] [webwml/master] Use same Tor Browser version number for Android and other platforms

[boklm]

commit a48195afe62b3646625fbfa18bbe075ce554d5e1
Author: Nicolas Vigier 
Date:   Mon Dec 3 21:18:22 2018 +0100

Use same Tor Browser version number for Android and other platforms

Tor Browser for Android is now using the same version number as the
others alpha Tor Browser bundles, and is in the same directory on
dist.tpo.
---
 download/en/download-easy.wml | 4 ++--
 download/en/download.wml  | 4 ++--
 include/versions.wmi  | 6 ++
 projects/en/torbrowser.wml| 6 +++---
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml
index 8b844610..76a75a9d 100644
--- a/download/en/download-easy.wml
+++ b/download/en/download-easy.wml
@@ -194,9 +194,9 @@
   the app. We plan on fixing it for the next release.
   
   
-DownloadAndroid
+DownloadAndroid

-  (sig)
+  (sig)
   What's This?
 
   
diff --git a/download/en/download.wml b/download/en/download.wml
index ff40c486..16da8209 100644
--- a/download/en/download.wml
+++ b/download/en/download.wml
@@ -165,9 +165,9 @@ custom configurations. All an apt-get or yum install 
away.
 

   
-DownloadAndroid
+DownloadAndroid
 
-  (sig)
+  (sig)
   What's This?
 
   
diff --git a/include/versions.wmi b/include/versions.wmi
index 2c39bfbc..e807994c 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -41,12 +41,10 @@
 
 
 
+
+
 
 tor-.tar.gz
 ../dist/
 tor-.tar.gz
 ../dist/
-
-# *** tor browser android ***
-1.0a3
-2018-10-31
diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index 172ce411..7f3c8ec0 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -512,7 +512,7 @@
   Microsoft 
Windows()
   Mac OS X()
   Linux()
-  Android()
+  Android()
 
   
   
@@ -531,8 +531,8 @@
   (sig)
64-bit
   (sig)
-  Android
-  (sig)
 
+  Android
+  (sig)
 
 

(ar)

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

[tor-commits] [webwml/master] Add new Tor Browser version: 8.5a5

[boklm]

commit 890858a344d61bdad0bd71a2053a6db1b9ae8f74
Author: Nicolas Vigier 
Date:   Mon Dec 3 21:04:07 2018 +0100

Add new Tor Browser version: 8.5a5
---
 include/versions.wmi   | 4 ++--
 projects/torbrowser/RecommendedTBBVersions | 6 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index 3f9003e7..2c39bfbc 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -26,8 +26,8 @@
 ../dist/torbrowser//tor-win32-.zip
 
 # *** tor browser beta/alpha ***
-8.5a4
-2018-10-23
+8.5a5
+2018-12-03
 
 # If all platforms are on the same version, you only need to update
 # version-torbrowserbundlebeta-all and releasedate-torbrowserbundlebeta-all
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index 3292a6b7..b996a612 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -6,5 +6,9 @@
 "8.5a4",
 "8.5a4-MacOS",
 "8.5a4-Linux",
-"8.5a4-Windows"
+"8.5a4-Windows",
+"8.5a5",
+"8.5a5-MacOS",
+"8.5a5-Linux",
+"8.5a5-Windows"
 ]

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

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

[translation]

commit 3fb1c85163e2c6b28b81a8d9a7ead1087dfbb184
Author: Translation commit bot 
Date:   Mon Dec 3 18:49:47 2018 +

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

diff --git a/contents+ka.po b/contents+ka.po
index 076b911a5..7bb9357cc 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -112,11 +112,11 @@ msgstr "https"
 
 #: http//localhost/operators/ (content/operators/contents+en.lrtopic.title)
 msgid "Operators"
-msgstr "ოპერატორები"
+msgstr "მომსახურეობა"
 
 #: http//localhost/operators/ (content/operators/contents+en.lrtopic.seo_slug)
 msgid "operators"
-msgstr "ოპერატორები"
+msgstr "მომსახურეობა"
 
 #: http//localhost/onionservices/
 #: (content/onionservices/contents+en.lrtopic.title)
@@ -1021,7 +1021,7 @@ msgstr ""
 #: (content/tbb/tbb-22/contents+en.lrquestion.description)
 msgid "Using Tor Browser can sometimes be slower than other browsers."
 msgstr ""
-"Tor-ბრაუზერმა ზოგ შემთხვევაში 
შესაძლოა ნელა იმუშავოს სხვა 
ბრაუზერებთან "
+"Tor-ბრაუზერმა ზოგ შემთხვევაში 
შესაძლოა ნელა იმუშაოს სხვა ბრ
აუზერებთან "
 "შედარებით."
 
 #: http//localhost/tbb/make-tor-faster/
@@ -3331,8 +3331,8 @@ msgid ""
 "## The IP address or hostname for incoming connections (leave commented and "
 "Tor will guess)"
 msgstr ""
-"## IP-მისამართი ან დასახელება 
შემომავალი კავშირებისთვის 
(დაურთეთ შენიშვნა და"
-" Tor გაითვალისწინებს)"
+"## IP-მისამართი ან დასახელება 
შემომავალი კავშირებისთვის 
(დატოვეთ შენიშვნის "
+"სახით და Tor გაარჩევს)"
 
 #: http//localhost/operators/how-do-i-run-a-middle-or-guard-relay/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3437,8 +3437,8 @@ msgid ""
 "## Set your bandwidth rate (leave commented and Tor will run without "
 "bandwidth caps)"
 msgstr ""
-"## მიუთითეთ თქვენი გამტარუნარ
იანობის სიხშირე (დატოვეთ 
შენიშვნის სახით, თუ "
-"გსურთ Tor-გაეშვას გამტარუნარ
იანობის შეზღუდვის გარეშე)"
+"## მიუთითეთ თქვენი გამტარუნარ
იანობა (დატოვეთ შენიშვნის 
სახით თუ გსურთ Tor-"
+"გაეშვას შეზღუდვის გარეშე)"
 
 #: http//localhost/operators/how-do-i-run-a-middle-or-guard-relay/
 #: (content/operators/operators-1/contents+en.lrquestion.description)

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

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

[translation]

commit 5b85d9bf4d75014eee8ddf09a35bfb27e6d39aa0
Author: Translation commit bot 
Date:   Mon Dec 3 18:49:40 2018 +

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

diff --git a/contents+ka.po b/contents+ka.po
index 076b911a5..7bb9357cc 100644
--- a/contents+ka.po
+++ b/contents+ka.po
@@ -112,11 +112,11 @@ msgstr "https"
 
 #: http//localhost/operators/ (content/operators/contents+en.lrtopic.title)
 msgid "Operators"
-msgstr "ოპერატორები"
+msgstr "მომსახურეობა"
 
 #: http//localhost/operators/ (content/operators/contents+en.lrtopic.seo_slug)
 msgid "operators"
-msgstr "ოპერატორები"
+msgstr "მომსახურეობა"
 
 #: http//localhost/onionservices/
 #: (content/onionservices/contents+en.lrtopic.title)
@@ -1021,7 +1021,7 @@ msgstr ""
 #: (content/tbb/tbb-22/contents+en.lrquestion.description)
 msgid "Using Tor Browser can sometimes be slower than other browsers."
 msgstr ""
-"Tor-ბრაუზერმა ზოგ შემთხვევაში 
შესაძლოა ნელა იმუშავოს სხვა 
ბრაუზერებთან "
+"Tor-ბრაუზერმა ზოგ შემთხვევაში 
შესაძლოა ნელა იმუშაოს სხვა ბრ
აუზერებთან "
 "შედარებით."
 
 #: http//localhost/tbb/make-tor-faster/
@@ -3331,8 +3331,8 @@ msgid ""
 "## The IP address or hostname for incoming connections (leave commented and "
 "Tor will guess)"
 msgstr ""
-"## IP-მისამართი ან დასახელება 
შემომავალი კავშირებისთვის 
(დაურთეთ შენიშვნა და"
-" Tor გაითვალისწინებს)"
+"## IP-მისამართი ან დასახელება 
შემომავალი კავშირებისთვის 
(დატოვეთ შენიშვნის "
+"სახით და Tor გაარჩევს)"
 
 #: http//localhost/operators/how-do-i-run-a-middle-or-guard-relay/
 #: (content/operators/operators-1/contents+en.lrquestion.description)
@@ -3437,8 +3437,8 @@ msgid ""
 "## Set your bandwidth rate (leave commented and Tor will run without "
 "bandwidth caps)"
 msgstr ""
-"## მიუთითეთ თქვენი გამტარუნარ
იანობის სიხშირე (დატოვეთ 
შენიშვნის სახით, თუ "
-"გსურთ Tor-გაეშვას გამტარუნარ
იანობის შეზღუდვის გარეშე)"
+"## მიუთითეთ თქვენი გამტარუნარ
იანობა (დატოვეთ შენიშვნის 
სახით თუ გსურთ Tor-"
+"გაეშვას შეზღუდვის გარეშე)"
 
 #: http//localhost/operators/how-do-i-run-a-middle-or-guard-relay/
 #: (content/operators/operators-1/contents+en.lrquestion.description)

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

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

[translation]

commit cae0031bb8c761a4b4ac4ffcaeec773ef07ee045
Author: Translation commit bot 
Date:   Mon Dec 3 18:46:45 2018 +

Update translations for tails-openpgp-applet
---
 bn/openpgp-applet.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bn/openpgp-applet.pot b/bn/openpgp-applet.pot
index 1d05b3746..8e0505b70 100644
--- a/bn/openpgp-applet.pot
+++ b/bn/openpgp-applet.pot
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2017-08-05 15:07-0400\n"
-"PO-Revision-Date: 2018-10-04 00:29+\n"
+"PO-Revision-Date: 2018-12-03 18:28+\n"
 "Last-Translator: erinm\n"
 "Language-Team: Bengali 
(http://www.transifex.com/otf/torproject/language/bn/)\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-greeter-2_completed] Update translations for tails-greeter-2_completed

[translation]

commit 6b704a2256ce09f8711ed080f5c1001ca7cd
Author: Translation commit bot 
Date:   Mon Dec 3 18:46:40 2018 +

Update translations for tails-greeter-2_completed
---
 bn/bn.po | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bn/bn.po b/bn/bn.po
index ee0027b68..c5e004558 100644
--- a/bn/bn.po
+++ b/bn/bn.po
@@ -3,13 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR , YEAR.
 # 
+# Translators:
+# erinm, 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"
+"PO-Revision-Date: 2016-11-18 21:29+\n"
 "Last-Translator: erinm, 2018\n"
 "Language-Team: Bengali (https://www.transifex.com/otf/teams/1519/bn/)\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-greeter-2] Update translations for tails-greeter-2

[translation]

commit 5918700c50dd7c690ac63682c971a37a5ddadf82
Author: Translation commit bot 
Date:   Mon Dec 3 18:46:35 2018 +

Update translations for tails-greeter-2
---
 bn/bn.po | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bn/bn.po b/bn/bn.po
index ee0027b68..c5e004558 100644
--- a/bn/bn.po
+++ b/bn/bn.po
@@ -3,13 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR , YEAR.
 # 
+# Translators:
+# erinm, 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"
+"PO-Revision-Date: 2016-11-18 21:29+\n"
 "Last-Translator: erinm, 2018\n"
 "Language-Team: Bengali (https://www.transifex.com/otf/teams/1519/bn/)\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/liveusb-creator] Update translations for liveusb-creator

[translation]

commit 58261033fb06884be4b6ebd64f2b22495645e6c4
Author: Translation commit bot 
Date:   Mon Dec 3 18:45:49 2018 +

Update translations for liveusb-creator
---
 bn/bn.po | 84 
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/bn/bn.po b/bn/bn.po
index 7d7040f73..2ba19b96f 100644
--- a/bn/bn.po
+++ b/bn/bn.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-17 13:11+0200\n"
-"PO-Revision-Date: 2018-10-17 14:51+\n"
+"POT-Creation-Date: 2018-10-20 12:34+0200\n"
+"PO-Revision-Date: 2018-12-03 18:29+\n"
 "Last-Translator: erinm\n"
 "Language-Team: Bengali 
(http://www.transifex.com/otf/torproject/language/bn/)\n"
 "MIME-Version: 1.0\n"
@@ -77,194 +77,194 @@ msgstr "কপি করতে অক্ষম %(infile)s 
থেকে %(outfile
 msgid "Removing existing Live OS"
 msgstr "বিদ্যমান লাইভ অপারেটিং 
সিস্টেম অপসারণ"
 
-#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:456
+#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:457
 #, python-format
 msgid "Unable to chmod %(file)s: %(message)s"
 msgstr "Chmod করতে অক্ষম %(file)sঃ%(message)s"
 
-#: ../tails_installer/creator.py:449
+#: ../tails_installer/creator.py:450
 #, python-format
 msgid "Unable to remove file from previous LiveOS: %(message)s"
 msgstr "পূর্ববর্তী LiveOS থেকে ফাইল 
সরাতে অক্ষম:%(message)s"
 
-#: ../tails_installer/creator.py:462
+#: ../tails_installer/creator.py:464
 #, python-format
 msgid "Unable to remove directory from previous LiveOS: %(message)s"
 msgstr "পূর্ববর্তী LiveOS থেকে 
ডিরেক্টরি সরাতে অক্ষম: %(message)s"
 
-#: ../tails_installer/creator.py:510
+#: ../tails_installer/creator.py:512
 #, python-format
 msgid "Cannot find device %s"
 msgstr "ডিভাইস খুঁজে পাইনি %s"
 
-#: ../tails_installer/creator.py:711
+#: ../tails_installer/creator.py:713
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "লিখতে অক্ষম %(device)s, skipping।"
 
-#: ../tails_installer/creator.py:741
+#: ../tails_installer/creator.py:743
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "%(device)s ডিভাইসের কিছু 
পার্টিশন মাউন্ট করা হয়। 
ইনস্টলেশন প্রক্রিয়া আরম্ভ 
করার পূর্বে তাদের আনমাউন্ট 
করা হবে।"
 
-#: ../tails_installer/creator.py:784 ../tails_installer/creator.py:1008
+#: ../tails_installer/creator.py:786 ../tails_installer/creator.py:1010
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "অজানা ফাইল সিস্টেম আপনার 
ডিভাইসের পুনরায় ফরম্যাট করা 
প্রয়োজন হতে পারে।"
 
-#: ../tails_installer/creator.py:787 ../tails_installer/creator.py:1011
+#: ../tails_installer/creator.py:789 ../tails_installer/creator.py:1013
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "অসমর্থিত ফাইল সিস্টেম: %s"
 
-#: ../tails_installer/creator.py:805
+#: ../tails_installer/creator.py:807
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "ডিভাইস মাউন্ট করার চেষ্টা 
করার সময় অজানা GLib ব্যতিক্রম: 
%(message)s"
 
-#: ../tails_installer/creator.py:810
+#: ../tails_installer/creator.py:812
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "ডিভাইস মাউন্ট করতে অক্ষম: 
%(message)s"
 
-#: ../tails_installer/creator.py:815
+#: ../tails_installer/creator.py:817
 msgid "No mount points found"
 msgstr "কোন মাউন্ট পয়েন্ট পাওয়া 
যায় নি"
 
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:828
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "%(device)sএর জন্য আনমাউন্ট 
ডিভাইস প্রবেশ করানো হচ্ছে "
 
-#: ../tails_installer/creator.py:836
+#: ../tails_installer/creator.py:838
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "মাউন্ট করা ফাইল 
সিস্টেমগুলি আনমাউন্ট করা 
হচ্ছে %(device)s"
 
-#: ../tails_installer/creator.py:840
+#: 

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

[translation]

commit 99bad93ce2a7e476f7e8adbb5e1a658736ba5e57
Author: Translation commit bot 
Date:   Mon Dec 3 18:46:11 2018 +

Update translations for tails-misc
---
 bn.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bn.po b/bn.po
index f32fa07ef..d29b26e23 100644
--- a/bn.po
+++ b/bn.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-12-01 11:05+0100\n"
-"PO-Revision-Date: 2018-12-01 14:39+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2018-12-03 18:29+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Bengali 
(http://www.transifex.com/otf/torproject/language/bn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[tor-commits] [translation/mat-gui_completed] Update translations for mat-gui_completed

[translation]

commit c6fc6613318990d0ca2f3465bff1c5861e231d02
Author: Translation commit bot 
Date:   Mon Dec 3 18:46:06 2018 +

Update translations for mat-gui_completed
---
 bn.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bn.po b/bn.po
index 74e3e6fc5..13e901bac 100644
--- a/bn.po
+++ b/bn.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-10 23:06+0100\n"
-"PO-Revision-Date: 2018-10-04 00:42+\n"
+"PO-Revision-Date: 2018-12-03 18:28+\n"
 "Last-Translator: erinm\n"
 "Language-Team: Bengali 
(http://www.transifex.com/otf/torproject/language/bn/)\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/liveusb-creator_completed] Update translations for liveusb-creator_completed

[translation]

commit a0ef6b1af076ccdd90326eb643bd679cac0dda78
Author: Translation commit bot 
Date:   Mon Dec 3 18:45:55 2018 +

Update translations for liveusb-creator_completed
---
 bn/bn.po | 84 
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/bn/bn.po b/bn/bn.po
index 7d7040f73..2ba19b96f 100644
--- a/bn/bn.po
+++ b/bn/bn.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-17 13:11+0200\n"
-"PO-Revision-Date: 2018-10-17 14:51+\n"
+"POT-Creation-Date: 2018-10-20 12:34+0200\n"
+"PO-Revision-Date: 2018-12-03 18:29+\n"
 "Last-Translator: erinm\n"
 "Language-Team: Bengali 
(http://www.transifex.com/otf/torproject/language/bn/)\n"
 "MIME-Version: 1.0\n"
@@ -77,194 +77,194 @@ msgstr "কপি করতে অক্ষম %(infile)s 
থেকে %(outfile
 msgid "Removing existing Live OS"
 msgstr "বিদ্যমান লাইভ অপারেটিং 
সিস্টেম অপসারণ"
 
-#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:456
+#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:457
 #, python-format
 msgid "Unable to chmod %(file)s: %(message)s"
 msgstr "Chmod করতে অক্ষম %(file)sঃ%(message)s"
 
-#: ../tails_installer/creator.py:449
+#: ../tails_installer/creator.py:450
 #, python-format
 msgid "Unable to remove file from previous LiveOS: %(message)s"
 msgstr "পূর্ববর্তী LiveOS থেকে ফাইল 
সরাতে অক্ষম:%(message)s"
 
-#: ../tails_installer/creator.py:462
+#: ../tails_installer/creator.py:464
 #, python-format
 msgid "Unable to remove directory from previous LiveOS: %(message)s"
 msgstr "পূর্ববর্তী LiveOS থেকে 
ডিরেক্টরি সরাতে অক্ষম: %(message)s"
 
-#: ../tails_installer/creator.py:510
+#: ../tails_installer/creator.py:512
 #, python-format
 msgid "Cannot find device %s"
 msgstr "ডিভাইস খুঁজে পাইনি %s"
 
-#: ../tails_installer/creator.py:711
+#: ../tails_installer/creator.py:713
 #, python-format
 msgid "Unable to write on %(device)s, skipping."
 msgstr "লিখতে অক্ষম %(device)s, skipping।"
 
-#: ../tails_installer/creator.py:741
+#: ../tails_installer/creator.py:743
 #, python-format
 msgid ""
 "Some partitions of the target device %(device)s are mounted. They will be "
 "unmounted before starting the installation process."
 msgstr "%(device)s ডিভাইসের কিছু 
পার্টিশন মাউন্ট করা হয়। 
ইনস্টলেশন প্রক্রিয়া আরম্ভ 
করার পূর্বে তাদের আনমাউন্ট 
করা হবে।"
 
-#: ../tails_installer/creator.py:784 ../tails_installer/creator.py:1008
+#: ../tails_installer/creator.py:786 ../tails_installer/creator.py:1010
 msgid "Unknown filesystem.  Your device may need to be reformatted."
 msgstr "অজানা ফাইল সিস্টেম আপনার 
ডিভাইসের পুনরায় ফরম্যাট করা 
প্রয়োজন হতে পারে।"
 
-#: ../tails_installer/creator.py:787 ../tails_installer/creator.py:1011
+#: ../tails_installer/creator.py:789 ../tails_installer/creator.py:1013
 #, python-format
 msgid "Unsupported filesystem: %s"
 msgstr "অসমর্থিত ফাইল সিস্টেম: %s"
 
-#: ../tails_installer/creator.py:805
+#: ../tails_installer/creator.py:807
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
 msgstr "ডিভাইস মাউন্ট করার চেষ্টা 
করার সময় অজানা GLib ব্যতিক্রম: 
%(message)s"
 
-#: ../tails_installer/creator.py:810
+#: ../tails_installer/creator.py:812
 #, python-format
 msgid "Unable to mount device: %(message)s"
 msgstr "ডিভাইস মাউন্ট করতে অক্ষম: 
%(message)s"
 
-#: ../tails_installer/creator.py:815
+#: ../tails_installer/creator.py:817
 msgid "No mount points found"
 msgstr "কোন মাউন্ট পয়েন্ট পাওয়া 
যায় নি"
 
-#: ../tails_installer/creator.py:826
+#: ../tails_installer/creator.py:828
 #, python-format
 msgid "Entering unmount_device for '%(device)s'"
 msgstr "%(device)sএর জন্য আনমাউন্ট 
ডিভাইস প্রবেশ করানো হচ্ছে "
 
-#: ../tails_installer/creator.py:836
+#: ../tails_installer/creator.py:838
 #, python-format
 msgid "Unmounting mounted filesystems on '%(device)s'"
 msgstr "মাউন্ট করা ফাইল 
সিস্টেমগুলি আনমাউন্ট করা 
হচ্ছে %(device)s"
 
-#: ../tails_installer/creator.py:840
+#: 

[tor-commits] [translation/mat-gui] Update translations for mat-gui

[translation]

commit fc868f5d2e91261e2ae175af4269eed32d2a9dc2
Author: Translation commit bot 
Date:   Mon Dec 3 18:46:01 2018 +

Update translations for mat-gui
---
 bn.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bn.po b/bn.po
index 74e3e6fc5..13e901bac 100644
--- a/bn.po
+++ b/bn.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-10 23:06+0100\n"
-"PO-Revision-Date: 2018-10-04 00:42+\n"
+"PO-Revision-Date: 2018-12-03 18:28+\n"
 "Last-Translator: erinm\n"
 "Language-Team: Bengali 
(http://www.transifex.com/otf/torproject/language/bn/)\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/tor-browser-60.3.0esr-8.5-1] Bug 1322748 add ability to get registered channelwrappers, r=kmag

[gk]

commit c1774ae7fc74bef7956caca4fe1b8de1365f5d48
Author: Shane Caraveo 
Date:   Tue May 22 14:19:57 2018 -0400

Bug 1322748 add ability to get registered channelwrappers, r=kmag

MozReview-Commit-ID: SphwWjzQuo

--HG--
extra : rebase_source : 0b5193d7f4e9e7f27f9a7d622699b673781c3dd4
---
 dom/chrome-webidl/ChannelWrapper.webidl|  8 
 .../extensions/webrequest/ChannelWrapper.cpp   | 18 ++
 .../components/extensions/webrequest/ChannelWrapper.h  |  2 +-
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/dom/chrome-webidl/ChannelWrapper.webidl 
b/dom/chrome-webidl/ChannelWrapper.webidl
index b8d921cea58d..2777aab65c8e 100644
--- a/dom/chrome-webidl/ChannelWrapper.webidl
+++ b/dom/chrome-webidl/ChannelWrapper.webidl
@@ -49,6 +49,14 @@ interface ChannelWrapper : EventTarget {
   static ChannelWrapper get(MozChannel channel);
 
   /**
+   * Returns the wrapper instance for the given channel. The same wrapper is
+   * always returned for a given channel.
+   */
+  static ChannelWrapper getRegisteredChannel(unsigned long long aChannelId,
+ WebExtensionPolicy extension,
+ TabParent? tabParent);
+
+  /**
* A unique ID for for the requests which remains constant throughout the
* redirect chain.
*/
diff --git a/toolkit/components/extensions/webrequest/ChannelWrapper.cpp 
b/toolkit/components/extensions/webrequest/ChannelWrapper.cpp
index de4a7fee1a2a..52508f0f24ed 100644
--- a/toolkit/components/extensions/webrequest/ChannelWrapper.cpp
+++ b/toolkit/components/extensions/webrequest/ChannelWrapper.cpp
@@ -78,6 +78,24 @@ ChannelWrapper::Get(const GlobalObject& global, nsIChannel* 
channel)
   return wrapper.forget();
 }
 
+already_AddRefed
+ChannelWrapper::GetRegisteredChannel(const GlobalObject& global, uint64_t 
aChannelId, const WebExtensionPolicy& aAddon, nsITabParent* aTabParent)
+{
+  nsIContentParent* contentParent = nullptr;
+  if (TabParent* parent = static_cast(aTabParent)) {
+contentParent = static_cast(parent->Manager());
+  }
+
+  auto& webreq = WebRequestService::GetSingleton();
+
+  nsCOMPtr channel = 
webreq.GetTraceableChannel(aChannelId, aAddon.Id(), contentParent);
+  if (!channel) {
+return nullptr;
+  }
+  nsCOMPtr chan(do_QueryInterface(channel));
+  return ChannelWrapper::Get(global, chan);
+}
+
 void
 ChannelWrapper::SetChannel(nsIChannel* aChannel)
 {
diff --git a/toolkit/components/extensions/webrequest/ChannelWrapper.h 
b/toolkit/components/extensions/webrequest/ChannelWrapper.h
index 8ba238991070..750aed434f6a 100644
--- a/toolkit/components/extensions/webrequest/ChannelWrapper.h
+++ b/toolkit/components/extensions/webrequest/ChannelWrapper.h
@@ -121,7 +121,7 @@ public:
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_CHANNELWRAPPER_IID)
 
   static already_AddRefed Get(const 
dom::GlobalObject& global, nsIChannel* channel);
-
+  static already_AddRefed 
GetRegisteredChannel(const dom::GlobalObject& global, uint64_t aChannelId, 
const WebExtensionPolicy& aAddon, nsITabParent* aTabParent);
 
   uint64_t Id() const { return mId; }
 



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

[tor-commits] [tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1474626 - fix timestamp test and values, r=rpl

[gk]

commit b3d74f7db1cc0ddf54771e3e9e5de4b8549b0c88
Author: Shane Caraveo 
Date:   Wed Jul 11 14:54:03 2018 -0300

Bug 1474626 - fix timestamp test and values, r=rpl

The test was incorrect and the timestamp should be milliseconds, not 
microseconds.

MozReview-Commit-ID: 2d79r6PHH4Z

--HG--
extra : rebase_source : edd97899f0646f2cae2fbf119206ec470a6b97a0
---
 .../extensions/test/mochitest/test_ext_webrequest_hsts.html | 6 +-
 toolkit/modules/addons/SecurityInfo.jsm | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git 
a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html 
b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html
index df8b541808f9..b8385ca08843 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html
@@ -38,7 +38,11 @@ function getExtension() {
 browser.test.assertTrue(securityInfo.certificates.length == 1, "no 
certificate chain");
   }
   let cert = securityInfo.certificates[0];
-  browser.test.assertTrue(cert.validity.start < Date.now() < 
cert.validity.end, "cert validity is correct");
+  let now = Date.now();
+  browser.test.assertTrue(Number.isInteger(cert.validity.start), "cert 
start is integer");
+  browser.test.assertTrue(Number.isInteger(cert.validity.end), "cert end 
is integer");
+  browser.test.assertTrue(cert.validity.start < now, "cert start validity 
is correct");
+  browser.test.assertTrue(now < cert.validity.end, "cert end validity is 
correct");
   if (options.rawDER) {
 for (let cert of securityInfo.certificates) {
   browser.test.assertTrue(cert.rawDER.length > 0, "have rawDER");
diff --git a/toolkit/modules/addons/SecurityInfo.jsm 
b/toolkit/modules/addons/SecurityInfo.jsm
index a931602b517a..de0084398aa6 100644
--- a/toolkit/modules/addons/SecurityInfo.jsm
+++ b/toolkit/modules/addons/SecurityInfo.jsm
@@ -214,8 +214,8 @@ const SecurityInfo = {
   subject: cert.subjectName,
   issuer: cert.issuerName,
   validity: {
-start: cert.validity.notBefore,
-end: cert.validity.notAfter,
+start: cert.validity.notBefore ? Math.trunc(cert.validity.notBefore / 
1000) : 0,
+end: cert.validity.notAfter ? Math.trunc(cert.validity.notAfter / 
1000) : 0,
   },
   fingerprint: {
 sha1: cert.sha1Fingerprint,

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

[tor-commits] [tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1471959 - leave keaGroupName and signatureSchemeName undefined if value is none, r=rpl

[gk]

commit b81fe53f5fe1ecd749ca900ccfc1a00ae1fd9328
Author: Shane Caraveo 
Date:   Fri Jul 6 09:41:56 2018 -0300

Bug 1471959 - leave keaGroupName and signatureSchemeName undefined if value 
is none, r=rpl

MozReview-Commit-ID: 2Ca7xCMOPAH

--HG--
extra : rebase_source : 2fa9d6b80c9ead0d90927878ce10390791cbadd9
---
 toolkit/components/extensions/schemas/web_request.json | 10 ++
 toolkit/modules/addons/SecurityInfo.jsm|  8 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/toolkit/components/extensions/schemas/web_request.json 
b/toolkit/components/extensions/schemas/web_request.json
index 508ca8b05f8f..6fe12f7b6ca5 100644
--- a/toolkit/components/extensions/schemas/web_request.json
+++ b/toolkit/components/extensions/schemas/web_request.json
@@ -269,6 +269,16 @@
 "description": "The cipher suite used in this request if state is 
\"secure\".",
 "optional": true
   },
+  "keaGroupName": {
+"type": "string",
+"description": "The key exchange algorithm used in this request if 
state is \"secure\".",
+"optional": true
+  },
+  "signatureSchemeName": {
+"type": "string",
+"description": "The signature scheme used in this request if state 
is \"secure\".",
+"optional": true
+  },
   "certificates": {
 "description": "Certificate data if state is \"secure\".  Will 
only contain one entry unless certificateChain is passed as an 
option.",
 "type": "array",
diff --git a/toolkit/modules/addons/SecurityInfo.jsm 
b/toolkit/modules/addons/SecurityInfo.jsm
index 8c5cef18754d..a931602b517a 100644
--- a/toolkit/modules/addons/SecurityInfo.jsm
+++ b/toolkit/modules/addons/SecurityInfo.jsm
@@ -137,10 +137,14 @@ const SecurityInfo = {
 info.cipherSuite = SSLStatus.cipherName;
 
 // Key exchange group name.
-info.keaGroupName = SSLStatus.keaGroupName;
+if (SSLStatus.keaGroupName !== "none") {
+  info.keaGroupName = SSLStatus.keaGroupName;
+}
 
 // Certificate signature scheme.
-info.signatureSchemeName = SSLStatus.signatureSchemeName;
+if (SSLStatus.signatureSchemeName !== "none") {
+  info.signatureSchemeName = SSLStatus.signatureSchemeName;
+}
 
 info.isDomainMismatch = SSLStatus.isDomainMismatch;
 info.isExtendedValidation = SSLStatus.isExtendedValidation;



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

[tor-commits] [tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1470516 - remove or fix localized values in securityInfo, r=rpl

[gk]

commit 05cbc6e53b30707e32af750eb082a90f715cbf95
Author: Shane Caraveo 
Date:   Mon Jul 2 15:45:18 2018 -0300

Bug 1470516 - remove or fix localized values in securityInfo, r=rpl

MozReview-Commit-ID: 3xURSfbPTmS

--HG--
extra : rebase_source : aeb333a0c72120724a5a7d988f460e3c703b09c3
---
 toolkit/components/extensions/schemas/web_request.json   | 9 +++--
 .../extensions/test/mochitest/test_ext_webrequest_hsts.html  | 2 ++
 toolkit/modules/addons/SecurityInfo.jsm  | 5 ++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/toolkit/components/extensions/schemas/web_request.json 
b/toolkit/components/extensions/schemas/web_request.json
index ed1840cabe2a..508ca8b05f8f 100644
--- a/toolkit/components/extensions/schemas/web_request.json
+++ b/toolkit/components/extensions/schemas/web_request.json
@@ -189,10 +189,10 @@
   },
   "validity": {
 "type": "object",
-"description": "Contains start and end dates in GMT.",
+"description": "Contains start and end timestamps.",
 "properties": {
-  "startGMT": { "type": "string" },
-  "endGMT": { "type": "string" }
+  "start": { "type": "integer" },
+  "end": { "type": "integer" }
 }
   },
   "fingerprint": {
@@ -214,9 +214,6 @@
   "sha256": { "type": "string" }
 }
   },
-  "keyUsages": {
-"type": "string"
-  },
   "rawDER": {
 "optional": true,
 "type": "array",
diff --git 
a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html 
b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html
index 849527ea4a80..df8b541808f9 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html
@@ -37,6 +37,8 @@ function getExtension() {
   } else {
 browser.test.assertTrue(securityInfo.certificates.length == 1, "no 
certificate chain");
   }
+  let cert = securityInfo.certificates[0];
+  browser.test.assertTrue(cert.validity.start < Date.now() < 
cert.validity.end, "cert validity is correct");
   if (options.rawDER) {
 for (let cert of securityInfo.certificates) {
   browser.test.assertTrue(cert.rawDER.length > 0, "have rawDER");
diff --git a/toolkit/modules/addons/SecurityInfo.jsm 
b/toolkit/modules/addons/SecurityInfo.jsm
index 4984f76dd463..8c5cef18754d 100644
--- a/toolkit/modules/addons/SecurityInfo.jsm
+++ b/toolkit/modules/addons/SecurityInfo.jsm
@@ -210,8 +210,8 @@ const SecurityInfo = {
   subject: cert.subjectName,
   issuer: cert.issuerName,
   validity: {
-startGMT: cert.validity.notBeforeGMT,
-endGMT: cert.validity.notAfterGMT,
+start: cert.validity.notBefore,
+end: cert.validity.notAfter,
   },
   fingerprint: {
 sha1: cert.sha1Fingerprint,
@@ -222,7 +222,6 @@ const SecurityInfo = {
   subjectPublicKeyInfoDigest: {
 sha256: cert.sha256SubjectPublicKeyInfoDigest,
   },
-  keyUsages: cert.keyUsages,
 };
 if (options.rawDER) {
   certData.rawDER = cert.getRawDER({});



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

[tor-commits] [tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1322748 add securityInfo to webRequest listeners, r=keeler, rpl

[gk]

commit 1935dcf38ca112f9fbc9fe42c2289d77e4f95932
Author: Shane Caraveo 
Date:   Wed May 23 14:36:19 2018 -0400

Bug 1322748 add securityInfo to webRequest listeners, r=keeler,rpl

MozReview-Commit-ID: Hen1tl1RWTC

--HG--
extra : rebase_source : e5dae021438ece0477d89e1d4e91eaaf2ebfd06e
---
 toolkit/components/extensions/ext-webRequest.js|   8 +
 .../components/extensions/schemas/web_request.json | 171 
 .../test/mochitest/test_ext_webrequest_hsts.html   |  28 +-
 toolkit/modules/addons/SecurityInfo.jsm| 297 +
 toolkit/modules/addons/WebRequest.jsm  |  21 +-
 toolkit/modules/moz.build  |   1 +
 6 files changed, 516 insertions(+), 10 deletions(-)

diff --git a/toolkit/components/extensions/ext-webRequest.js 
b/toolkit/components/extensions/ext-webRequest.js
index f953be4a6e40..19306816adc3 100644
--- a/toolkit/components/extensions/ext-webRequest.js
+++ b/toolkit/components/extensions/ext-webRequest.js
@@ -102,6 +102,14 @@ this.webRequest = class extends ExtensionAPI {
 onResponseStarted: new WebRequestEventManager(context, 
"onResponseStarted").api(),
 onErrorOccurred: new WebRequestEventManager(context, 
"onErrorOccurred").api(),
 onCompleted: new WebRequestEventManager(context, "onCompleted").api(),
+getSecurityInfo: function(requestId, options = {}) {
+  return WebRequest.getSecurityInfo({
+id: requestId,
+extension: context.extension.policy,
+tabParent: context.xulBrowser.frameLoader.tabParent,
+options,
+  });
+},
 handlerBehaviorChanged: function() {
   // TODO: Flush all caches.
 },
diff --git a/toolkit/components/extensions/schemas/web_request.json 
b/toolkit/components/extensions/schemas/web_request.json
index 97badfc797b9..ed1840cabe2a 100644
--- a/toolkit/components/extensions/schemas/web_request.json
+++ b/toolkit/components/extensions/schemas/web_request.json
@@ -177,6 +177,148 @@
 }
   },
   {
+"id": "CertificateInfo",
+"type": "object",
+"description": "Contains the certificate properties of the request if 
it is a secure request.",
+"properties": {
+  "subject": {
+"type": "string"
+  },
+  "issuer": {
+"type": "string"
+  },
+  "validity": {
+"type": "object",
+"description": "Contains start and end dates in GMT.",
+"properties": {
+  "startGMT": { "type": "string" },
+  "endGMT": { "type": "string" }
+}
+  },
+  "fingerprint": {
+"type": "object",
+"properties": {
+  "sha1": { "type": "string" },
+  "sha256": { "type": "string" }
+}
+  },
+  "serialNumber": {
+"type": "string"
+  },
+  "isBuiltInRoot": {
+"type": "boolean"
+  },
+  "subjectPublicKeyInfoDigest": {
+"type": "object",
+"properties": {
+  "sha256": { "type": "string" }
+}
+  },
+  "keyUsages": {
+"type": "string"
+  },
+  "rawDER": {
+"optional": true,
+"type": "array",
+"items": {
+  "type": "integer"
+}
+  }
+}
+  },
+  {
+"id": "CertificateTransparencyStatus",
+"type": "string",
+"enum": ["not_applicable", "policy_compliant", 
"policy_not_enough_scts", "policy_not_diverse_scts"]
+  },
+  {
+"id": "TransportWeaknessReasons",
+"type": "string",
+"enum": ["cipher"]
+  },
+  {
+"id": "SecurityInfo",
+"type": "object",
+"description": "Contains the security properties of the request (ie. 
SSL/TLS information).",
+"properties": {
+  "state": {
+"type": "string",
+"enum": [
+  "insecure",
+  "weak",
+  "broken",
+  "secure"
+]
+  },
+  "errorMessage": {
+"type": "string",
+"description": "Error message if state is \"broken\"",
+"optional": true
+  },
+  "protocolVersion": {
+"type": "string",
+"description": "Protocol version if state is \"secure\"",
+"enum": [
+  "TLSv1",
+  "TLSv1.1",
+  "TLSv1.2",
+  "TLSv1.3",
+  "unknown"
+],
+"optional": true
+  },
+  "cipherSuite": {
+"type": "string",
+"description": "The cipher suite used in this request if state is 
\"secure\".",
+"optional": true
+  },
+  "certificates": {
+"description": "Certificate data if 

[tor-commits] [tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1464481 - fix and test crash when getting registered channelwrapper, r=kmag

[gk]

commit 1305066f21439675842aad91844e6b490df8c3e0
Author: Shane Caraveo 
Date:   Fri May 25 16:41:19 2018 -0400

Bug 1464481 - fix and test crash when getting registered channelwrapper, 
r=kmag

MozReview-Commit-ID: LEGojHEb742

--HG--
extra : rebase_source : 7018cfef6b7415ea275dc2c3e414586396a9e2be
---
 dom/chrome-webidl/ChannelWrapper.webidl|  2 +-
 .../test/mochitest/test_ext_webrequest_hsts.html   | 25 ++
 toolkit/modules/addons/WebRequest.jsm  |  4 +++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/dom/chrome-webidl/ChannelWrapper.webidl 
b/dom/chrome-webidl/ChannelWrapper.webidl
index 2777aab65c8e..bc959d30d043 100644
--- a/dom/chrome-webidl/ChannelWrapper.webidl
+++ b/dom/chrome-webidl/ChannelWrapper.webidl
@@ -52,7 +52,7 @@ interface ChannelWrapper : EventTarget {
* Returns the wrapper instance for the given channel. The same wrapper is
* always returned for a given channel.
*/
-  static ChannelWrapper getRegisteredChannel(unsigned long long aChannelId,
+  static ChannelWrapper? getRegisteredChannel(unsigned long long aChannelId,
  WebExtensionPolicy extension,
  TabParent? tabParent);
 
diff --git 
a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html 
b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html
index ad4d4f32a657..849527ea4a80 100644
--- a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html
@@ -185,6 +185,31 @@ add_task(async function test_hsts_header() {
 
   await extension.unload();
 });
+
+add_task(async function test_nonBlocking_securityInfo() {
+  let extension = ExtensionTestUtils.loadExtension({
+manifest: {
+  "permissions": [
+"webRequest",
+"",
+  ],
+},
+async background() {
+  let tab;
+  browser.webRequest.onHeadersReceived.addListener(async (details) => {
+let securityInfo = await 
browser.webRequest.getSecurityInfo(details.requestId, {});
+browser.test.assertTrue(!securityInfo, "securityInfo undefined on http 
request");
+browser.tabs.remove(tab.id);
+browser.test.notifyPass("success");
+  }, {urls: [""], types: ["main_frame"]});
+  tab = await browser.tabs.create({url: 
"https://example.org/tests/toolkit/components/extensions/test/mochitest/file_sample.html"});
+},
+  });
+  await extension.startup();
+
+  await extension.awaitFinish("success");
+  await extension.unload();
+});
 
 
 
diff --git a/toolkit/modules/addons/WebRequest.jsm 
b/toolkit/modules/addons/WebRequest.jsm
index a4c9e9859a21..6a95182a3876 100644
--- a/toolkit/modules/addons/WebRequest.jsm
+++ b/toolkit/modules/addons/WebRequest.jsm
@@ -1012,7 +1012,9 @@ var WebRequest = {
 
   getSecurityInfo: (details) => {
 let channel = ChannelWrapper.getRegisteredChannel(details.id, 
details.extension, details.tabParent);
-return SecurityInfo.getSecurityInfo(channel.channel, details.options);
+if (channel) {
+  return SecurityInfo.getSecurityInfo(channel.channel, details.options);
+}
   },
 };
 



___
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 624ab8b6f695c1409d35cc56dd51dbe1ff8a6873
Author: Translation commit bot 
Date:   Mon Dec 3 15:49:38 2018 +

Update translations for support-portal
---
 contents+fo.po | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/contents+fo.po b/contents+fo.po
index 1185f4933..7219540af 100644
--- a/contents+fo.po
+++ b/contents+fo.po
@@ -1,5 +1,6 @@
 # Translators:
 # erinm, 2018
+# Robin Kjeld , 2018
 # 
 msgid ""
 msgstr ""
@@ -7,7 +8,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-11-30 10:36+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: erinm, 2018\n"
+"Last-Translator: Robin Kjeld , 2018\n"
 "Language-Team: Faroese (https://www.transifex.com/otf/teams/1519/fo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -3775,7 +3776,7 @@ msgstr ""
 #: http//localhost/misc/tor-bittorrent/
 #: (content/misc/misc-4/contents+en.lrquestion.description)
 msgid "We do not recommend using Tor with BitTorrent."
-msgstr ""
+msgstr "Vit viðmæla ikki at brúka BitTorrent ígjögnum Tor. "
 
 #: http//localhost/misc/tor-bittorrent/
 #: (content/misc/misc-4/contents+en.lrquestion.description)
@@ -3848,7 +3849,7 @@ msgstr "Goymir Tor loggar?"
 #: (content/misc/misc-6/contents+en.lrquestion.description)
 msgid "Tor doesn't keep any logs that could identify a particular user."
 msgstr ""
-"Tor goymir ikki dátu sum kunnu brúkast at eymerkja ein einstakan brúkara."
+"Tor goymir ikki loggar sum kunnu brúkast at eymerkja ein einstakan brúkara."
 
 #: http//localhost/misc/does-tor-keep-logs/
 #: (content/misc/misc-6/contents+en.lrquestion.description)
@@ -3873,7 +3874,7 @@ msgstr ""
 #: 
http//localhost/misc/does-tor-project-offer-email-or-privacy-protecting-web-services/
 #: (content/misc/misc-7/contents+en.lrquestion.description)
 msgid "No, we don't provide any online services."
-msgstr ""
+msgstr "Nei, vit veita ikki nakrar online tænastur."
 
 #: 
http//localhost/misc/does-tor-project-offer-email-or-privacy-protecting-web-services/
 #: (content/misc/misc-7/contents+en.lrquestion.description)
@@ -3909,12 +3910,12 @@ msgstr ""
 #: http//localhost/misc/having-a-problem-updating-vidalia/
 #: (content/misc/misc-9/contents+en.lrquestion.title)
 msgid "I'm having a problem updating or using Vidalia."
-msgstr ""
+msgstr "Eg havi ein trupuleika við at dagföra ella brúka Vidalia."
 
 #: http//localhost/misc/having-a-problem-updating-vidalia/
 #: (content/misc/misc-9/contents+en.lrquestion.description)
 msgid "Vidalia is no longer maintained or supported."
-msgstr "Vidalia verður iki longur dagfört ella stuðla."
+msgstr "Vidalia verður hvörki stuðla ella dagfört longur."
 
 #: http//localhost/misc/having-a-problem-updating-vidalia/
 #: (content/misc/misc-9/contents+en.lrquestion.description)
@@ -3922,6 +3923,8 @@ msgid ""
 "A large portion of the features Vidalia offered have now been integrated "
 "into Tor Browser itself."
 msgstr ""
+"Ein stórur partur av möguleikunum ið Vidalia hevði eru nú tökir í Tor "
+"Kagarinum. "
 
 #: http//localhost/misc/having-a-problem-updating-vidalia/
 #: (content/misc/misc-9/contents+en.lrquestion.seo_slug)

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

[tor-commits] [torbutton/master] Bug 28540: Use new text for 2018 donation banner

[gk]

commit 4ad39b362dd7692b5e24841c616f63a5ca2bc67a
Author: Arthur Edelstein 
Date:   Tue Nov 20 17:25:48 2018 -0800

Bug 28540: Use new text for 2018 donation banner
---
 src/chrome/content/aboutTor/aboutTor-content.js |  2 +-
 src/chrome/content/aboutTor/aboutTor.xhtml  | 24 +++-
 src/chrome/content/torbutton.js |  2 +-
 src/defaults/preferences/preferences.js |  2 +-
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/chrome/content/aboutTor/aboutTor-content.js 
b/src/chrome/content/aboutTor/aboutTor-content.js
index d34bbe5c..e53266bd 100644
--- a/src/chrome/content/aboutTor/aboutTor-content.js
+++ b/src/chrome/content/aboutTor/aboutTor-content.js
@@ -72,7 +72,7 @@ var AboutTorListener = {
 sendAsyncMessage(that.kAboutTorHideDonationBanner);
   });
 });
-bindPrefAndInit("extensions.torbutton.donation_banner_countdown",
+bindPrefAndInit("extensions.torbutton.donation_banner_countdown2",
 countdown => {
   if (content.document && content.document.body) {
 content.document.body.setAttribute(
diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml 
b/src/chrome/content/aboutTor/aboutTor.xhtml
index 94dd13f3..5f5fccdc 100644
--- a/src/chrome/content/aboutTor/aboutTor.xhtml
+++ b/src/chrome/content/aboutTor/aboutTor.xhtml
@@ -37,15 +37,17 @@ window.addEventListener("pageshow", function() {
 
   
   
-
+   data-6=""
+   data-7=""
+   data-8=""
+   data-9=""
+   data-10=""
+   data-11="">
+
   
-  
+  
+
   https://www.torproject.org/donate/donate-sin-tbd0-0;
  type="button"
@@ -58,13 +60,17 @@ window.addEventListener("pageshow", function() {
   
 

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

[translation]

commit 0094ec85f83d7e5e2b0a0a3f95e48766ed255075
Author: Translation commit bot 
Date:   Mon Dec 3 08:46:59 2018 +

Update translations for tba-torbrowserstringsdtd_completed
---
 ar/android_strings.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ar/android_strings.dtd b/ar/android_strings.dtd
index 5bd00cec6..4aace79db 100644
--- a/ar/android_strings.dtd
+++ b/ar/android_strings.dtd
@@ -12,14 +12,14 @@
 
 
 
-
+
 
 
 
-
+
 
 
-
+
 
-
+
 

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

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

[translation]

commit 61a2d7beae2442b365e1e61c31317bcc3197dd1d
Author: Translation commit bot 
Date:   Mon Dec 3 08:46:53 2018 +

Update translations for tba-torbrowserstringsdtd
---
 ar/android_strings.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ar/android_strings.dtd b/ar/android_strings.dtd
index 5bd00cec6..4aace79db 100644
--- a/ar/android_strings.dtd
+++ b/ar/android_strings.dtd
@@ -12,14 +12,14 @@
 
 
 
-
+
 
 
 
-
+
 
 
-
+
 
-
+
 

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

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

[translation]

commit 29bbfd9af540f0578922d74574169e3bbfdd281b
Author: Translation commit bot 
Date:   Mon Dec 3 08:18:35 2018 +

Update translations for torbutton-browseronboardingproperties
---
 ar/browserOnboarding.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ar/browserOnboarding.properties b/ar/browserOnboarding.properties
index f1c05b79e..448f6a61d 100644
--- a/ar/browserOnboarding.properties
+++ b/ar/browserOnboarding.properties
@@ -23,7 +23,7 @@ onboarding.tour-tor-circuit-display.description=For each 
domain you visit, your
 onboarding.tour-tor-circuit-display.button=See My Path
 
 onboarding.tour-tor-security=الأمان
-onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.title=اختر مدى خبرتك
 onboarding.tour-tor-security.description=We also provide you with additional 
settings for bumping up your browser security. Our Security Settings allow you 
to block elements that could be used to attack your computer. Click below to 
see what the different options do.
 onboarding.tour-tor-security.button=Review Settings
 

___
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 ab4c11f3331e6b24510bc7ebca266c597a21c7c4
Author: Translation commit bot 
Date:   Mon Dec 3 08:17:03 2018 +

Update translations for tbmanual-contentspot
---
 contents+ar.po | 21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/contents+ar.po b/contents+ar.po
index eece93002..0158204c7 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -1,8 +1,8 @@
 # Translators:
-# Emma Peel, 2018
 # Mohamed El-Feky , 2018
 # ButterflyOfFire ButterflyOfFire, 2018
 # erinm, 2018
+# Emma Peel, 2018
 # 
 msgid ""
 msgstr ""
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-11-30 09:02+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: erinm, 2018\n"
+"Last-Translator: Emma Peel, 2018\n"
 "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -110,6 +110,9 @@ msgid ""
 " valid for a single session (until Tor Browser is exited or a New Identity is requested)."
 msgstr ""
+"مبدئيا لا يحفظ متصفّح تور تأريخ التصفح. 
صلاحية الكعكات جلسة واحدة فقط (حتى "
+"إغلاق متصفّح تور أو طلبهويّة "
+"جديدة)."
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.body)
@@ -192,7 +195,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/en-US/downloading/
 #: (content/downloading/contents+en-US.lrtopic.body)
 msgid "# Mirrors"
-msgstr ""
+msgstr "# مرآة"
 
 #: https//tb-manual.torproject.org/en-US/downloading/
 #: (content/downloading/contents+en-US.lrtopic.body)
@@ -408,6 +411,8 @@ msgid ""
 "Most Pluggable Transports, such as obfs3 and obfs4, rely on the use of "
 "“bridge” relays."
 msgstr ""
+"تعتمد غالبية النواقل الموصولة، مثل obfs3 و 
obfs4، على استخدام تحويلات "
+"”الجسور“."
 
 #: https//tb-manual.torproject.org/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)
@@ -459,6 +464,8 @@ msgstr "* اذهب إلى https://bridges.torproject.org و 
اتبع التعل
 msgid ""
 "* Email brid...@torproject.org from a Gmail, Yahoo, or Riseup email address"
 msgstr ""
+"* راسل brid...@torproject.org من عنوان بريد إلكتروني 
Yahoo، أو Gmail، أو "
+"Riseup"
 
 #: https//tb-manual.torproject.org/en-US/bridges/
 #: (content/bridges/contents+en-US.lrtopic.body)
@@ -2136,7 +2143,7 @@ msgstr ""
 
 #: templates/footer.html:24
 msgid "Subscribe to our Newsletter"
-msgstr ""
+msgstr "اشترك في رسالتنا للمستجدات"
 
 #: templates/footer.html:25
 msgid "Get monthly updates and opportunities from the Tor Project"
@@ -2150,7 +2157,7 @@ msgstr ""
 
 #: templates/layout.html:7
 msgid "Tor Project | Tor Browser Manual"
-msgstr ""
+msgstr "مشروع تور | دليل استخدام متصفّح تور"
 
 #: templates/navbar.html:4
 msgid "Tor Logo"
@@ -2158,11 +2165,11 @@ msgstr "شعار تور"
 
 #: templates/navbar.html:40
 msgid "Download Tor Browser"
-msgstr ""
+msgstr "تنزيل متصفح تور"
 
 #: templates/search.html:5
 msgid "Search"
-msgstr ""
+msgstr "بحث"
 
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"

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

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

[translation]

commit 2d7afeddfc497300843b1f9c7fd3ae50cb78a299
Author: Translation commit bot 
Date:   Mon Dec 3 08:16:57 2018 +

Update translations for tba-torbrowserstringsdtd_completed
---
 ar/android_strings.dtd | 25 +
 1 file changed, 25 insertions(+)

diff --git a/ar/android_strings.dtd b/ar/android_strings.dtd
new file mode 100644
index 0..5bd00cec6
--- /dev/null
+++ b/ar/android_strings.dtd
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

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

[translation]

commit 7c12525f8356343f172db2d369b1ebe43fc009e6
Author: Translation commit bot 
Date:   Mon Dec 3 08:16:53 2018 +

Update translations for tba-torbrowserstringsdtd
---
 ar/android_strings.dtd | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ar/android_strings.dtd b/ar/android_strings.dtd
index 47c7e474d..5bd00cec6 100644
--- a/ar/android_strings.dtd
+++ b/ar/android_strings.dtd
@@ -9,17 +9,17 @@
 
 
 
-
+
 
 
-
-
+
+
 
 
-
-
+
+
 
-
+
 
 
-
+

___
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] Update OpenSSL to 1.0.2q

[gk]

commit 30c764db2bbbde93ebee67e2b190a4d9c88873b9
Author: Georg Koppen 
Date:   Mon Dec 3 08:06:40 2018 +

Update OpenSSL to 1.0.2q
---
 projects/openssl/config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/openssl/config b/projects/openssl/config
index d3ed959..e91e820 100644
--- a/projects/openssl/config
+++ b/projects/openssl/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.0.2p
+version: 1.0.2q
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% 
c("var/build_id") %].tar.gz'
 
 var:
@@ -26,4 +26,4 @@ input_files:
   - name: '[% c("var/compiler") %]'
 project: '[% c("var/compiler") %]'
   - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz'
-sha256sum: 50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00
+sha256sum: 5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684

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