date:20200901

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

2020-09-01 Thread translation

commit 08177a210516f3fe902b11b9eabaab1737b05546
Author: Translation commit bot 
Date:   Tue Sep 1 21:45:11 2020 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+ar.po | 20 ++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/contents+ar.po b/contents+ar.po
index 611c7f5f0c..268b82bfb8 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -3993,6 +3993,8 @@ msgid ""
 "most critical are Tor Browser, the Tor Browser User Manual, and our Support "
 "Portal:"
 msgstr ""
+"Ø¹ÙÙ Ø§ÙØ±ØºÙ ÙÙ Ø£ÙÙØ§ ÙÙØ¯Ø± ÙØ³Ø§ÙÙØªÙ ÙÙ Ø£Ù ÙÙ Ø§ÙÙ
Ø´Ø§Ø±ÙØ¹ Ø§ÙÙØ°ÙÙØ±Ø© Ø£Ø¹ÙØ§Ù Ø Ø¥ÙØ§ Ø£Ù "
+"Ø£ÙÙÙØ§ ÙÙ ÙØªØµÙØ Tor ÙØ¯ÙÙÙ ÙØ³ØªØ®Ø¯Ù ÙØªØµÙØ Tor 
ÙØ¨ÙØ§Ø¨Ø© Ø§ÙØ¯Ø¹Ù Ø§ÙØ®Ø§ØµØ© Ø¨ÙØ§:"
 
 #: https//community.torproject.org/localization/pick-a-project/
 #: (content/localization/pick-a-project/contents+en.lrpage.body)
@@ -4001,6 +4003,9 @@ msgid ""
 "can see the [Tor Browser total strings translated per "
 "language](https://torpat.ch/locales) to see where help is needed."
 msgstr ""
+"* ÙÙØªØ±Ø¬Ù ÙØªØµÙØ Tor ÙÙ Ø§ÙØ¹Ø¯ÙØ¯ ÙÙ ÙÙØ§Ø±Ø¯ Transifex 
Ø§ÙÙØ®ØªÙÙØ© Ø ÙÙÙÙ ÙÙÙÙÙ Ø±Ø¤ÙØ© "
+"[ÙØ¬ÙÙØ¹ Ø³ÙØ§Ø³Ù ÙØªØµÙØ Tor ÙØªØ±Ø¬ÙØ© ÙÙÙ ÙØºØ©] 
(https://torpat.ch/locales) ÙÙØ¹Ø±ÙØ© "
+"Ø£ÙÙ ØªØØªØ§Ø¬ Ø¥ÙÙ Ø§ÙÙØ³Ø§Ø¹Ø¯Ø©."
 
 #: https//community.torproject.org/localization/pick-a-project/
 #: (content/localization/pick-a-project/contents+en.lrpage.body)
@@ -4011,6 +4016,11 @@ msgid ""
 "[translate](https://www.transifex.com/otf/tor-project-support-community-;
 "portal/tbmanual-contentspot/)."
 msgstr ""
+"* ÙØ¹Ø¯ Ø¯ÙÙÙ ÙØ³ØªØ®Ø¯Ù ÙØªØµÙØ Tor ÙØµØ¯Ø±ÙØ§ ÙÙÙØ¯ÙØ§ 
Ø¬Ø¯ÙØ§ ÙÙÙØ³ØªØ®Ø¯ÙÙÙ Ø§ÙØ¬Ø¯Ø¯ Ø§ÙØ°ÙÙ ÙØ§ "
+"ÙØªØØ¯Ø«ÙÙ Ø§ÙØ¥ÙØ¬ÙÙØ²ÙØ© Ø Ø±Ø§Ø¬Ø¹ [Ø¥ØØµØ§Ø¦ÙØ§Øª ØªØ±Ø¬ÙØ© 
Ø¯ÙÙÙ ÙØ³ØªØ®Ø¯Ù ÙØªØµÙØ Tor] "
+"(https://torpat.ch/manual-locales) Ø£Ù [ØªØ±Ø¬Ù] (https: / "
+"/www.transifex.com/otf/tor-project-support-community-portal/tbmanual-"
+"contentspot/)."
 
 #: https//community.torproject.org/localization/pick-a-project/
 #: (content/localization/pick-a-project/contents+en.lrpage.body)
@@ -4020,11 +4030,15 @@ msgid ""
 "or [translate](https://www.transifex.com/otf/tor-project-support-community-;
 "portal/support-portal/)"
 msgstr ""
+"* ØªØ¹Ø¯ Ø¨ÙØ§Ø¨Ø© Ø§ÙØ¯Ø¹Ù Ø£ÙØ¶ÙØ§ ÙØµØ¯Ø±ÙØ§ ÙÙÙÙØ§ ÙØ¬ÙÙØ¹ 
ÙØ³ØªØ®Ø¯ÙÙ Tor Ø Ø±Ø§Ø¬Ø¹ [Ø¥ØØµØ§Ø¦ÙØ§Øª "
+"ØªØ±Ø¬ÙØ© Ø¨ÙØ§Ø¨Ø© Ø¯Ø¹Ù Tor] (https://torpat.ch/support-locales) Ø£Ù 
[ØªØ±Ø¬Ù] "
+"(https://www.transifex.com/ otf / tor-project-support-community-portal / "
+"support-portal /)"
 
 #: https//community.torproject.org/localization/translation-problem/
 #: (content/localization/translation-problem/contents+en.lrpage.title)
 msgid "Report a problem with a translation"
-msgstr ""
+msgstr "Ø§ÙØ¥Ø¨ÙØ§Øº Ø¹Ù ÙØ´ÙÙØ© ÙÙ Ø§ÙØªØ±Ø¬ÙØ©"
 
 #: https//community.torproject.org/localization/translation-problem/
 #: (content/localization/translation-problem/contents+en.lrpage.subtitle)
@@ -4032,11 +4046,13 @@ msgid ""
 "Sometimes the translations of apps are not working correctly. Here you can "
 "learn to fix it."
 msgstr ""
+"ÙÙ Ø¨Ø¹Ø¶ Ø§ÙØ£ØÙØ§Ù ÙØ§ ØªØ¹ÙÙ ØªØ±Ø¬ÙØ§Øª Ø§ÙØªØ·Ø¨ÙÙØ§Øª 
Ø¨Ø´ÙÙ ØµØÙØ. ÙÙØ§ ÙÙÙÙÙ ØªØ¹ÙÙ ÙÙÙÙØ© "
+"Ø¥ØµÙØ§ØÙ."
 
 #: https//community.torproject.org/localization/translation-problem/
 #: (content/localization/translation-problem/contents+en.lrpage.body)
 msgid "### Reporting an error with a translation"
-msgstr ""
+msgstr "### Ø§ÙØ¥Ø¨ÙØ§Øº Ø¹Ù Ø®Ø·Ø£ ÙÙ Ø§ÙØªØ±Ø¬ÙØ©"
 
 #: https//community.torproject.org/localization/translation-problem/
 #: (content/localization/translation-problem/contents+en.lrpage.body)

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

[tor-commits] [stem/master] Replace all IOErrors with OSErrors

2020-09-01 Thread atagar

commit 4164c7a6203fae6671075dfba69461340dd05bc5
Author: Damian Johnson 
Date:   Tue Sep 1 13:57:23 2020 -0700

Replace all IOErrors with OSErrors

PEP 3151 deprecated IOError...

  
https://www.python.org/dev/peps/pep-3151/#confusing-set-of-os-related-exceptions

Python 3.3 turned IOError into an OSError alias, so this commit shouldn't
impact our users...

  >>> raise OSError('boom')
  Traceback (most recent call last):
File "", line 1, in 
  OSError: boom

  >>> raise IOError('boom')
  Traceback (most recent call last):
File "", line 1, in 
  OSError: boom
---
 cache_fallback_directories.py |  2 +-
 cache_manual.py   |  4 +-
 docs/_static/example/check_digests.py |  2 +-
 docs/_static/example/manual_config_options.py |  2 +-
 docs/_static/example/reading_twitter.py   |  4 +-
 docs/change_log.rst   |  1 +
 stem/__init__.py  |  2 +-
 stem/connection.py|  2 +-
 stem/descriptor/__init__.py   | 10 ++---
 stem/descriptor/bandwidth_file.py |  2 +-
 stem/descriptor/collector.py  |  8 ++--
 stem/descriptor/extrainfo_descriptor.py   |  2 +-
 stem/descriptor/hidden_service.py |  2 +-
 stem/descriptor/microdescriptor.py|  2 +-
 stem/descriptor/networkstatus.py  |  6 +--
 stem/descriptor/router_status_entry.py|  2 +-
 stem/descriptor/server_descriptor.py  |  2 +-
 stem/descriptor/tordnsel.py   |  2 +-
 stem/directory.py | 18 
 stem/interpreter/__init__.py  |  2 +-
 stem/manual.py| 26 +--
 stem/util/conf.py |  8 ++--
 stem/util/connection.py   | 12 +++---
 stem/util/proc.py | 62 +--
 stem/util/system.py   | 16 +++
 stem/version.py   | 12 +++---
 test/integ/util/connection.py |  2 +-
 test/integ/version.py |  4 +-
 test/unit/descriptor/collector.py |  8 ++--
 test/unit/directory/fallback.py   |  6 +--
 test/unit/manual.py   | 12 +++---
 test/unit/util/connection.py  | 48 ++---
 test/unit/util/proc.py|  4 +-
 test/unit/util/system.py  |  4 +-
 test/unit/version.py  |  4 +-
 35 files changed, 153 insertions(+), 152 deletions(-)

diff --git a/cache_fallback_directories.py b/cache_fallback_directories.py
index 7f712683..8fe425d1 100755
--- a/cache_fallback_directories.py
+++ b/cache_fallback_directories.py
@@ -26,7 +26,7 @@ if __name__ == '__main__':
 
   try:
 stem_commit = stem.util.system.call('git rev-parse HEAD')[0]
-  except IOError as exc:
+  except OSError as exc:
 print("Unable to determine stem's current commit: %s" % exc)
 sys.exit(1)
 
diff --git a/cache_manual.py b/cache_manual.py
index 803197f1..4ddb843f 100755
--- a/cache_manual.py
+++ b/cache_manual.py
@@ -26,7 +26,7 @@ if __name__ == '__main__':
 
   try:
 stem_commit = stem.util.system.call('git rev-parse HEAD')[0]
-  except IOError as exc:
+  except OSError as exc:
 print("Unable to determine stem's current commit: %s" % exc)
 sys.exit(1)
 
@@ -39,7 +39,7 @@ if __name__ == '__main__':
 db_schema = cached_manual.schema
   except stem.manual.SchemaMismatch as exc:
 cached_manual, db_schema = None, exc.database_schema
-  except IOError:
+  except OSError:
 cached_manual, db_schema = None, None  # local copy has been deleted
 
   if db_schema != stem.manual.SCHEMA_VERSION:
diff --git a/docs/_static/example/check_digests.py 
b/docs/_static/example/check_digests.py
index 2be3c368..69f509cf 100644
--- a/docs/_static/example/check_digests.py
+++ b/docs/_static/example/check_digests.py
@@ -19,7 +19,7 @@ def download_descriptors(fingerprint):
   router_status_entries = filter(lambda desc: desc.fingerprint == fingerprint, 
conensus_query.run())
 
   if len(router_status_entries) != 1:
-raise IOError("Unable to find relay '%s' in the consensus" % fingerprint)
+raise OSError("Unable to find relay '%s' in the consensus" % fingerprint)
 
   return (
 router_status_entries[0],
diff --git a/docs/_static/example/manual_config_options.py 
b/docs/_static/example/manual_config_options.py
index 964ff523..4a503579 100644
--- a/docs/_static/example/manual_config_options.py
+++ b/docs/_static/example/manual_config_options.py
@@ -5,7 +5,7 @@ try:
   print("Downloading tor's manual information, please wait...")
   manual = Manual.from_remote()
   print("  done\n")
-except IOError as exc:
+except OSError as exc:
   print("  unsuccessful (%s), using information provided with stem\n"

[tor-commits] [onionperf/master] Bump version to 0.7.

2020-09-01 Thread karsten

commit c8275b25e4afda9328634ec6be56ff46c7ee1cfe
Author: Karsten Loesing 
Date:   Tue Sep 1 22:30:12 2020 +0200

Bump version to 0.7.
---
 CHANGELOG.md | 2 +-
 setup.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0253c5..80fb14d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changes in version 0.7 - 2020-??-??
+# Changes in version 0.7 - 2020-09-01
 
  - Add `onionperf measure --drop-guards` parameter to use and drop
guards and circuit build timeouts every given number of hours, if
diff --git a/setup.py b/setup.py
index 7fd7f85..d72b27a 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ with open('requirements.txt') as f:
 install_requires = f.readlines()
 
 setup(name='OnionPerf',
-  version='0.6',
+  version='0.7',
   description='A utility to monitor, measure, analyze, and visualize the 
performance of Tor and Onion Services',
   author='Rob Jansen',
   url='https://github.com/robgjansen/onionperf/',

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

[tor-commits] [onionperf/master] Let TGen client finish by itself in one-shot mode.

2020-09-01 Thread karsten

commit 959cf3689106189001a83c7e58dc40e10497a081
Author: Philipp Winter 
Date:   Fri Aug 7 14:48:58 2020 -0700

Let TGen client finish by itself in one-shot mode.

We tell TGen client to finish on its own by passing the count option to
the end node:
https://github.com/shadow/tgen/blob/master/doc/TGen-Options.md#end-options

This patch adds another argument to the function watchdog_thread_task(),
no_relaunch, which instructs the function to not re-launch its process
if it fails.
---
 onionperf/measurement.py | 45 +++--
 onionperf/model.py   |  3 ++-
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/onionperf/measurement.py b/onionperf/measurement.py
index e2d8d1c..d699292 100644
--- a/onionperf/measurement.py
+++ b/onionperf/measurement.py
@@ -50,10 +50,11 @@ def readline_thread_task(instream, q):
 # wait for lines from stdout until the EOF
 for line in iter(instream.readline, b''): q.put(line)
 
-def watchdog_thread_task(cmd, cwd, writable, done_ev, send_stdin, 
ready_search_str, ready_ev):
+def watchdog_thread_task(cmd, cwd, writable, done_ev, send_stdin, 
ready_search_str, ready_ev, no_relaunch):
 
-# launch or re-launch our sub process until we are told to stop
-# if we fail too many times in too short of time, give up and exit
+# launch or re-launch (or don't re-launch, if no_relaunch is set) our sub
+# process until we are told to stop if we fail too many times in too short
+# of time, give up and exit
 failure_times = []
 pause_time_seconds = 0
 while done_ev.is_set() is False:
@@ -105,6 +106,10 @@ def watchdog_thread_task(cmd, cwd, writable, done_ev, 
send_stdin, ready_search_s
 subp.wait()
 elif done_ev.is_set():
 logging.info("command '{}' finished as expected".format(cmd))
+elif no_relaunch:
+logging.info("command '{}' finished on its own".format(cmd))
+# our command finished on its own. time to terminate.
+done_ev.set()
 else:
 logging.warning("command '{}' finished before 
expected".format(cmd))
 now = time.time()
@@ -284,15 +289,9 @@ class Measurement(object):
 time.sleep(1)
 while True:
 if tgen_model.num_transfers:
-downloads = 0
-while True:
-downloads = 
self.__get_download_count(tgen_client_writable.filename)
-time.sleep(1)
-if downloads >= tgen_model.num_transfers:
-logging.info("Onionperf has downloaded %d 
files and will now shut down." % tgen_model.num_transfers)
-break
-else:
-continue
+# This function blocks until our TGen client process
+# terminated on its own.
+self.__wait_for_tgen_client()
 break
 
 if self.__is_alive():
@@ -366,7 +365,10 @@ class Measurement(object):
 logging.info("Logging TGen {1} process output to 
{0}".format(tgen_logpath, name))
 
 tgen_cmd = "{0} {1}".format(self.tgen_bin_path, tgen_confpath)
-tgen_args = (tgen_cmd, tgen_datadir, tgen_writable, self.done_event, 
None, None, None)
+# If we're running in "one-shot mode", TGen client will terminate on
+# its own and we don't need our watchdog to restart the process.
+no_relaunch = (name == "client" and tgen_model_conf.num_transfers)
+tgen_args = (tgen_cmd, tgen_datadir, tgen_writable, self.done_event, 
None, None, None, no_relaunch)
 tgen_watchdog = threading.Thread(target=watchdog_thread_task, 
name="tgen_{0}_watchdog".format(name), args=tgen_args)
 tgen_watchdog.start()
 self.threads.append(tgen_watchdog)
@@ -464,7 +466,7 @@ WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 
seconds\nDataDirectory
 tor_stdin_bytes = str_tools._to_bytes(tor_config)
 tor_ready_str = "Bootstrapped 100"
 tor_ready_ev = threading.Event()
-tor_args = (tor_cmd, tor_datadir, tor_writable, self.done_event, 
tor_stdin_bytes, tor_ready_str, tor_ready_ev)
+tor_args = (tor_cmd, tor_datadir, tor_writable, self.done_event, 
tor_stdin_bytes, tor_ready_str, tor_ready_ev, False)
 tor_watchdog = threading.Thread(target=watchdog_thread_task, 
name="tor_{0}_watchdog".format(name), args=tor_args)
 tor_watchdog.start()
 self.threads.append(tor_watchdog)
@@ -491,14 +493,13 @@ WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 
seconds\nDataDirectory
 
 return tor_writable, torctl_writable
 
-def __get_download_count(self, tgen_logpath):
-count = 0
-if tgen_logpath is not None and os.path.exists(tgen_logpath):
-

[tor-commits] [onionperf/master] Make some tweaks to new TGen model.

2020-09-01 Thread karsten

commit b8f1e5c2695c097a7494f7975403664c0c833825
Author: Karsten Loesing 
Date:   Sun Aug 16 22:03:34 2020 +0200

Make some tweaks to new TGen model.

 - Change timeout back to 270 seconds and stallout back to 0 seconds.
 - Change initial pause to 300 seconds to keep default behavior
   unchanged.
 - Change model, so that pause_between starts in parallel to a stream,
   not when the stream is completed. This is the same behavior as
   before.

Also add a change log entry for all changes.
---
 CHANGELOG.md|  7 +++
 onionperf/model.py  | 20 
 onionperf/onionperf |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c4c4f2..ac6897b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# Changes in version 0.7 - 2020-??-??
+
+ - Remove the `onionperf measure --oneshot` switch and replace it with
+   new switches `--tgen-pause-initial`, `--tgen-pause-between`,
+   `--tgen-transfer-size`, and `--tgen-num-transfers ` to further
+   configure the generated TGen model.
+
 # Changes in version 0.6 - 2020-??-??
 
  - Update to TGen 1.0.0, use TGenTools for parsing TGen log files, and
diff --git a/onionperf/model.py b/onionperf/model.py
index d45763e..fde587f 100644
--- a/onionperf/model.py
+++ b/onionperf/model.py
@@ -43,8 +43,8 @@ class TGenLoadableModel(TGenModel):
 
 class TGenModelConf(object):
 """Represents a TGen traffic model configuration."""
-def __init__(self, pause_initial=0, num_transfers=1, transfer_size="5 MiB",
- continuous_transfers=False, pause_between=5, port=None, 
servers=[],
+def __init__(self, pause_initial=300, num_transfers=1, transfer_size="5 
MiB",
+ continuous_transfers=False, pause_between=300, port=None, 
servers=[],
  socks_port=None):
 self.pause_initial = pause_initial
 self.pause_between = pause_between
@@ -103,28 +103,24 @@ class TorperfModel(GeneratableTGenModel):
 g.add_node("stream",
sendsize="0",
recvsize=self.config.transfer_size,
-   timeout="15 seconds",
-   stallout="10 seconds")
+   timeout="270 seconds",
+   stallout="0 seconds")
 g.add_node("pause_between",
time="%d seconds" % self.config.pause_between)
 
 g.add_edge("start", "pause_initial")
 g.add_edge("pause_initial", "stream")
+g.add_edge("pause_initial", "pause_between")
+g.add_edge("pause_between", "stream")
+g.add_edge("pause_between", "pause_between")
 
 # only add an end node if we need to stop
-if self.config.continuous_transfers:
-# continuous mode, i.e., no end node
-g.add_edge("stream", "pause_between")
-else:
+if not self.config.continuous_transfers:
 # one-shot mode, i.e., end after configured number of transfers
 g.add_node("end",
count="%d" % self.config.num_transfers)
 # check for end condition after every transfer
 g.add_edge("stream", "end")
-# if end condition not met, pause
-g.add_edge("end", "pause_between")
-
-g.add_edge("pause_between", "stream")
 
 return g
 
diff --git a/onionperf/onionperf b/onionperf/onionperf
index a49982b..6a16da2 100755
--- a/onionperf/onionperf
+++ b/onionperf/onionperf
@@ -194,7 +194,7 @@ def main():
 help="""the number of seconds TGen should wait before walking through 
its action graph""",
 metavar="N", type=int,
 action="store", dest="tgenpauseinitial",
-default=5)
+default=300)
 
 measure_parser.add_argument('--tgen-pause-between',
 help="""the number of seconds TGen should wait in between two 
transfers""",



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

[tor-commits] [onionperf/master] Merge remote-tracking branch 'karsten/task-33399-2' into develop

2020-09-01 Thread karsten

commit 8fe84702dea4b2e4640c0817e505e6c449e7b9a8
Merge: f496ede 9d76ca4
Author: Karsten Loesing 
Date:   Tue Sep 1 22:28:52 2020 +0200

Merge remote-tracking branch 'karsten/task-33399-2' into develop

 CHANGELOG.md |  3 ++-
 onionperf/monitor.py | 12 +++-
 onionperf/onionperf  |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)



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

[tor-commits] [onionperf/master] Tweak #33399 patch.

2020-09-01 Thread karsten

commit dfec0b8960ac214f63985dfc317ffce750ef5922
Author: Karsten Loesing 
Date:   Thu Aug 20 15:40:25 2020 +0200

Tweak #33399 patch.

 - Add a change log entry.
 - Pick are more sensible default for `drop_guards_interval_hours`,
   also to fix unit tests.
---
 CHANGELOG.md | 5 +
 onionperf/measurement.py | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8a86ee..c31a40e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# Changes in version 0.7 - 2020-??-??
+
+ - Add `onionperf measure --drop-guards` parameter to use and drop
+   guards after a given number of hours. Implements #33399.
+
 # Changes in version 0.6 - 2020-08-08
 
  - Update to TGen 1.0.0, use TGenTools for parsing TGen log files, and
diff --git a/onionperf/measurement.py b/onionperf/measurement.py
index 1a5f3bb..709fbc6 100644
--- a/onionperf/measurement.py
+++ b/onionperf/measurement.py
@@ -173,7 +173,7 @@ def logrotate_thread_task(writables, tgen_writable, 
torctl_writable, docroot, ni
 
 class Measurement(object):
 
-def __init__(self, tor_bin_path, tgen_bin_path, datadir_path, 
privatedir_path, nickname, oneshot, additional_client_conf=None, 
torclient_conf_file=None, torserver_conf_file=None, single_onion=False, 
drop_guards_interval_hours=None):
+def __init__(self, tor_bin_path, tgen_bin_path, datadir_path, 
privatedir_path, nickname, oneshot, additional_client_conf=None, 
torclient_conf_file=None, torserver_conf_file=None, single_onion=False, 
drop_guards_interval_hours=0):
 self.tor_bin_path = tor_bin_path
 self.tgen_bin_path = tgen_bin_path
 self.datadir_path = datadir_path



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

[tor-commits] [onionperf/master] Tweak --drop-guards switch.

2020-09-01 Thread karsten

commit 9d76ca4b3847a10c9565d12cf130933a1076297b
Author: Karsten Loesing 
Date:   Tue Sep 1 17:02:47 2020 +0200

Tweak --drop-guards switch.

This commit tweaks the recently added --drop-guards switch as follows:

 - Guards are dropped right at startup and then every N hours.
   Otherwise we might not receive the first round of GUARD NEW/UP
   events. It's unclear why we don't receive those events, but finding
   out might be time-consuming whereas dropping guards at startup is
   basically free.

 - Right after guards are dropped, circuit build timeouts are dropped,
   too, if supported by the Tor version. If the Tor version does not
   support this, there's going to be a warning, and the control log
   will simply not contain BUILDTIMEOUT_SET events.

Still part of the reopened tpo/metrics/onionperf#33399.
---
 CHANGELOG.md |  3 ++-
 onionperf/monitor.py | 12 +++-
 onionperf/onionperf  |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a212842..e0253c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Changes in version 0.7 - 2020-??-??
 
  - Add `onionperf measure --drop-guards` parameter to use and drop
-   guards after a given number of hours. Implements #33399.
+   guards and circuit build timeouts every given number of hours, if
+   supported by the Tor version. Implements #33399.
  - Remove the `onionperf measure --oneshot` switch and replace it with
new switches `--tgen-pause-initial`, `--tgen-pause-between`,
`--tgen-transfer-size`, and `--tgen-num-transfers ` to further
diff --git a/onionperf/monitor.py b/onionperf/monitor.py
index b5e6390..886a9a0 100644
--- a/onionperf/monitor.py
+++ b/onionperf/monitor.py
@@ -57,21 +57,23 @@ class TorMonitor(object):
 interval_count = 0
 if newnym_interval_seconds is not None:
 next_newnym = newnym_interval_seconds
-if drop_guards_interval_hours > 0:
-next_drop_guards = drop_guards_interval_hours * 3600
+next_drop_guards = 0
 while done_ev is None or not done_ev.is_set():
 # if self.filepath != '-' and 
os.path.exists(self.filepath):
 #with open(self.filepath, 'rb') as sizef:
 #msg = "tor-ctl-logger[port={0}] logged {1} bytes 
to {2}, press CTRL-C to quit".format(self.tor_ctl_port, 
os.fstat(sizef.fileno()).st_size, self.filepath)
 #logging.info(msg)
+if drop_guards_interval_hours > 0 and interval_count >= 
next_drop_guards:
+next_drop_guards += drop_guards_interval_hours * 3600
+torctl.drop_guards()
+drop_timeouts_response = torctl.msg("DROPTIMEOUTS")
+if not drop_timeouts_response.is_ok():
+self.__log(self.writable, "[WARNING] unrecognized 
command DROPTIMEOUTS in tor\n")
 sleep(1)
 interval_count += 1
 if newnym_interval_seconds is not None and interval_count 
>= next_newnym:
 next_newnym += newnym_interval_seconds
 torctl.signal(Signal.NEWNYM)
-if drop_guards_interval_hours > 0 and interval_count >= 
next_drop_guards:
-next_drop_guards += drop_guards_interval_hours * 3600
-torctl.drop_guards()
 
 except KeyboardInterrupt:
 pass  # the user hit ctrl+c
diff --git a/onionperf/onionperf b/onionperf/onionperf
index e6aa44a..d3d8e31 100755
--- a/onionperf/onionperf
+++ b/onionperf/onionperf
@@ -215,7 +215,7 @@ def main():
 default=0)
 
 measure_parser.add_argument('--drop-guards',
-help="""Use and drop guards every N > 0 hours, or do not use guards at 
all if N = 0""",
+help="""Use and drop guards and circuit build timeouts every N > 0 
hours, or do not use guards at all and never drop circuit build timeouts if N = 
0""",
 metavar="N", type=type_nonnegative_integer,
 action="store", dest="drop_guards_interval_hours",
 default=0)



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

[tor-commits] [onionperf/master] Apply 1 suggestion(s) to 1 file(s)

2020-09-01 Thread karsten

commit a6aa4189e04ee1b05dbdb68b90f24e14bf3443ac
Author: Philipp Winter 
Date:   Fri Aug 14 16:47:04 2020 +

Apply 1 suggestion(s) to 1 file(s)
---
 onionperf/model.py | 54 ++
 1 file changed, 22 insertions(+), 32 deletions(-)

diff --git a/onionperf/model.py b/onionperf/model.py
index bdd5a53..b589249 100644
--- a/onionperf/model.py
+++ b/onionperf/model.py
@@ -104,40 +104,30 @@ class TorperfModel(GeneratableTGenModel):
 # "One-shot mode," i.e., onionperf will stop after the given number of
 # iterations.  The idea is:
 # start -> pause -> stream-1 -> pause-1 -> ... -> stream-n -> pause-n 
-> end
-if self.config.num_transfers > 0:
-for i in range(self.config.num_transfers):
-g.add_node("stream-%d" % i,
-   sendsize="0",
-   recvsize=self.config.transfer_size,
-   timeout="15 seconds",
-   stallout="10 seconds")
-g.add_node("pause-%d" % i,
-   time="%d seconds" % 
self.config.inter_transfer_pause)
-
-g.add_edge("stream-%d" % i, "pause-%d" % i)
-if i > 0:
-g.add_edge("pause-%d" % (i-1), "stream-%d" % i)
-
+g.add_node("stream",
+   sendsize="0",
+   recvsize=self.config.transfer_size,
+   timeout="15 seconds",
+   stallout="10 seconds")
+g.add_node("pause_between",
+   time="%d seconds" % self.config.inter_transfer_pause)
+
+g.add_edge("pause_initial", "stream")
+
+# only add an end node if we need to stop
+if self.config.continuous_transfers:
+# continuous mode, i.e., no end node
+g.add_edge("stream", "pause_between")
+else:
+# one-shot mode, i.e., end after configured number of transfers
 g.add_node("end",
count=str(self.config.num_transfers))
-g.add_edge("pause", "stream-0")
-g.add_edge("pause-%d" % (self.config.num_transfers - 1), "end")
-
-# Continuous mode, i.e., onionperf will not stop.  The idea is:
-# start -> pause -> stream -> pause
-#   ^   |
-#   +---+
-elif self.config.continuous_transfers:
-g.add_node("stream",
-   sendsize="0",
-   recvsize=self.config.transfer_size,
-   timeout="15 seconds",
-   stallout="10 seconds")
-g.add_node("pause",
-   time="%d seconds" % self.config.inter_transfer_pause)
-g.add_edge("pause", "stream")
-g.add_edge("stream", "pause")
-g.add_edge("pause", "stream")
+# check for end condition after every transfer
+g.add_edge("stream", "end")
+# if end condition not met, pause
+g.add_edge("end", "pause_between")
+
+g.add_edge("pause_between", "stream")
 
 return g
 



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

[tor-commits] [onionperf/master] Measure static guard nodes.

2020-09-01 Thread karsten

commit e9fd47d95db102b3a7ace36fa412e18d182c5fa4
Author: Karsten Loesing 
Date:   Tue Jun 16 21:30:07 2020 +0200

Measure static guard nodes.

Add --drop-guards parameter to use and drop guards after a given
number of hours.

Implements #33399.
---
 onionperf/measurement.py |  7 ---
 onionperf/monitor.py | 18 +-
 onionperf/onionperf  |  9 -
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/onionperf/measurement.py b/onionperf/measurement.py
index 4a58bc4..899b277 100644
--- a/onionperf/measurement.py
+++ b/onionperf/measurement.py
@@ -172,7 +172,7 @@ def logrotate_thread_task(writables, tgen_writable, 
torctl_writable, docroot, ni
 
 class Measurement(object):
 
-def __init__(self, tor_bin_path, tgen_bin_path, datadir_path, 
privatedir_path, nickname, oneshot, additional_client_conf=None, 
torclient_conf_file=None, torserver_conf_file=None, single_onion=False):
+def __init__(self, tor_bin_path, tgen_bin_path, datadir_path, 
privatedir_path, nickname, oneshot, additional_client_conf=None, 
torclient_conf_file=None, torserver_conf_file=None, single_onion=False, 
drop_guards_interval_hours=None):
 self.tor_bin_path = tor_bin_path
 self.tgen_bin_path = tgen_bin_path
 self.datadir_path = datadir_path
@@ -188,6 +188,7 @@ class Measurement(object):
 self.torclient_conf_file = torclient_conf_file
 self.torserver_conf_file = torserver_conf_file
 self.single_onion = single_onion
+self.drop_guards_interval_hours = drop_guards_interval_hours
 
 def run(self, do_onion=True, do_inet=True, client_tgen_listen_port=5, 
client_tgen_connect_ip='0.0.0.0', client_tgen_connect_port=8080, 
client_tor_ctl_port=59050, client_tor_socks_port=59000,
  server_tgen_listen_port=8080, server_tor_ctl_port=59051, 
server_tor_socks_port=59001):
@@ -388,7 +389,7 @@ WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 
seconds\nDataDirectory
 tor_config = tor_config + f.read()
 if name == "client" and self.additional_client_conf:
 tor_config += self.additional_client_conf
-if not 'UseEntryGuards' in tor_config and not 'UseBridges' in 
tor_config:
+if not 'UseEntryGuards' in tor_config and not 'UseBridges' in 
tor_config and self.drop_guards_interval_hours == 0:
 tor_config += "UseEntryGuards 0\n"
 if name == "server" and self.single_onion:
 tor_config += "HiddenServiceSingleHopMode 
1\nHiddenServiceNonAnonymousMode 1\n"
@@ -467,7 +468,7 @@ WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 
seconds\nDataDirectory
 
 torctl_events = [e for e in monitor.get_supported_torctl_events() if e 
not in ['DEBUG', 'INFO', 'NOTICE', 'WARN', 'ERR']]
 newnym_interval_seconds = 300
-torctl_args = (control_port, torctl_writable, torctl_events, 
newnym_interval_seconds, self.done_event)
+torctl_args = (control_port, torctl_writable, torctl_events, 
newnym_interval_seconds, self.drop_guards_interval_hours, self.done_event)
 torctl_helper = threading.Thread(target=monitor.tor_monitor_run, 
name="torctl_{0}_helper".format(name), args=torctl_args)
 torctl_helper.start()
 self.threads.append(torctl_helper)
diff --git a/onionperf/monitor.py b/onionperf/monitor.py
index 5387bff..ac6fea9 100644
--- a/onionperf/monitor.py
+++ b/onionperf/monitor.py
@@ -22,7 +22,7 @@ class TorMonitor(object):
 self.writable = writable
 self.events = events
 
-def run(self, newnym_interval_seconds=None, done_ev=None):
+def run(self, newnym_interval_seconds=None, drop_guards_interval_hours=0, 
done_ev=None):
 with Controller.from_port(port=self.tor_ctl_port) as torctl:
 torctl.authenticate()
 
@@ -54,6 +54,10 @@ class TorMonitor(object):
 # let stem run its threads and log all of the events, until user 
interrupts
 try:
 interval_count = 0
+if newnym_interval_seconds is not None:
+next_newnym = newnym_interval_seconds
+if drop_guards_interval_hours > 0:
+next_drop_guards = drop_guards_interval_hours * 3600
 while done_ev is None or not done_ev.is_set():
 # if self.filepath != '-' and 
os.path.exists(self.filepath):
 #with open(self.filepath, 'rb') as sizef:
@@ -61,9 +65,13 @@ class TorMonitor(object):
 #logging.info(msg)
 sleep(1)
 interval_count += 1
-if newnym_interval_seconds is not None and interval_count 
>= newnym_interval_seconds:
-interval_count = 0
+if newnym_interval_seconds is not None and interval_count 
>= next_newnym:
+next_newnym += newnym_interval_seconds

[tor-commits] [onionperf/master] Merge branch 'phw-enhancement-33432-3' into develop

2020-09-01 Thread karsten

commit c707674ba9b0d7931038c12bbe2d01585a88eb22
Merge: dfec0b8 b8f1e5c
Author: Karsten Loesing 
Date:   Thu Aug 27 10:38:21 2020 +0200

Merge branch 'phw-enhancement-33432-3' into develop

 CHANGELOG.md|   4 ++
 onionperf/measurement.py| 139 +++-
 onionperf/model.py  |  98 ++---
 onionperf/onionperf |  60 
 onionperf/tests/test_measurement.py |  12 ++--
 5 files changed, 185 insertions(+), 128 deletions(-)

diff --cc CHANGELOG.md
index c31a40e,ac6897b..4b7fcb2
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,9 -1,11 +1,13 @@@
  # Changes in version 0.7 - 2020-??-??
  
 + - Add `onionperf measure --drop-guards` parameter to use and drop
 +   guards after a given number of hours. Implements #33399.
+  - Remove the `onionperf measure --oneshot` switch and replace it with
+new switches `--tgen-pause-initial`, `--tgen-pause-between`,
+`--tgen-transfer-size`, and `--tgen-num-transfers ` to further
+configure the generated TGen model.
  
 -# Changes in version 0.6 - 2020-??-??
 +# Changes in version 0.6 - 2020-08-08
  
   - Update to TGen 1.0.0, use TGenTools for parsing TGen log files, and
 update analysis results file version to 3.0. Implements #33974.
diff --cc onionperf/measurement.py
index 709fbc6,d699292..f198be0
--- a/onionperf/measurement.py
+++ b/onionperf/measurement.py
@@@ -173,7 -188,7 +188,7 @@@ def logrotate_thread_task(writables, tg
  
  class Measurement(object):
  
- def __init__(self, tor_bin_path, tgen_bin_path, datadir_path, 
privatedir_path, nickname, oneshot, additional_client_conf=None, 
torclient_conf_file=None, torserver_conf_file=None, single_onion=False, 
drop_guards_interval_hours=0):
 -def __init__(self, tor_bin_path, tgen_bin_path, datadir_path, 
privatedir_path, nickname, additional_client_conf=None, 
torclient_conf_file=None, torserver_conf_file=None, single_onion=False):
++def __init__(self, tor_bin_path, tgen_bin_path, datadir_path, 
privatedir_path, nickname, additional_client_conf=None, 
torclient_conf_file=None, torserver_conf_file=None, single_onion=False, 
drop_guards_interval_hours=0):
  self.tor_bin_path = tor_bin_path
  self.tgen_bin_path = tgen_bin_path
  self.datadir_path = datadir_path
@@@ -189,13 -203,11 +203,12 @@@
  self.torclient_conf_file = torclient_conf_file
  self.torserver_conf_file = torserver_conf_file
  self.single_onion = single_onion
 +self.drop_guards_interval_hours = drop_guards_interval_hours
  
- def run(self, do_onion=True, do_inet=True, client_tgen_listen_port=5, 
client_tgen_connect_ip='0.0.0.0', client_tgen_connect_port=8080, 
client_tor_ctl_port=59050, client_tor_socks_port=59000,
-  server_tgen_listen_port=8080, server_tor_ctl_port=59051, 
server_tor_socks_port=59001):
+ def run(self, do_onion=True, do_inet=True, tgen_model=None, 
tgen_client_conf=None, tgen_server_conf=None):
  '''
- only `server_tgen_listen_port` are "public" and need to be opened on 
the firewall.
- if `client_tgen_connect_port` != `server_tgen_listen_port`, then you 
should have installed a forwarding rule in the firewall.
+ only `tgen_server_conf.listen_port` are "public" and need to be 
opened on the firewall.
+ if `tgen_client_conf.connect_port` != `tgen_server_conf.listen_port`, 
then you should have installed a forwarding rule in the firewall.
  all ports need to be unique though, and unique among multiple 
onionperf instances.
  
  here are some sane defaults:
diff --cc onionperf/onionperf
index 641db70,6a16da2..e6aa44a
--- a/onionperf/onionperf
+++ b/onionperf/onionperf
@@@ -195,12 -190,30 +190,36 @@@ def main()
  action="store", dest="tgenconnectport",
  default=8080)
  
+ measure_parser.add_argument('--tgen-pause-initial',
+ help="""the number of seconds TGen should wait before walking through 
its action graph""",
+ metavar="N", type=int,
+ action="store", dest="tgenpauseinitial",
+ default=300)
+ 
+ measure_parser.add_argument('--tgen-pause-between',
+ help="""the number of seconds TGen should wait in between two 
transfers""",
+ metavar="N", type=int,
+ action="store", dest="tgenpausebetween",
+ default=300)
+ 
+ measure_parser.add_argument('--tgen-transfer-size',
+ help="""the size of the file transfer that TGen will perform (e.g., 
'5 MiB' or '10 KiB')""",
+ metavar="STRING", type=str,
+ action="store", dest="tgentransfersize",
+ default="5 MiB")
+ 
+ measure_parser.add_argument('--tgen-num-transfers',
+ help="""the number of file transfers that TGen will perform""",
+ metavar="N", type=int,
+ action="store", dest="tgennumtransfers",
+ default=0)
+ 
 +measure_parser.add_argument('--drop-guards',
 +

[tor-commits] [onionperf/master] Rename variables for consistency and clarity.

2020-09-01 Thread karsten

commit 86f746c3c6ee6dc3be342f53fea90e6c02d39991
Author: Philipp Winter 
Date:   Fri Aug 14 10:49:09 2020 -0700

Rename variables for consistency and clarity.

initial_pause-> pause_initial
inter_transfer_pause -> pause_between

Thanks to Rob for the suggestion.
---
 onionperf/model.py  | 19 ---
 onionperf/onionperf | 12 ++--
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/onionperf/model.py b/onionperf/model.py
index b589249..3bfe35f 100644
--- a/onionperf/model.py
+++ b/onionperf/model.py
@@ -43,14 +43,14 @@ class TGenLoadableModel(TGenModel):
 
 class TGenModelConf(object):
 """Represents a TGen traffic model configuration."""
-def __init__(self, initial_pause=0, num_transfers=1, transfer_size="5 MiB",
- continuous_transfers=False, inter_transfer_pause=5, 
port=None, servers=[],
+def __init__(self, pause_initial=0, num_transfers=1, transfer_size="5 MiB",
+ continuous_transfers=False, pause_between=5, port=None, 
servers=[],
  socks_port=None):
-self.initial_pause = initial_pause
+self.pause_initial = pause_initial
+self.pause_between = pause_between
 self.num_transfers = num_transfers
 self.transfer_size = transfer_size
 self.continuous_transfers = continuous_transfers
-self.inter_transfer_pause = inter_transfer_pause
 self.port = port
 self.servers = servers
 self.socks_port = socks_port
@@ -98,20 +98,17 @@ class TorperfModel(GeneratableTGenModel):
loglevel="info",
heartbeat="1 minute")
 
-g.add_node("pause", time="%d seconds" % self.config.initial_pause)
-g.add_edge("start", "pause")
-
-# "One-shot mode," i.e., onionperf will stop after the given number of
-# iterations.  The idea is:
-# start -> pause -> stream-1 -> pause-1 -> ... -> stream-n -> pause-n 
-> end
+g.add_node("pause_initial",
+   time="%d seconds" % self.config.pause_initial)
 g.add_node("stream",
sendsize="0",
recvsize=self.config.transfer_size,
timeout="15 seconds",
stallout="10 seconds")
 g.add_node("pause_between",
-   time="%d seconds" % self.config.inter_transfer_pause)
+   time="%d seconds" % self.config.pause_between)
 
+g.add_edge("start", "pause_initial")
 g.add_edge("pause_initial", "stream")
 
 # only add an end node if we need to stop
diff --git a/onionperf/onionperf b/onionperf/onionperf
index d95e691..a49982b 100755
--- a/onionperf/onionperf
+++ b/onionperf/onionperf
@@ -190,16 +190,16 @@ def main():
 action="store", dest="tgenconnectport",
 default=8080)
 
-measure_parser.add_argument('--tgen-start-pause',
+measure_parser.add_argument('--tgen-pause-initial',
 help="""the number of seconds TGen should wait before walking through 
its action graph""",
 metavar="N", type=int,
-action="store", dest="tgenstartpause",
+action="store", dest="tgenpauseinitial",
 default=5)
 
-measure_parser.add_argument('--tgen-intertransfer-pause',
+measure_parser.add_argument('--tgen-pause-between',
 help="""the number of seconds TGen should wait in between two 
transfers""",
 metavar="N", type=int,
-action="store", dest="tgenintertransferpause",
+action="store", dest="tgenpausebetween",
 default=300)
 
 measure_parser.add_argument('--tgen-transfer-size',
@@ -377,11 +377,11 @@ def measure(args):
 tor_ctl_port=server_tor_ctl_port,
 tor_socks_port=server_tor_socks_port)
 
-tgen_model = TGenModelConf(initial_pause=args.tgenstartpause,
+tgen_model = TGenModelConf(pause_initial=args.tgenpauseinitial,
transfer_size=args.tgentransfersize,
num_transfers=args.tgennumtransfers,
continuous_transfers=args.tgennumtransfers 
== 0,
-   
inter_transfer_pause=args.tgenintertransferpause)
+   pause_between=args.tgenpausebetween)
 
 meas = Measurement(args.torpath,
args.tgenpath,



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

[tor-commits] [onionperf/master] Add issue number to change log.

2020-09-01 Thread karsten

commit f496edec6fec8adc0b4e5c0454989c2bc06312e3
Author: Karsten Loesing 
Date:   Thu Aug 27 11:09:07 2020 +0200

Add issue number to change log.
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b7fcb2..a212842 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@
  - Remove the `onionperf measure --oneshot` switch and replace it with
new switches `--tgen-pause-initial`, `--tgen-pause-between`,
`--tgen-transfer-size`, and `--tgen-num-transfers ` to further
-   configure the generated TGen model.
+   configure the generated TGen model. Implemets #33432.
 
 # Changes in version 0.6 - 2020-08-08
 



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

[tor-commits] [onionperf/master] Merge branch 'task-33399' into develop

2020-09-01 Thread karsten

commit 4ff257c4270c0d1e5fd0f1ef76e640696ec2c514
Merge: e333be2 e9fd47d
Author: Karsten Loesing 
Date:   Thu Aug 20 15:05:23 2020 +0200

Merge branch 'task-33399' into develop

 onionperf/measurement.py |  7 ---
 onionperf/monitor.py | 18 +-
 onionperf/onionperf  |  9 -
 3 files changed, 25 insertions(+), 9 deletions(-)




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

[tor-commits] [onionperf/master] Use format string for consistency.

2020-09-01 Thread karsten

commit 1eea5e10700c76f8e1b37e626eaeaf96c5488150
Author: Philipp Winter 
Date:   Fri Aug 14 11:29:01 2020 -0700

Use format string for consistency.

Thanks to Rob for pointing this out.
---
 onionperf/model.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/onionperf/model.py b/onionperf/model.py
index 3bfe35f..d45763e 100644
--- a/onionperf/model.py
+++ b/onionperf/model.py
@@ -118,7 +118,7 @@ class TorperfModel(GeneratableTGenModel):
 else:
 # one-shot mode, i.e., end after configured number of transfers
 g.add_node("end",
-   count=str(self.config.num_transfers))
+   count="%d" % self.config.num_transfers)
 # check for end condition after every transfer
 g.add_edge("stream", "end")
 # if end condition not met, pause



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

[tor-commits] [onionperf/master] Make models more configurable.

2020-09-01 Thread karsten

commit 7ef8c64833d41337d5c9cc5baaee2808092c9aad
Author: Philipp Winter 
Date:   Fri Jun 26 10:00:29 2020 -0700

Make models more configurable.

This patch removes the --oneshot subcommand and replaces it with several
new subcommands for OnionPerf's "measure" command:

--tgen-start-pause  (Initial pause before file transfers.)
--tgen-num-transfers(Number of file transfers.)
--tgen-intertransfer-pause  (Pause in between file transfers.)
--tgen-transfer-size(Size of each file transfer.)

By default, OnionPerf continues to run in "continuous" mode.  One can
simulate oneshot mode by running onionperf with the following flags:

onionperf measure --tgen-num-transfers=1

In addition to the above subcommands, this patch improves the code base
by 1) adding a TGenConf class to hold TGen's configuration and by 2)
adding a TGenModelConf class to hold TGen's traffic model.

This fixes tpo/metrics/onionperf#33432.
---
 onionperf/measurement.py| 102 +++---
 onionperf/model.py  | 108 +++-
 onionperf/onionperf |  60 +++-
 onionperf/tests/test_measurement.py |  12 ++--
 4 files changed, 175 insertions(+), 107 deletions(-)

diff --git a/onionperf/measurement.py b/onionperf/measurement.py
index af1fa0d..e2d8d1c 100644
--- a/onionperf/measurement.py
+++ b/onionperf/measurement.py
@@ -15,6 +15,16 @@ from stem.control import Controller
 from stem.version import Version, Requirement, get_system_tor_version
 from stem import __version__ as stem_version
 
+class TGenConf(object):
+"""Represents a TGen configuration, for both client and server."""
+def __init__(self, listen_port=None, connect_ip=None, connect_port=None, 
tor_ctl_port=None, tor_socks_port=None):
+self.listen_port = str(listen_port)
+self.tor_ctl_port = tor_ctl_port
+self.tor_socks_port = tor_socks_port
+# TGen clients use connect_ip and connect_port.
+self.connect_ip = connect_ip
+self.connect_port = connect_port
+
 # onionperf imports
 from . import analysis, monitor, model, util
 
@@ -173,12 +183,11 @@ def logrotate_thread_task(writables, tgen_writable, 
torctl_writable, docroot, ni
 
 class Measurement(object):
 
-def __init__(self, tor_bin_path, tgen_bin_path, datadir_path, 
privatedir_path, nickname, oneshot, additional_client_conf=None, 
torclient_conf_file=None, torserver_conf_file=None, single_onion=False):
+def __init__(self, tor_bin_path, tgen_bin_path, datadir_path, 
privatedir_path, nickname, additional_client_conf=None, 
torclient_conf_file=None, torserver_conf_file=None, single_onion=False):
 self.tor_bin_path = tor_bin_path
 self.tgen_bin_path = tgen_bin_path
 self.datadir_path = datadir_path
 self.privatedir_path = privatedir_path
-self.oneshot = oneshot
 self.nickname = nickname
 self.threads = None
 self.done_event = None
@@ -190,20 +199,30 @@ class Measurement(object):
 self.torserver_conf_file = torserver_conf_file
 self.single_onion = single_onion
 
-def run(self, do_onion=True, do_inet=True, client_tgen_listen_port=5, 
client_tgen_connect_ip='0.0.0.0', client_tgen_connect_port=8080, 
client_tor_ctl_port=59050, client_tor_socks_port=59000,
- server_tgen_listen_port=8080, server_tor_ctl_port=59051, 
server_tor_socks_port=59001):
+def run(self, do_onion=True, do_inet=True, tgen_model=None, 
tgen_client_conf=None, tgen_server_conf=None):
 '''
-only `server_tgen_listen_port` are "public" and need to be opened on 
the firewall.
-if `client_tgen_connect_port` != `server_tgen_listen_port`, then you 
should have installed a forwarding rule in the firewall.
+only `tgen_server_conf.listen_port` are "public" and need to be opened 
on the firewall.
+if `tgen_client_conf.connect_port` != `tgen_server_conf.listen_port`, 
then you should have installed a forwarding rule in the firewall.
 all ports need to be unique though, and unique among multiple 
onionperf instances.
 
 here are some sane defaults:
-client_tgen_listen_port=5, client_tgen_connect_port=8080, 
client_tor_ctl_port=59050, client_tor_socks_port=59000,
-server_tgen_listen_port=8080, server_tor_ctl_port=59051, 
server_tor_socks_port=59001
+tgen_client_conf.listen_port=5, 
tgen_client_conf.connect_port=8080, tgen_client_conf.tor_ctl_port=59050, 
tgen_client_conf.tor_socks_port=59000,
+tgen_server_conf.listen_port=8080, 
tgen_server_conf.tor_ctl_port=59051, tgen_server_conf.tor_socks_port=59001
 '''
 self.threads = []
 self.done_event = threading.Event()
 
+if tgen_client_conf is None:
+tgen_client_conf = TGenConf(listen_port=5,
+

[tor-commits] [onionperf/develop] Tweak --drop-guards switch.

2020-09-01 Thread karsten

commit 9d76ca4b3847a10c9565d12cf130933a1076297b
Author: Karsten Loesing 
Date:   Tue Sep 1 17:02:47 2020 +0200

Tweak --drop-guards switch.

This commit tweaks the recently added --drop-guards switch as follows:

 - Guards are dropped right at startup and then every N hours.
   Otherwise we might not receive the first round of GUARD NEW/UP
   events. It's unclear why we don't receive those events, but finding
   out might be time-consuming whereas dropping guards at startup is
   basically free.

 - Right after guards are dropped, circuit build timeouts are dropped,
   too, if supported by the Tor version. If the Tor version does not
   support this, there's going to be a warning, and the control log
   will simply not contain BUILDTIMEOUT_SET events.

Still part of the reopened tpo/metrics/onionperf#33399.
---
 CHANGELOG.md |  3 ++-
 onionperf/monitor.py | 12 +++-
 onionperf/onionperf  |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a212842..e0253c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Changes in version 0.7 - 2020-??-??
 
  - Add `onionperf measure --drop-guards` parameter to use and drop
-   guards after a given number of hours. Implements #33399.
+   guards and circuit build timeouts every given number of hours, if
+   supported by the Tor version. Implements #33399.
  - Remove the `onionperf measure --oneshot` switch and replace it with
new switches `--tgen-pause-initial`, `--tgen-pause-between`,
`--tgen-transfer-size`, and `--tgen-num-transfers ` to further
diff --git a/onionperf/monitor.py b/onionperf/monitor.py
index b5e6390..886a9a0 100644
--- a/onionperf/monitor.py
+++ b/onionperf/monitor.py
@@ -57,21 +57,23 @@ class TorMonitor(object):
 interval_count = 0
 if newnym_interval_seconds is not None:
 next_newnym = newnym_interval_seconds
-if drop_guards_interval_hours > 0:
-next_drop_guards = drop_guards_interval_hours * 3600
+next_drop_guards = 0
 while done_ev is None or not done_ev.is_set():
 # if self.filepath != '-' and 
os.path.exists(self.filepath):
 #with open(self.filepath, 'rb') as sizef:
 #msg = "tor-ctl-logger[port={0}] logged {1} bytes 
to {2}, press CTRL-C to quit".format(self.tor_ctl_port, 
os.fstat(sizef.fileno()).st_size, self.filepath)
 #logging.info(msg)
+if drop_guards_interval_hours > 0 and interval_count >= 
next_drop_guards:
+next_drop_guards += drop_guards_interval_hours * 3600
+torctl.drop_guards()
+drop_timeouts_response = torctl.msg("DROPTIMEOUTS")
+if not drop_timeouts_response.is_ok():
+self.__log(self.writable, "[WARNING] unrecognized 
command DROPTIMEOUTS in tor\n")
 sleep(1)
 interval_count += 1
 if newnym_interval_seconds is not None and interval_count 
>= next_newnym:
 next_newnym += newnym_interval_seconds
 torctl.signal(Signal.NEWNYM)
-if drop_guards_interval_hours > 0 and interval_count >= 
next_drop_guards:
-next_drop_guards += drop_guards_interval_hours * 3600
-torctl.drop_guards()
 
 except KeyboardInterrupt:
 pass  # the user hit ctrl+c
diff --git a/onionperf/onionperf b/onionperf/onionperf
index e6aa44a..d3d8e31 100755
--- a/onionperf/onionperf
+++ b/onionperf/onionperf
@@ -215,7 +215,7 @@ def main():
 default=0)
 
 measure_parser.add_argument('--drop-guards',
-help="""Use and drop guards every N > 0 hours, or do not use guards at 
all if N = 0""",
+help="""Use and drop guards and circuit build timeouts every N > 0 
hours, or do not use guards at all and never drop circuit build timeouts if N = 
0""",
 metavar="N", type=type_nonnegative_integer,
 action="store", dest="drop_guards_interval_hours",
 default=0)



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

[tor-commits] [onionperf/develop] Merge remote-tracking branch 'karsten/task-33399-2' into develop

2020-09-01 Thread karsten

commit 8fe84702dea4b2e4640c0817e505e6c449e7b9a8
Merge: f496ede 9d76ca4
Author: Karsten Loesing 
Date:   Tue Sep 1 22:28:52 2020 +0200

Merge remote-tracking branch 'karsten/task-33399-2' into develop

 CHANGELOG.md |  3 ++-
 onionperf/monitor.py | 12 +++-
 onionperf/onionperf  |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)



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

[tor-commits] [onionperf/develop] Bump version to 0.7.

2020-09-01 Thread karsten

commit c8275b25e4afda9328634ec6be56ff46c7ee1cfe
Author: Karsten Loesing 
Date:   Tue Sep 1 22:30:12 2020 +0200

Bump version to 0.7.
---
 CHANGELOG.md | 2 +-
 setup.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0253c5..80fb14d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changes in version 0.7 - 2020-??-??
+# Changes in version 0.7 - 2020-09-01
 
  - Add `onionperf measure --drop-guards` parameter to use and drop
guards and circuit build timeouts every given number of hours, if
diff --git a/setup.py b/setup.py
index 7fd7f85..d72b27a 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ with open('requirements.txt') as f:
 install_requires = f.readlines()
 
 setup(name='OnionPerf',
-  version='0.6',
+  version='0.7',
   description='A utility to monitor, measure, analyze, and visualize the 
performance of Tor and Onion Services',
   author='Rob Jansen',
   url='https://github.com/robgjansen/onionperf/',

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

[tor-commits] [tor-browser-build/master] Bug 34101: Add application-services

2020-09-01 Thread sysrqb

commit 2d6b83020e118fab3e7388d234690b7ee4807378
Author: Georg Koppen 
Date:   Mon Aug 24 07:29:23 2020 +

Bug 34101: Add application-services
---
 projects/application-services/1651660.patch| 811 +
 projects/application-services/build| 103 +++
 projects/application-services/config   |  86 +++
 .../gradle-dependencies-list.txt   | 419 +++
 projects/application-services/mavenLocal.patch |  53 ++
 projects/application-services/no-git.patch |  23 +
 projects/application-services/target.patch |  21 +
 projects/fenix-rust/config |   2 +-
 8 files changed, 1517 insertions(+), 1 deletion(-)

diff --git a/projects/application-services/1651660.patch 
b/projects/application-services/1651660.patch
new file mode 100644
index 000..8cf15b1
--- /dev/null
+++ b/projects/application-services/1651660.patch
@@ -0,0 +1,811 @@
+From 1641b74b17dad85a3ee65802a0a6320d2184c6c3 Mon Sep 17 00:00:00 2001
+From: Georg Koppen 
+Date: Fri, 21 Aug 2020 19:26:37 +
+Subject: [PATCH] 1651660
+
+
+diff --git a/build.gradle b/build.gradle
+index 6b16a91d..58a4ddae 100644
+--- a/build.gradle
 b/build.gradle
+@@ -4,16 +4,16 @@ buildscript {
+ ext.kotlin_version = '1.3.71'
+ ext.jna_version = '5.2.0'
+ ext.android_gradle_plugin_version = '3.6.0'
+-
+-// N.B. try to keep these two in sync
+-ext.android_components_version = '24.0.0'
+-ext.glean_version = '21.3.0'
++ext.android_components_version = '47.0.0'
+ 
+ ext.build = [
+ ndkVersion: "21.3.6528147", // Keep it in sync in TC Dockerfile.
+ compileSdkVersion: 29,
+ targetSdkVersion: 28,
+ minSdkVersion: 21, // So that we can publish for aarch64.
++// This is required to support new AndroidX support libraries.
++// See mozilla-mobile/android-components#842
++jvmTargetCompatibility: "1.8",
+ ]
+ 
+ repositories {
+@@ -44,6 +44,11 @@ buildscript {
+ 
+ classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.12'
+ 
++// Since the Glean version depends on the Android components version,
++// it is very important to use a modern version of Glean and, ideally,
++// let this come from the embedding product itself.
++classpath 
"org.mozilla.components:tooling-glean-gradle:$android_components_version"
++
+ // NOTE: Do not place your application dependencies here; they belong
+ // in the individual module build.gradle files
+ }
+diff --git a/components/fxa-client/android/build.gradle 
b/components/fxa-client/android/build.gradle
+index 9981facd..e0cac485 100644
+--- a/components/fxa-client/android/build.gradle
 b/components/fxa-client/android/build.gradle
+@@ -36,6 +36,19 @@ android {
+ }
+ }
+ }
++
++// This is required to support new AndroidX support libraries.
++// See mozilla-mobile/android-components#842
++compileOptions {
++sourceCompatibility rootProject.ext.build.jvmTargetCompatibility
++targetCompatibility rootProject.ext.build.jvmTargetCompatibility
++}
++
++tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
++kotlinOptions {
++jvmTarget = rootProject.ext.build.jvmTargetCompatibility
++}
++}
+ }
+ 
+ configurations {
+diff --git a/components/logins/android/build.gradle 
b/components/logins/android/build.gradle
+index be777e5b..166b81fe 100644
+--- a/components/logins/android/build.gradle
 b/components/logins/android/build.gradle
+@@ -46,6 +46,19 @@ android {
+ includeAndroidResources = true
+ }
+ }
++
++// This is required to support new AndroidX support libraries.
++// See mozilla-mobile/android-components#842
++compileOptions {
++sourceCompatibility rootProject.ext.build.jvmTargetCompatibility
++targetCompatibility rootProject.ext.build.jvmTargetCompatibility
++}
++
++tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
++kotlinOptions {
++jvmTarget = rootProject.ext.build.jvmTargetCompatibility
++}
++}
+ }
+ 
+ configurations {
+@@ -80,6 +93,12 @@ protobuf {
+ }
+ }
+ 
++// Needs to happen before `dependencies` in order for the variables
++// exposed by the plugin to be available for this project.
++ext.gleanGenerateMarkdownDocs = true
++ext.gleanDocsDirectory = "$rootDir/docs/metrics/logins"
++apply plugin: "org.mozilla.telemetry.glean-gradle-plugin"
++
+ dependencies {
+ // Part of the public API.
+ api project(':sync15')
+@@ -108,7 +127,7 @@ dependencies {
+ testImplementation 'org.mockito:mockito-core:2.21.0'
+ testImplementation 'androidx.test:core-ktx:1.2.0'
+ testImplementation 'androidx.work:work-testing:2.2.0'
+-testImplementation 
"org.mozilla.telemetry:glean-forUnitTests:$glean_version"
++testImplementation

[tor-commits] [tor-browser-build/master] Update our Gradle dependencies creation instructions

2020-09-01 Thread sysrqb

commit 1f4a684fb6cb1c83a092171bd529259c896daa6b
Author: Georg Koppen 
Date:   Mon Aug 24 08:27:19 2020 +

Update our Gradle dependencies creation instructions
---
 projects/common/how-to-create-gradle-dependencies-list.txt | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/projects/common/how-to-create-gradle-dependencies-list.txt 
b/projects/common/how-to-create-gradle-dependencies-list.txt
index 3ecdbf6..3435c31 100644
--- a/projects/common/how-to-create-gradle-dependencies-list.txt
+++ b/projects/common/how-to-create-gradle-dependencies-list.txt
@@ -3,8 +3,9 @@ If additional Android dependencies are required by the 
project's build, then
 the Gradle build will fail due to missing dependencies. To find out what the
 missing dependencies are take the following steps.
 
-When calling gradle in the project's build script replace the `--offline` flag
-with `--debug` and remove any `-Dmaven.repo.local` arguments.
+If the dependencies for `application-services`, `android-components`, or 
`fenix`
+are needed, set the `fetch_gradle_dependencies` flag in their `config` files to
+`1`.
 
 For the firefox project, comment out the following line in the project's build 
file:
 
@@ -14,7 +15,10 @@ Also modify the gradle flags to include the debug option so 
the download logs wi
 
export GRADLE_FLAGS="--no-daemon --debug"
 
-Then allow network access during the build by setting
+Otherwise, when calling gradle in the project's build script replace the
+`--offline` flag with `--debug` and remove any `-Dmaven.repo.local` arguments.
+
+Finally, allow network access during the build by setting
 `var/container/disable_network/build` to `0` in rbm.conf, and rerun the build.
 
 Dependent artifacts will show up as downloads in the logs. You can pull out
@@ -26,4 +30,4 @@ list script in the tools directory:
 Copy the resulting `gradle-dependencies-list.txt` over the one in the 
respective
 project. Then, in the project's config file, increment the
 `var/gradle_dependencies_version` and make sure to restore the project's build
-file back to original.
+file back to original or set `fetch_gradle_dependencies` to `0` again.



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

[tor-commits] [tor-browser-build/master] Bug 34101: Add missing dependencies manually

2020-09-01 Thread sysrqb

commit f33d3e07b0a183d7cfd1fad662c884e98e466210
Author: Georg Koppen 
Date:   Mon Aug 24 07:31:26 2020 +

Bug 34101: Add missing dependencies manually

For yet unknown reasons not all dependencies which we need get exposed
via Gradle's --debug flag. We therefore add them manually, so we can
use them with mavenLocal() in our offline builds.
tor-browser-build#40056 is the ticket for resolving that problem.
---
 projects/application-services/gradle-dependencies-list.txt | 8 
 1 file changed, 8 insertions(+)

diff --git a/projects/application-services/gradle-dependencies-list.txt 
b/projects/application-services/gradle-dependencies-list.txt
index dc57592..ffad4f0 100644
--- a/projects/application-services/gradle-dependencies-list.txt
+++ b/projects/application-services/gradle-dependencies-list.txt
@@ -3,15 +3,18 @@
 sha256sum | url
 d1bc9842455c2e534415d88c44df4d52413b478db9093a1ba36324f705f44c3d | 
https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.0.0/activity-1.0.0.aar
 27a4be7462629c312da0b831a0978d2076fc34074145fb61dd4e86d7c8469b82 | 
https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.0.0/activity-1.0.0.pom
+d38d63edb30f1467818d50aaf05f8a692dea8b31392a049bfa991b159ad5b692 | 
https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0/annotation-1.1.0.jar
 2e9372ba7780ef44952adbf86b66e1f08682c1e5277c926185f6564a13799efe | 
https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0/annotation-1.1.0.pom
 8d7299bca44cb3bdf17f5595766acbf459fc81fee223e8686cc6acd3a42ab5c0 | 
https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0/appcompat-1.1.0.aar
 340d617121f8ef8e02a6680c8f357aa3e542276d0c8a1cdcb6fd98984b2cb7b9 | 
https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0/appcompat-1.1.0.pom
 19944d32b46551a17c347e21894b95837fbd7baaafc9e2082794344f222f7361 | 
https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.1.0/appcompat-resources-1.1.0.aar
 046011e16cb01b6f14842565661551110ef1b6427483f5d9068493f4c49690f2 | 
https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.1.0/appcompat-resources-1.1.0.pom
+fe1237bf029d063e7f29fe39aeaf73ef74c8b0a3658486fc29d3c54326653889 | 
https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.0/core-common-2.1.0.jar
 83bbb3960eaabc600ac366c94cb59414e441532a1d6aa9388b0b8bfface5cf01 | 
https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.0/core-common-2.1.0.pom
 dd77615bd3dd275afb11b62df25bae46b10b4a117cd37943af45bdcbf8755852 | 
https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.1.0/core-runtime-2.1.0.aar
 c0c4ed0160cd2ca18390015de8b392b697c173327c6b2c0947d4e62f6958c05d | 
https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.1.0/core-runtime-2.1.0.pom
 a7913a5275ad68e555d2612ebe8c14c367b153e14ca48a1872a64899020e54ef | 
https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.0.0/collection-1.0.0.pom
+632a0e5407461de774409352940e292a291037724207a787820c77daf7d33b72 | 
https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.1.0/collection-1.1.0.jar
 67e9066ca4acfdc6e3cc508293c31ba0398057ff118e4f70b1e1813c9a3456d1 | 
https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.1.0/collection-1.1.0.pom
 524b8b88ceb6a74a7e44e6b567a135660f211799904cb218bfee5be1166820b2 | 
https://dl.google.com/dl/android/maven2/androidx/core/core/1.2.0/core-1.2.0.aar
 3d1f4e37b77dd92353879a040ab4ce2f706798bcbdf066147491c3642b3f79a6 | 
https://dl.google.com/dl/android/maven2/androidx/core/core/1.2.0/core-1.2.0.pom
@@ -32,6 +35,7 @@ 
a14c8b8f2153f128e800fbd266a6beab1c283982a29ec570d2cc05d307d81496 | https://dl.go
 ef78eb27ac02ddf3545d5f8a3857c73a2837a01853f8d5fcf77251011db52544 | 
https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.1.0/fragment-1.1.0.pom
 33193135a64fe21fa2c35eec6688f1a76e512606c0fc83dc1b689e37add7732a | 
https://dl.google.com/dl/android/maven2/androidx/interpolator/interpolator/1.0.0/interpolator-1.0.0.aar
 0ddc07cc39699f48ecd9ec894b5830c0f09e22e82959294edf37217224c88b7b | 
https://dl.google.com/dl/android/maven2/androidx/interpolator/interpolator/1.0.0/interpolator-1.0.0.pom
+76db6be533bd730fb361c2feb12a2c26d9952824746847da82601ef81f082643 | 
https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.1.0/lifecycle-common-2.1.0.jar
 692c2a60437a95220c8fbb6e8943196f255f535d1a7c58714e6c46530782f276 | 
https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.1.0/lifecycle-common-2.1.0.pom
 bd53c64b038585215b4959c1a388437a3ad525608a31c58e4283c3e371727d4d | 
https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-extensions/2.1.0/lifecycle-extensions-2.1.0.aar
 510e33b8b6ca33d2fcb3b7615a4528e338b438de398f3ee8de119c26508a5fdd |

[tor-commits] [tor-browser-build/master] Pick up tor-android-service#40001

2020-09-01 Thread sysrqb

commit 3dad656fd01c4fcf3c4168e4dde5babeb6c86e79
Author: Georg Koppen 
Date:   Tue Sep 1 07:28:40 2020 +

Pick up tor-android-service#40001
---
 projects/tor-android-service/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/tor-android-service/config 
b/projects/tor-android-service/config
index e4419fb..1f833ba 100644
--- a/projects/tor-android-service/config
+++ b/projects/tor-android-service/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]'
-git_hash: 8f40b9b2a6f4f8c05b84c5a0fec26a4b7ad77098
+git_hash: 68b91198066cf89a3664295116b5249b499461d6
 git_url: https://git.torproject.org/tor-android-service.git
 git_submodule: 1
 



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

[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40061_v5'

2020-09-01 Thread sysrqb

commit 689c9c66626510fc9d19268330469ee98dce55ed
Merge: f6b8950 3dad656
Author: Matthew Finkel 
Date:   Tue Sep 1 19:48:16 2020 +

Merge remote-tracking branch 'gkgl/bug_40061_v5'

 projects/android-components/build  |  52 ++
 projects/android-components/config |  37 +
 projects/android-components/git.patch  |  22 +
 .../gradle-dependencies-list.txt   | 937 +
 projects/android-components/mavenLocal.patch   |  83 ++
 projects/android-toolchain/build   |  51 +-
 projects/android-toolchain/config  |  53 +-
 projects/application-services/1651660.patch| 811 ++
 projects/application-services/build| 103 +++
 projects/application-services/config   |  86 ++
 .../gradle-dependencies-list.txt   | 427 ++
 projects/application-services/mavenLocal.patch |  53 ++
 projects/application-services/no-git.patch |  23 +
 projects/application-services/target.patch |  21 +
 .../how-to-create-gradle-dependencies-list.txt |  12 +-
 projects/fenix-android-toolchain/build |  72 --
 projects/fenix-android-toolchain/config|  70 --
 projects/fenix-rust/config |   2 +-
 projects/fenix-tor-android-service/build   |  30 -
 projects/fenix-tor-android-service/config  |  26 -
 .../gradle-dependencies-list.txt   | 301 ---
 .../0001-Bug-30318-Add-snowflake-support.patch |  90 --
 ...ug-33931-Filter-bridges-in-stream-by-type.patch |  76 --
 projects/fenix-tor-onion-proxy-library/build   |  45 -
 projects/fenix-tor-onion-proxy-library/config  |  31 -
 .../gradle-dependencies-list.txt   | 303 ---
 .../fenix-tor-onion-proxy-library/gradle.patch |  72 --
 projects/fenix/build   |  48 ++
 projects/fenix/config  |  49 ++
 projects/fenix/gradle-dependencies-list.txt| 857 +++
 projects/fenix/mavenLocal.patch|  71 ++
 projects/firefox/build |  57 +-
 projects/firefox/config|  25 +-
 projects/geckoview/config  |   8 +-
 projects/geckoview/mozconfig-android-aarch64   |   6 +-
 projects/geckoview/mozconfig-android-all   |   4 +-
 projects/geckoview/mozconfig-android-armv7 |   6 +-
 projects/geckoview/mozconfig-android-x86   |   6 +-
 projects/geckoview/mozconfig-android-x86_64|   6 +-
 projects/go/build  |   6 +-
 projects/nss/build |  26 +-
 projects/nss/config|   6 +-
 projects/openssl/build |   4 -
 projects/openssl/config|   2 +-
 projects/sqlcipher/build   |  24 +-
 projects/sqlcipher/config  |   4 +-
 projects/tor-android-service/build |   6 +-
 projects/tor-android-service/config|   5 +-
 .../gradle-dependencies-list.txt   | 335 
 projects/tor-onion-proxy-library/build |   3 +-
 projects/tor-onion-proxy-library/config|   2 +-
 .../gradle-dependencies-list.txt   | 335 
 projects/tor-onion-proxy-library/gradle.patch  |  67 +-
 projects/tor/build |   6 +-
 projects/tor/config|   2 +-
 projects/zlib/build|   9 +-
 projects/zstd/build|   6 +-
 rbm.conf   |  56 +-
 58 files changed, 4255 insertions(+), 1681 deletions(-)

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

[tor-commits] [tor-browser-build/master] Bug 40061: Remove Android SDK 28

2020-09-01 Thread sysrqb

commit e596732bca82b78e3f5182595f8cffcd0b9b2024
Author: Georg Koppen 
Date:   Fri Aug 28 07:25:31 2020 +

Bug 40061: Remove Android SDK 28
---
 projects/android-toolchain/build  | 10 +++---
 projects/android-toolchain/config |  6 +-
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build
index 0619ce7..74a49f1 100644
--- a/projects/android-toolchain/build
+++ b/projects/android-toolchain/build
@@ -38,8 +38,9 @@ unzip -qq $HOME/[% c("input_files_by_name/build_tools") %] -d 
$SDK_HOME
 mkdir -p build-tools/[% c("version") %]
 mv $android_release_dir/* build-tools/[% c("version") %]
 
-# Fenix has not updated to build-tools 29 yet, bundle therefore build-tools 28,
-# too.
+# Apart from GeckoView all other projects do still need build-tools 28.0.3 as
+# they are using the Gradle plugin 3.2.1 - 3.6.0 without specifying
+# `buildToolsVersion`.
 unzip -qq $HOME/[% c("input_files_by_name/build_tools_old") %] -d $SDK_HOME
 mkdir -p build-tools/[% c("version_old") %]
 mv $android_release_dir_old/* build-tools/[% c("version_old") %]
@@ -48,11 +49,6 @@ unzip -qq $HOME/[% c("input_files_by_name/platform") %] -d 
$SDK_HOME
 mkdir -p platforms/android-[% c("var/android_api_level") %]
 mv $android_release_dir/* platforms/android-[% c("var/android_api_level") %]
 
-# Fenix has not updated to Android 29 yet, bundle therefore Android 28, too.
-unzip -qq $HOME/[% c("input_files_by_name/platform_old") %] -d $SDK_HOME
-mkdir -p platforms/android-[% c("var/android_api_level_old") %]
-mv $android_release_dir_old/* platforms/android-[% 
c("var/android_api_level_old") %]
-
 unzip -qq $HOME/[% c("input_files_by_name/platform_tools") %] -d $SDK_HOME
 
 # That's a quirk required by GeckoView but let's have it here instead of in the
diff --git a/projects/android-toolchain/config 
b/projects/android-toolchain/config
index c01ca91..9fd997d 100644
--- a/projects/android-toolchain/config
+++ b/projects/android-toolchain/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-filename: '[% project %]-[% c("version") %]-[% c("version_old") %]-[% 
c("var/build_id") %].tar.gz'
+filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 version: 29.0.3
 version_old: 28.0.3
 var:
@@ -22,7 +22,6 @@ var:
 export 
PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle-[%
 c("var/gradle_version") %]/bin
   google_repo: https://dl.google.com/android/repository
   android_api_level: 29
-  android_api_level_old: 28
   android_platform_revision: 04
   android_ndk_version: 21
   android_ndk_version_old: 20
@@ -41,9 +40,6 @@ input_files:
   - URL: '[% c("var/google_repo") %]/platform-[% c("var/android_api_level") 
%]_r[% c("var/android_platform_revision") %].zip'
 name: platform
 sha256sum: c9eaf2ce4e8fa6f5a8036bd3c95363d003733bf0a1bd349718cadf802db44c69
-  - URL: '[% c("var/google_repo") %]/platform-[% 
c("var/android_api_level_old") %]_r[% c("var/android_platform_revision") %].zip'
-name: platform_old
-sha256sum: 967f8ca99b71d337aa9c7781f9d65dd8110bf5c4746f44304047bf71b20d0ded
   # ./mach bootstrap is fetching the latest version, so it does not seem to
   # matter which particular version we are using. Pin to the one fitting best 
to
   # SDK version/build-tools version.



___
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] Downgrade NSS and SQLCipher for 61.0.10

2020-09-01 Thread sysrqb

commit 933d4b890546abc07729e455c3074783c5da62f2
Author: Georg Koppen 
Date:   Fri Aug 21 20:14:00 2020 +

Downgrade NSS and SQLCipher for 61.0.10

We are about to switch to a previous `application-services` version
which is the proper dependency for the `android-components` and `fenix`
commits we'll use. However, that version requires an NSS and SQLCipher
downgrade. The code that landed previously was based on a later
`application-services` commit in the assumption that we'll use a tag
which includes those changes by the time we would wire all our
requirements for `fenix` together.
---
 projects/nss/config   | 6 +++---
 projects/sqlcipher/config | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/projects/nss/config b/projects/nss/config
index b260e77..2b5b4d3 100644
--- a/projects/nss/config
+++ b/projects/nss/config
@@ -2,8 +2,8 @@
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% 
c("var/build_id") %].tar.gz'
 # The required versions for application-services can be found at the respective
 # commit in libs/build-all.sh
-version: 3.54
-nspr_version: 4.26
+version: 3.53.1
+nspr_version: 4.25
 var:
   container:
 use_container: 1
@@ -19,7 +19,7 @@ input_files:
 project: ninja
   - URL: 'https://ftp.mozilla.org/pub/security/nss/releases/NSS_[% 
c("version") | replace("\\.", "_") %]_RTM/src/nss-[% c("version") 
%]-with-nspr-[% c("nspr_version") %].tar.gz'
 name: nss
-sha256sum: e0e81f0ff264d810f130d3cd9334722f7f883c752430483131d1ca5ac62d3f70
+sha256sum: 132ce527f3963e3ae5be3337ed4e1099e160b9402be177b5704de3ed2f5271d2
   - filename: configure.patch
   - filename: config.patch
   - filename: bug_13028.patch
diff --git a/projects/sqlcipher/config b/projects/sqlcipher/config
index fb4ae3a..da78dcd 100644
--- a/projects/sqlcipher/config
+++ b/projects/sqlcipher/config
@@ -2,7 +2,7 @@
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% 
c("var/build_id") %].tar.gz'
 # The required versions for application-services can be found at the respective
 # commit in libs/build-all.sh
-version: 4.4.0
+version: 4.3.0
 var:
   container:
 use_container: 1
@@ -18,4 +18,4 @@ input_files:
 project: nss
   - URL: 'https://github.com/sqlcipher/sqlcipher/archive/v[% c("version") 
%].tar.gz'
 name: sqlcipher
-sha256sum: 0924b2ae1079717954498bda78a30de20ce2a6083076b16214a711567821d148
+sha256sum: fccb37e440ada898902b294d02cde7af9e8706b185d77ed9f6f4d5b18b4c305f



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

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

2020-09-01 Thread translation

commit 6e62581ec9d33f3a61b20be4d8edc32f01f55278
Author: Translation commit bot 
Date:   Tue Sep 1 19:45:14 2020 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+es-AR.po | 33 +
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/contents+es-AR.po b/contents+es-AR.po
index 9d4cee1dad..9cee302433 100644
--- a/contents+es-AR.po
+++ b/contents+es-AR.po
@@ -635,6 +635,8 @@ msgid ""
 "Every relay needs a public IPv4 address - either directly on the host "
 "(preferred) or via NAT and port forwarding."
 msgstr ""
+"Todo repetidor necesita una direcciÃ³n IPv4 pÃºblica - directamente en el "
+"equipo (es preferido), o bien vÃa NAT y redirecciÃ³n de puertos."
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
@@ -642,6 +644,8 @@ msgid ""
 "The IPv4 address is not required to be static but static IP addresses are "
 "preferred."
 msgstr ""
+"De la direcciÃ³n IPv4 no es requerido que sea estÃ¡tica, pero estas Ãºltimas "
+"son preferidas."
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
@@ -651,6 +655,10 @@ msgid ""
 " relay or bridge there since it takes time to distribute the new list of "
 "relay IPs to clients - which happens only once every hour)."
 msgstr ""
+"Tu direcciÃ³n IPv4 debiera permanecer sin cambiar por al menos 3 horas (si "
+"cambia regularmente mÃ¡s a menudo que eso, no tiene mucho sentido correr ahÃ 
"
+"un repetidor o puente, ya que lleva tiempo distribuir la nueva lista de IPs "
+"de repetidores a los clientes - lo cual sucede solamente una vez por hora)."
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
@@ -658,6 +666,8 @@ msgid ""
 "Additional IPv6 connectivity is great and recommended/encouraged but not a "
 "requirement."
 msgstr ""
+"Tener conectividad IPv6 adicional es bÃ¡rbaro y estÃ¡ recomendado/alentado, "
+"pero no es un requerimiento."
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
@@ -665,50 +675,63 @@ msgid ""
 "There should be no problem at all with this requirement (all commercially "
 "available servers come with at least one IPv4 address)."
 msgstr ""
+"No deberÃa haber problemas en lo absoluto con este requerimiento (todos los "
+"servidores disponibles comercialmente vienen con al menos una direcciÃ³n "
+"IPv4)."
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
 msgid "Note: You can only run two Tor relays per public IPv4 address."
 msgstr ""
+"Nota: Solamente podÃ©s correr dos repetidores Tor por cada direcciÃ³n IPv4 "
+"pÃºblica."
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
 msgid ""
 "If you want to run more than two relays you will need more IPv4 addresses."
 msgstr ""
+"Si querÃ©s correr mÃ¡s que dos repetidores, vas a necesitar mÃ¡s direcciones "
+"IPv4."
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
 msgid "# Memory Requirements"
-msgstr ""
+msgstr "# Requerimientos de Memoria"
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
 msgid ""
 "* A <40 Mbit/s non-exit relay should have at least 512 MB of RAM available."
 msgstr ""
+"* Un repetidor (no de salida) con un ancho de banda <40 Mbit/s deberÃa tener"
+" al menos 512 MB de RAM disponible."
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
 msgid ""
 "* A non-exit relay faster than 40 Mbit/s should have at least 1 GB of RAM."
 msgstr ""
+"* Un repetidor (no de salida) mÃ¡s rÃ¡pido que 40 Mbit/s deberÃa tener al "
+"menos 1 GB de RAM."
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
 msgid ""
 "* On an exit relay we recommend at least 1.5 GB of RAM per tor instance."
 msgstr ""
+"* En un repetidor de salida recomendamos al menos 1,5 GB de RAM por "
+"instancia tor."
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
 msgid "# Disk Storage"
-msgstr ""
+msgstr "# Almacenamiento de Disco"
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
 msgid "Tor does not need much disk storage."
-msgstr ""
+msgstr "Tor no necesita mucho almacenamiento de

[tor-commits] [community/master] Add bold to ipv6 troubleshooting

2020-09-01 Thread gus

commit b8b174a14bfa97fd60f4f6d96d3e291ab3de5127
Author: Gustavo Gus 
Date:   Tue Sep 1 15:06:54 2020 +

Add bold to ipv6 troubleshooting

 https://gitlab.torproject.org/tpo/web/community/-/issues/149
---
 content/relay-operations/technical-setup/post-install/contents.lr | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/relay-operations/technical-setup/post-install/contents.lr 
b/content/relay-operations/technical-setup/post-install/contents.lr
index f7ee53c..d994153 100644
--- a/content/relay-operations/technical-setup/post-install/contents.lr
+++ b/content/relay-operations/technical-setup/post-install/contents.lr
@@ -82,7 +82,7 @@ ping6 -c2 2001:858:2:2:aabb:0:563b:1526 && ping6 -c2 
2620:13:4000:6000::1000:118
 ```
 
 At the end of the output you should see "OK." if that is not the case do not 
enable IPv6 in your torrc configuration file before IPv6 is indeed working.
-If you enable IPv6 without working IPv6 connectivity your entire relay will 
not be used, regardless if IPv4 is working.
+**If you enable IPv6 without working IPv6 connectivity your entire relay will 
not be used, regardless if IPv4 is working.**
 
 If it worked fine, make your Tor relay reachable via IPv6 by adding an 
additional ORPort line to your configuration (example for ORPort 9001):
 
@@ -105,7 +105,7 @@ If you are an exit relay with IPv6 connectivity, tell your 
tor daemon to allow e
 IPv6Exit 1
 ```
 
-Note: Tor requires IPv4 connectivity, you can not run a Tor relay on IPv6-only.
+**Note: Tor requires IPv4 connectivity, you can not run a Tor relay on 
IPv6-only.**
 
 # 8. Maintaining a relay
 

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

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

2020-09-01 Thread translation

commit 3e8dcb155f2c5802da408055100ba06fb84dbd1a
Author: Translation commit bot 
Date:   Tue Sep 1 19:15:10 2020 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+es-AR.po | 37 -
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/contents+es-AR.po b/contents+es-AR.po
index 9019b492d3..9d4cee1dad 100644
--- a/contents+es-AR.po
+++ b/contents+es-AR.po
@@ -498,11 +498,13 @@ msgid ""
 "Requirements for Tor relays depend on the type of relay and the bandwidth "
 "they provide."
 msgstr ""
+"Los requerimientos para repetidores Tor dependen del tipo de repetidor y del"
+" ancho de banda que proveen."
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
 msgid "# Bandwidth and Connections"
-msgstr ""
+msgstr "# Ancho de Banda y Conexiones"
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
@@ -510,6 +512,8 @@ msgid ""
 "A non-exit relay should be able to handle at least 7000 concurrent "
 "connections."
 msgstr ""
+"Un repetidor que no es de salida debiera ser capaz de manejar al menos 7000 "
+"conexiones simultÃ¡neas."
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
@@ -517,6 +521,9 @@ msgid ""
 "This can overwhelm consumer-level routers. If you run the Tor relay from a "
 "server (virtual or dedicated) in a data center you will be fine."
 msgstr ""
+"Esto puede sobrepasar a los enrutadores disponibles al pÃºblico. Si querÃ©s "
+"correr al repetidor Tor desde un servidor (virtual o dedicado) en un centro "
+"de datos, no vas a tener problemas."
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
@@ -524,6 +531,9 @@ msgid ""
 "If you run it behind a consumer-level router at home you will have to try "
 "and see if your home router can handle it or if it starts failing."
 msgstr ""
+"Si lo corrÃ©s en tu casa detrÃ¡s de un enrutador como los mencionados, vas a "
+"tener que intentar y ver si tu enrutador domÃ©stico puede manejarlo o empieza"
+" a fallar."
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
@@ -531,6 +541,8 @@ msgid ""
 "Fast exit relays (>=100 Mbit/s) usually have to handle a lot more concurrent"
 " connections (>100k)."
 msgstr ""
+"Los repetidores de salida rÃ¡pidos (>=100 Mbit/s) usualmente tienen que "
+"manejar un montÃ³n mÃ¡s de conexiones simultÃ¡neas (>100k)."
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
@@ -539,11 +551,13 @@ msgid ""
 "bandwidth and 16 Mbit/s (Mbps) download bandwidth available for Tor. More is"
 " better."
 msgstr ""
+"Es recomendado que un repetidor tenga al menos 16 Mbit/s (Mbps) de ancho de "
+"banda de subida, y otro tanto de bajada, disponibles para Tor. MÃ¡s es mejor."
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
 msgid "The minimum requirements for a relay are 10 Mbit/s (Mbps)."
-msgstr ""
+msgstr "Los requerimientos mÃnimos para un repetidor son 10 Mbit/s (Mbps)."
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
@@ -551,6 +565,8 @@ msgid ""
 "If you have less than 10 Mbit/s but at least 1 Mbit/s we recommend you run a"
 " [bridge with obfs4 support](relay/setup/bridge)."
 msgstr ""
+"Si tenÃ©s menos que 10 Mbit/s pero al menos 1 Mbit/s, te recomendamos que "
+"corras un [puente con soporte obfs4](relay/setup/bridge)."
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
@@ -558,11 +574,13 @@ msgid ""
 "If you do not know your bandwidth you can use http://beta.speedtest.net to "
 "measure it."
 msgstr ""
+"Si no conocÃ©s tu ancho de banda podÃ©s usar http://beta.speedtest.net para "
+"medirlo."
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
 msgid "# Monthly Outbound Traffic"
-msgstr ""
+msgstr "# TrÃ¡fico Saliente Mensual"
 
 #: https//community.torproject.org/relay/relays-requirements/
 #: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
@@ -570,6 +588,8 @@ msgid ""
 "It is required that a Tor relay be allowed to use a minimum of 100 GByte of "
 "outbound traffic (and the same amount of incoming traffic) per month."
 msgstr ""
+"Es requerido que a un repetidor Tor le sea permitido usar un mÃnimo de 100 "
+"GByte de trÃ¡fico saliente (y la misma

[tor-commits] [tor-browser-build/master] Bug 40002: Rename Linux debug builds to ASan builds

2020-09-01 Thread sysrqb

commit 968e536605061ec37e982dcb76d6e5e45b1f1b3c
Author: Georg Koppen 
Date:   Sun Aug 30 19:01:19 2020 +

Bug 40002: Rename Linux debug builds to ASan builds
---
 Makefile| 16 
 README.MAKEFILE |  4 ++--
 projects/release/config |  6 +++---
 rbm.conf|  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 3cc297a..391f5d0 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,8 @@ release-android-aarch64: submodule-update
 release-linux-x86_64: submodule-update
$(rbm) build release --target release --target torbrowser-linux-x86_64
 
-release-linux-x86_64-debug: submodule-update
-   $(rbm) build release --target release --target 
torbrowser-linux-x86_64-debug
+release-linux-x86_64-asan: submodule-update
+   $(rbm) build release --target release --target 
torbrowser-linux-x86_64-asan
 
 release-linux-i686: submodule-update
$(rbm) build release --target release --target torbrowser-linux-i686
@@ -62,8 +62,8 @@ alpha-android-aarch64: submodule-update
 alpha-linux-x86_64: submodule-update
$(rbm) build release --target alpha --target torbrowser-linux-x86_64
 
-alpha-linux-x86_64-debug: submodule-update
-   $(rbm) build release --target alpha --target 
torbrowser-linux-x86_64-debug
+alpha-linux-x86_64-asan: submodule-update
+   $(rbm) build release --target alpha --target 
torbrowser-linux-x86_64-asan
 
 alpha-linux-i686: submodule-update
$(rbm) build release --target alpha --target torbrowser-linux-i686
@@ -101,8 +101,8 @@ nightly-android-aarch64: submodule-update
 nightly-linux-x86_64: submodule-update
$(rbm) build release --target nightly --target torbrowser-linux-x86_64
 
-nightly-linux-x86_64-debug: submodule-update
-   $(rbm) build release --target nightly --target 
torbrowser-linux-x86_64-debug
+nightly-linux-x86_64-asan: submodule-update
+   $(rbm) build release --target nightly --target 
torbrowser-linux-x86_64-asan
 
 nightly-linux-i686: submodule-update
$(rbm) build release --target nightly --target torbrowser-linux-i686
@@ -140,8 +140,8 @@ testbuild-android-aarch64: submodule-update
 testbuild-linux-x86_64: submodule-update
$(rbm) build release --target testbuild --target torbrowser-linux-x86_64
 
-testbuild-linux-x86_64-debug: submodule-update
-   $(rbm) build release --target testbuild --target 
torbrowser-linux-x86_64-debug
+testbuild-linux-x86_64-asan: submodule-update
+   $(rbm) build release --target testbuild --target 
torbrowser-linux-x86_64-asan
 
 testbuild-linux-i686: submodule-update
$(rbm) build release --target testbuild --target torbrowser-linux-i686
diff --git a/README.MAKEFILE b/README.MAKEFILE
index 62b54df..b198985 100644
--- a/README.MAKEFILE
+++ b/README.MAKEFILE
@@ -44,9 +44,9 @@ By default it is based on the alpha channel, but you can 
change that by
 editing rbm.local.conf. The resulting build can be found in directory
 testbuild.
 
-{release,alpha,nightly,testbuild}-linux-x86_64-debug
+{release,alpha,nightly,testbuild}-linux-x86_64-asan
 
-Create a debug build for Linux x86_64 with debug features such as ASan.
+Create a build for Linux x86_64 with Address Sanitizer enabled.
 
 {release,alpha,nightly,testbuild}-src
 -
diff --git a/projects/release/config b/projects/release/config
index 8505971..aac9a94 100644
--- a/projects/release/config
+++ b/projects/release/config
@@ -47,10 +47,10 @@ targets:
   torbrowser-linux-x86_64:
 var:
   torbrowser-linux-x86_64: 1
-  torbrowser-linux-x86_64-debug:
+  torbrowser-linux-x86_64-asan:
 var:
   torbrowser-linux-x86_64: 1
-  debug-build: '-debug'
+  asan-build: '-asan'
   torbrowser-linux-i686:
 var:
   torbrowser-linux-i686: 1
@@ -154,7 +154,7 @@ input_files:
enable: '[% c("var/torbrowser-linux-x86_64") %]'
target:
  - '[% c("var/build_target") %]'
- - 'torbrowser-linux-x86_64[% c("var/debug-build") %]'
+ - 'torbrowser-linux-x86_64[% c("var/asan-build") %]'
 
  - name: linux-i686
project: tor-browser
diff --git a/rbm.conf b/rbm.conf
index 3efbe0c..bafc7e9 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -335,8 +335,8 @@ targets:
   torbrowser-linux-x86_64:
 - linux-x86_64
 - linux
-  torbrowser-linux-x86_64-debug:
-- linux-debug
+  torbrowser-linux-x86_64-asan:
+- linux-asan
 - linux-x86_64
 - linux
   torbrowser-linux-i686:
@@ -380,7 +380,7 @@ targets:
 - libtool
 - zip
 - unzip
-  linux-debug:
+  linux-asan:
 var:
   asan: 1
   # RLBox needs clang to create .wasm files but we use mostly GCC for our



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

[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40002_v2'

2020-09-01 Thread sysrqb

commit f6b89500953983b2fa2f8b2103e7a9772e3b1492
Merge: d1ae111 968e536
Author: Matthew Finkel 
Date:   Tue Sep 1 18:42:50 2020 +

Merge remote-tracking branch 'gkgl/bug_40002_v2'

 Makefile | 16 +-
 README.MAKEFILE  |  4 +--
 projects/firefox/build   |  1 -
 projects/firefox/config  |  2 +-
 projects/firefox/mozconfig-linux-x86_64-asan | 45 
 projects/release/config  |  6 ++--
 rbm.conf | 10 +--
 7 files changed, 66 insertions(+), 18 deletions(-)

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

[tor-commits] [tor-browser-build/master] Bug 40002: Fix Linux ASan builds for ESR 78

2020-09-01 Thread sysrqb

commit 13fe20de0088216a1f71a669050199447c5b3217
Author: Georg Koppen 
Date:   Sun Aug 30 05:31:59 2020 +

Bug 40002: Fix Linux ASan builds for ESR 78

We make the ASan build a first-class tor-browser-build citizen as well.
Additionally, we clean the .mozconfig file up so that we have a ASan
build without the `--enable-debug` and `--enable-test` options. This
makes it more usable for hunting memory corruption bugs. We can think
about separate debug builds that have all the assertions etc. enabled if
we find that part useful.
---
 projects/firefox/build   |  1 -
 projects/firefox/config  |  2 +-
 projects/firefox/mozconfig-linux-x86_64-asan | 45 
 rbm.conf |  4 +++
 4 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index ea03088..7b57387 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -62,7 +62,6 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') 
%].tar.gz
 cd /var/tmp/build/[% project %]-[% c("version") %]
 mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig
 [% IF c("var/asan") -%]
-  mv -f .mozconfig-asan .mozconfig
   # Without disabling LSan our build is blowing up:
   # https://bugs.torproject.org/10599#comment:52
   export ASAN_OPTIONS="detect_leaks=0"
diff --git a/projects/firefox/config b/projects/firefox/config
index aa34b7e..7e48c6d 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -117,7 +117,7 @@ input_files:
   - name: '[% c("var/compiler") %]'
 project: '[% c("var/compiler") %]'
   - filename: get-moz-build-date
-  - filename: 'mozconfig-[% c("var/osname") %]'
+  - filename: 'mozconfig-[% c("var/osname") %][% IF c("var/asan") %]-asan[% 
END %]'
 name: mozconfig
   - project: binutils
 name: binutils
diff --git a/projects/firefox/mozconfig-linux-x86_64-asan 
b/projects/firefox/mozconfig-linux-x86_64-asan
new file mode 100644
index 000..a1c4e46
--- /dev/null
+++ b/projects/firefox/mozconfig-linux-x86_64-asan
@@ -0,0 +1,45 @@
+. $topsrcdir/browser/config/mozconfig
+
+export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc"
+export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc"
+# We need to add -ldl explicitely due to bug 1213698
+export LDFLAGS="-fsanitize=address -ldl"
+
+# Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff
+# (which is part of mar-tools and is not distributed to end-users) with
+# ASan. See bug 17858.
+export HOST_CFLAGS=""
+export HOST_CXXFLAGS=""
+export HOST_LDFLAGS="-ldl"
+
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@
+mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
+export MOZILLA_OFFICIAL=1
+export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc'
+
+ac_add_options --enable-address-sanitizer
+ac_add_options --disable-jemalloc
+ac_add_options --disable-elf-hack
+ac_add_options --with-clang-path=/var/tmp/dist/clang/bin/clang
+
+ac_add_options --enable-optimize
+ac_add_options --enable-official-branding
+
+# Let's support GTK3 for ESR60
+ac_add_options --enable-default-toolkit=cairo-gtk3
+
+ac_add_options --enable-tor-browser-update
+ac_add_options --enable-verify-mar
+
+ac_add_options --disable-strip
+ac_add_options --disable-install-strip
+ac_add_options --disable-tests
+ac_add_options --disable-debug
+ac_add_options --disable-crashreporter
+ac_add_options --disable-webrtc
+ac_add_options --disable-parental-controls
+ac_add_options --disable-eme
+ac_add_options --enable-proxy-bypass-protection
+
+# Disable telemetry
+ac_add_options MOZ_TELEMETRY_REPORTING=
diff --git a/rbm.conf b/rbm.conf
index e59613a..3efbe0c 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -383,6 +383,10 @@ targets:
   linux-debug:
 var:
   asan: 1
+  # RLBox needs clang to create .wasm files but we use mostly GCC for our
+  # ASan builds. Thus, the compilation currently breaks with RLBox enabled.
+  # See: tor-browser-build#40063.
+  rlbox: 0
 
   torbrowser-windows-i686:
 - windows-i686



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

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

2020-09-01 Thread translation

commit a712d0ea5bb346ee7459a690ab6239c336ea39dc
Author: Translation commit bot 
Date:   Tue Sep 1 18:45:09 2020 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+es-AR.po | 39 +--
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/contents+es-AR.po b/contents+es-AR.po
index e29471df1c..9019b492d3 100644
--- a/contents+es-AR.po
+++ b/contents+es-AR.po
@@ -354,6 +354,9 @@ msgid ""
 "Note: For some operating systems, there are alpha version packages available"
 " (Tor versions with new features not deemed to be stable yet)."
 msgstr ""
+"Nota: Para algunos sistemas operativos, hay paquetes en versiones alfa "
+"disponibles (versiones de Tor con caracterÃsticas nuevas, que aÃºn no son "
+"consideradas estables)."
 
 #: https//community.torproject.org/relay/setup/
 #: (content/relay-operations/technical-setup/contents+en.lrpage.body)
@@ -361,6 +364,8 @@ msgid ""
 "These are only recommended for people eager to test and report bugs in "
 "bleeding edge releases/features."
 msgstr ""
+"Estos son recomendados solamente para gente ansiosa por probar y reportar "
+"errores en lanzamientos/caracterÃsticas avanzadas e inestables."
 
 #: https//community.torproject.org/relay/setup/
 #: (content/relay-operations/technical-setup/contents+en.lrpage.body)
@@ -368,17 +373,21 @@ msgid ""
 "If you are looking to run a relay with minimal effort, we recommend you "
 "stick to stable releases."
 msgstr ""
+"Si estÃ¡s buscando correr un repetidor con mÃnimo esfuerzo, te recomendamos "
+"que te pegues a las versiones estables."
 
 #: https//community.torproject.org/relay/setup/
 #: (content/relay-operations/technical-setup/contents+en.lrpage.body)
 msgid "# Questions you should clarify before configuring Tor"
-msgstr ""
+msgstr "# Preguntas que debieras clarificar antes de configurar a Tor"
 
 #: https//community.torproject.org/relay/setup/
 #: (content/relay-operations/technical-setup/contents+en.lrpage.body)
 msgid ""
 "* Do you want to run a Tor exit or non-exit (bridge/guard/middle) relay?"
 msgstr ""
+"* Â¿QuerÃ©s correr un repetidor Tor de salida o no (que sea "
+"puente/guardiÃ¡n/intermedio)?"
 
 #: https//community.torproject.org/relay/setup/
 #: (content/relay-operations/technical-setup/contents+en.lrpage.body)
@@ -386,17 +395,20 @@ msgid ""
 "* If you want to run an exit relay: Which ports do you want to allow in your"
 " exit policy?"
 msgstr ""
+"* Si querÃ©s correr un repetidor de salida: Â¿QuÃ© puertos qurÃ©s permitir en 
tu"
+" polÃtica de salida?"
 
 #: https//community.torproject.org/relay/setup/
 #: (content/relay-operations/technical-setup/contents+en.lrpage.body)
 msgid "(More ports usually means potentially more abuse complaints.)"
 msgstr ""
+"(MÃ¡s puertos usualmente significan potentialmente mÃ¡s quejas por abuso)."
 
 #: https//community.torproject.org/relay/setup/
 #: (content/relay-operations/technical-setup/contents+en.lrpage.body)
 msgid ""
 "* What external TCP port do you want to use for incoming Tor connections?"
-msgstr ""
+msgstr "* Â¿QuÃ© puerto TCP externo querÃ©s usar para conexiones Tor 
entrantes?"
 
 #: https//community.torproject.org/relay/setup/
 #: (content/relay-operations/technical-setup/contents+en.lrpage.body)
@@ -404,6 +416,8 @@ msgid ""
 "(\"ORPort\" configuration: We recommend port 443 if that is not used by "
 "another daemon on your server already."
 msgstr ""
+"(configuraciÃ³n de \"ORPort\": Recomendamos al puerto 443 si es que ya no es "
+"usado por otro demonio en tu servidor."
 
 #: https//community.torproject.org/relay/setup/
 #: (content/relay-operations/technical-setup/contents+en.lrpage.body)
@@ -411,33 +425,38 @@ msgid ""
 "ORPort 443 is recommended because it is often one of the few open ports on "
 "public WIFI networks."
 msgstr ""
+"ORPort 443 es recomendado porque a menudo es uno de los pocos puertos "
+"abiertos en redes pÃºblicas de WIFI."
 
 #: https//community.torproject.org/relay/setup/
 #: (content/relay-operations/technical-setup/contents+en.lrpage.body)
 msgid "Port 9001 is another commonly used ORPort.)"
-msgstr ""
+msgstr "El puerto 9001 es otro ORPort comÃºnmente usado)."
 
 #: https//community.torproject.org/relay/setup/
 #: (content/relay-operations/technical-setup/contents+en.lrpage.body)
 msgid ""
 "* What email address will you use in the ContactInfo field of your relay(s)?"
 msgstr ""
+"* Â¿QuÃ© direcciÃ³n de correo electrÃ³nico vas a usar en el campo ContactInfo 
de"
+" tu(s) repetidor(es)?"
 
 #: https//community.torproject.org/relay/setup/
 #: (content/relay-operations/technical-setup/contents+en.lrpage.body)
 msgid "This information will be made public."
-msgstr ""
+msgstr "Esta informaciÃ³n va a ser hecha pÃºblica."
 
 #: https//community.torproject.org/relay/setup/
 #: (content/relay-operations/technical-setup/contents+en.lrpage.body)
 msgid ""
 "* How much bandwidth/monthly traffic do you want to allow for Tor traffic?"
 msgstr ""

[tor-commits] [tor-browser/tor-browser-78.2.0esr-10.0-1] Merge remote-tracking branch 'gkgl/bug_40107' into tor-browser-78.2.0esr-10.0-1

2020-09-01 Thread sysrqb

commit b1f49b0a36f19408bae2c122d03b597650f0733e
Merge: 37e128fe3e2d 33ca178b8133
Author: Matthew Finkel 
Date:   Tue Sep 1 18:40:38 2020 +

Merge remote-tracking branch 'gkgl/bug_40107' into 
tor-browser-78.2.0esr-10.0-1

 .mozconfig-asan | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

___
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-78.2.0esr-10.0-1] squash! TB3: Tor Browser's official .mozconfigs.

2020-09-01 Thread sysrqb

commit 33ca178b81336d12693de10b2e4bfdd0a600e320
Author: Georg Koppen 
Date:   Sun Aug 30 20:51:49 2020 +

squash! TB3: Tor Browser's official .mozconfigs.

Bug 40107: Adapt .mozconfig-asan for ESR 78
---
 .mozconfig-asan | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.mozconfig-asan b/.mozconfig-asan
index ca05fb12eedb..a1c4e467cf1a 100644
--- a/.mozconfig-asan
+++ b/.mozconfig-asan
@@ -20,6 +20,7 @@ export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc'
 ac_add_options --enable-address-sanitizer
 ac_add_options --disable-jemalloc
 ac_add_options --disable-elf-hack
+ac_add_options --with-clang-path=/var/tmp/dist/clang/bin/clang
 
 ac_add_options --enable-optimize
 ac_add_options --enable-official-branding
@@ -32,8 +33,8 @@ ac_add_options --enable-verify-mar
 
 ac_add_options --disable-strip
 ac_add_options --disable-install-strip
-ac_add_options --enable-tests
-ac_add_options --enable-debug
+ac_add_options --disable-tests
+ac_add_options --disable-debug
 ac_add_options --disable-crashreporter
 ac_add_options --disable-webrtc
 ac_add_options --disable-parental-controls



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

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

2020-09-01 Thread translation

commit 7c01160de2ce0820b98e6c1e63fa526e92e0efb8
Author: Translation commit bot 
Date:   Tue Sep 1 17:45:11 2020 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+ar.po | 33 +
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/contents+ar.po b/contents+ar.po
index 8fe033a392..611c7f5f0c 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -3880,6 +3880,7 @@ msgstr "# Ø§ÙØªØ³Ø¬ÙÙ ÙÙ Transifex"
 msgid ""
 "1. Head over to the [Transifex signup page](https://transifex.com/signup/)."
 msgstr ""
+"1. ØªÙØ¬Ù Ø¥ÙÙ [ØµÙØØ© Ø§ÙØ§Ø´ØªØ±Ø§Ù ÙÙ Transifex] 
(https://transifex.com/signup/)."
 
 #: https//community.torproject.org/localization/becoming-tor-translator/
 #: (content/localization/becoming-tor-translator/contents+en.lrpage.body)
@@ -3889,7 +3890,7 @@ msgstr "Ø£Ø¯Ø®Ù ÙØ¹ÙÙÙØ§ØªÙ ÙÙ Ø§ÙØÙÙÙ 
ÙØ§ÙÙØ± Ø¹ÙÙ Ø²Ø± Ø§Ù
 #: https//community.torproject.org/localization/becoming-tor-translator/
 #: (content/localization/becoming-tor-translator/contents+en.lrpage.body)
 msgid "![Sign up to Transifex](/static/images/localization/tr1.png)"
-msgstr ""
+msgstr "! [Ø§Ø´ØªØ±Ù ÙÙ Transifex] (/ static / images / localization / 
tr1.png)"
 
 #: https//community.torproject.org/localization/becoming-tor-translator/
 #: (content/localization/becoming-tor-translator/contents+en.lrpage.body)
@@ -3897,16 +3898,18 @@ msgid ""
 "1. Fill out the next page with your name and select \"Localization\" and "
 "\"Translator\" from the drop-down menus:"
 msgstr ""
+"1. Ø§ÙÙØ£ Ø§ÙØµÙØØ© Ø§ÙØªØ§ÙÙØ© Ø¨Ø§Ø³ÙÙ ÙØØ¯Ø¯ \"Ø§ÙØªØ±Ø¬Ù
Ø©\" Ù \"Ø§ÙÙØªØ±Ø¬Ù\" ÙÙ Ø§ÙÙÙØ§Ø¦Ù "
+"Ø§ÙÙÙØ³Ø¯ÙØ©:"
 
 #: https//community.torproject.org/localization/becoming-tor-translator/
 #: (content/localization/becoming-tor-translator/contents+en.lrpage.body)
 msgid "![Fill out details](/static/images/localization/tr2.png)"
-msgstr ""
+msgstr "! [ÙÙØ¡ Ø§ÙØªÙØ§ØµÙÙ] (/ static / images / localization / 
tr2.png)"
 
 #: https//community.torproject.org/localization/becoming-tor-translator/
 #: (content/localization/becoming-tor-translator/contents+en.lrpage.body)
 msgid "1. On the next page, select 'Join an existing project' and continue."
-msgstr ""
+msgstr "1. ÙÙ Ø§ÙØµÙØØ© Ø§ÙØªØ§ÙÙØ© Ø ØØ¯Ø¯ \"Ø§ÙØ§ÙØ¶ÙØ§Ù 
Ø¥ÙÙ ÙØ´Ø±ÙØ¹ ÙÙØ¬ÙØ¯\" ÙØªØ§Ø¨Ø¹."
 
 #: https//community.torproject.org/localization/becoming-tor-translator/
 #: (content/localization/becoming-tor-translator/contents+en.lrpage.body)
@@ -3914,6 +3917,7 @@ msgid ""
 "1. On the next page, select the languages you speak from the drop-down menu "
 "and continue."
 msgstr ""
+"1. ÙÙ Ø§ÙØµÙØØ© Ø§ÙØªØ§ÙÙØ© Ø ØØ¯Ø¯ Ø§ÙÙØºØ§Øª Ø§ÙØªÙ 
ØªØªØØ¯Ø«ÙØ§ ÙÙ Ø§ÙÙØ§Ø¦ÙØ© Ø§ÙÙÙØ³Ø¯ÙØ© ÙØªØ§Ø¨Ø¹."
 
 #: https//community.torproject.org/localization/becoming-tor-translator/
 #: (content/localization/becoming-tor-translator/contents+en.lrpage.body)
@@ -3921,52 +3925,54 @@ msgid ""
 "1. You are now signed up! Go to the [Tor Transifex "
 "page](https://www.transifex.com/otf/torproject/)."
 msgstr ""
+"1. Ø£ÙØª Ø§ÙØ¢Ù ÙØ³Ø¬Ù! Ø§ÙØªÙÙ Ø¥ÙÙ [ØµÙØØ© Tor Transifex] "
+"(https://www.transifex.com/otf/torproject/)."
 
 #: https//community.torproject.org/localization/becoming-tor-translator/
 #: (content/localization/becoming-tor-translator/contents+en.lrpage.body)
 msgid "1. Click the blue 'Join Team' button on the far right:"
-msgstr ""
+msgstr "1. Ø§ÙÙØ± ÙÙÙ Ø§ÙØ²Ø± Ø§ÙØ£Ø²Ø±Ù \"Ø§ÙØ§ÙØ¶ÙØ§Ù Ø¥ÙÙ 
Ø§ÙÙØ±ÙÙ\" Ø£ÙØµÙ Ø§ÙÙÙÙÙ:"
 
 #: https//community.torproject.org/localization/becoming-tor-translator/
 #: (content/localization/becoming-tor-translator/contents+en.lrpage.body)
 msgid "![Join Team](/static/images/localization/tr3.png)"
-msgstr ""
+msgstr "! [Ø§ÙØ§ÙØ¶ÙØ§Ù Ø¥ÙÙ Ø§ÙÙØ±ÙÙ] (/ static / images / 
localization / tr3.png)"
 
 #: https//community.torproject.org/localization/becoming-tor-translator/
 #: (content/localization/becoming-tor-translator/contents+en.lrpage.body)
 msgid ""
 "1. Select the language you would like to translate from the dropdown menu:"
-msgstr ""
+msgstr "1. ØØ¯Ø¯ Ø§ÙÙØºØ© Ø§ÙØªÙ ØªØ±ÙØ¯ ØªØ±Ø¬ÙØªÙØ§ ÙÙ Ø§ÙÙØ§Ø¦Ù
Ø© Ø§ÙÙÙØ³Ø¯ÙØ©:"
 
 #: https//community.torproject.org/localization/becoming-tor-translator/
 #: (content/localization/becoming-tor-translator/contents+en.lrpage.body)
 msgid "![Choose Language](/static/images/localization/tr4.png)"
-msgstr ""
+msgstr "! [Ø§Ø®ØªØ± Ø§ÙÙØºØ©] (/ static / images / localization / tr4.png)"
 
 #: https//community.torproject.org/localization/becoming-tor-translator/
 #: (content/localization/becoming-tor-translator/contents+en.lrpage.body)
 msgid "1. A notification will now show up on the top of the page like so:"
-msgstr ""
+msgstr "1. Ø³ÙØ¸ÙØ± Ø¥Ø´Ø¹Ø§Ø± Ø§ÙØ¢Ù Ø£Ø¹ÙÙ Ø§ÙØµÙØØ© ÙÙØ§ ÙÙÙ:"
 
 #: https//community.torproject.org/localization/becoming-tor-translator/
 #:

[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'gitlab/merge-requests/52' into master

2020-09-01 Thread gk

commit d1ae11169f205ecdaeaf3013f9c07e3c1fd4cd5c
Merge: e8b008d 6218bc7
Author: Georg Koppen 
Date:   Tue Sep 1 09:57:03 2020 +

Merge remote-tracking branch 'gitlab/merge-requests/52' into master

 projects/debootstrap-image/config | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

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

[tor-commits] [tor-browser-build/master] Bug 40065: Bump debootstrap-image ubuntu_version to 20.04.1

2020-09-01 Thread gk

commit 6218bc7ecfa93cd1d1f435709a978262ec2fae18
Author: Alex Catarineu 
Date:   Mon Aug 31 09:20:28 2020 +

Bug 40065: Bump debootstrap-image ubuntu_version to 20.04.1
---
 projects/debootstrap-image/config | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/debootstrap-image/config 
b/projects/debootstrap-image/config
index 6ee4a64..ecd55e1 100644
--- a/projects/debootstrap-image/config
+++ b/projects/debootstrap-image/config
@@ -1,10 +1,10 @@
 # vim: filetype=yaml sw=2
 filename: 'container-image_[% c("var/container/suite") %]-[% 
c("var/container/arch") %]-[% c("version") %].tar.gz'
-version: 2
+version: 3
 pkg_type: build
 
 var:
-  ubuntu_version: 19.10
+  ubuntu_version: 20.04.1
 
   container:
 use_container: 1
@@ -64,9 +64,9 @@ targets:
 arch: amd64
 
 input_files:
-  - URL: 'http://cdimage.ubuntu.com/ubuntu-base/releases/[% 
c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") 
%]-base-amd64.tar.gz'
+  - URL: 'https://cdimage.ubuntu.com/ubuntu-base/releases/[% 
c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") 
%]-base-amd64.tar.gz'
 filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") 
%]-base-amd64.tar.gz'
-sha256sum: eedcb1dc0ccc86b59eb1f89960c322a2ba3ed3e0323a20a1da8bcc0e6f100f4f
+sha256sum: 97f6cbcf41f39272c84e32b6f926ed5d6906c6e463a557025181f4aa191ad667
   - URL: '[% c("var/apt_packages_baseurl") %]/[% c("var/apt_package_filename") 
%]'
 sha256sum: '[% c("var/apt_package_sha256sum") %]'
 enable: '[% c("var/apt_package_filename") %]'



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

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

2020-09-01 Thread translation

commit a399f66e5bc3f006af18378e803b6e80b8389112
Author: Translation commit bot 
Date:   Tue Sep 1 08:15:11 2020 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+es-AR.po | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/contents+es-AR.po b/contents+es-AR.po
index 19724fa3fa..e29471df1c 100644
--- a/contents+es-AR.po
+++ b/contents+es-AR.po
@@ -313,11 +313,13 @@ msgid ""
 "We've curated some beautiful materials for sharing in-person and on social "
 "media we welcome you to use."
 msgstr ""
+"Hemos organizado algunos bellos materiales para compartir en persona y en "
+"redes sociales, y sos bienvenido para usarlos."
 
 #: https//community.torproject.org/relay/setup/
 #: (content/relay-operations/technical-setup/contents+en.lrpage.title)
 msgid "Technical Setup"
-msgstr ""
+msgstr "ConfiguraciÃ³n TÃ©cnica"
 
 #: https//community.torproject.org/relay/setup/
 #: (content/relay-operations/technical-setup/contents+en.lrpage.subtitle)
@@ -325,6 +327,8 @@ msgid ""
 "How to install and configure each type of relay: bridge, guard, middle, and "
 "exit."
 msgstr ""
+"CÃ³mo instalar y configurar cada tipo de repetidor: puente, guardiÃ¡n, "
+"intermedio y salida."
 
 #: https//community.torproject.org/relay/setup/
 #: (content/relay-operations/technical-setup/contents+en.lrpage.body)
@@ -332,6 +336,8 @@ msgid ""
 "This section covers the installation and configuration of the program "
 "required to run a Tor relay for various operating systems."
 msgstr ""
+"Esta secciÃ³n cubre la instalaciÃ³n y configuraciÃ³n del programa requerido "
+"para correr un repetidor Tor para varios sistemas operativos."
 
 #: https//community.torproject.org/relay/setup/
 #: (content/relay-operations/technical-setup/contents+en.lrpage.body)
@@ -339,6 +345,8 @@ msgid ""
 "These steps are intended for the latest stable version of the given OS, on "
 "Ubuntu for the latest LTS release."
 msgstr ""
+"Estos pasos estÃ¡n planeados para la versiÃ³n estable mÃ¡s reciente del SO "
+"dado, y en Ubuntu, para el lanzamiento LTS mÃ¡s reciente."
 
 #: https//community.torproject.org/relay/setup/
 #: (content/relay-operations/technical-setup/contents+en.lrpage.body)

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

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

2020-09-01 Thread translation

commit 580ac5dcf63fe2255a582fa894575569057078dc
Author: Translation commit bot 
Date:   Tue Sep 1 07:45:21 2020 +

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

diff --git a/ka/https-everywhere.dtd b/ka/https-everywhere.dtd
index 184344939c..ee54970928 100644
--- a/ka/https-everywhere.dtd
+++ b/ka/https-everywhere.dtd
@@ -31,7 +31,7 @@
 
 
 
-
+
 
 
 

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

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

2020-09-01 Thread translation

commit 9d90fc03e1fd2bfe7c8487b8f4ab4ae793b4c8d1
Author: Translation commit bot 
Date:   Tue Sep 1 07:45:23 2020 +


https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
---
 ka/https-everywhere.dtd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ka/https-everywhere.dtd b/ka/https-everywhere.dtd
index 6f1fb7e29e..49b3cbcecb 100644
--- a/ka/https-everywhere.dtd
+++ b/ka/https-everywhere.dtd
@@ -31,6 +31,7 @@
 
 
 
+
 
 
 

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

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

2020-09-01 Thread translation

commit 8f206c813a67c9929f0c0e4120fbaf135042e069
Author: Translation commit bot 
Date:   Tue Sep 1 07:45:13 2020 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+es-AR.po | 37 +
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/contents+es-AR.po b/contents+es-AR.po
index 6b2c497caf..19724fa3fa 100644
--- a/contents+es-AR.po
+++ b/contents+es-AR.po
@@ -183,6 +183,9 @@ msgid ""
 " Community Team](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-;
 "community-team) for more help."
 msgstr ""
+"Si esto describe a tu comunidad, o si no estÃ¡s seguro, por favor [contactÃ¡ 
a"
+" nuestro Equipo Comunitario](https://lists.torproject.org/cgi-;
+"bin/mailman/listinfo/tor-community-team) por mÃ¡s ayuda."
 
 #: https//community.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrpage.title)
@@ -195,16 +198,18 @@ msgid ""
 "Onion services help you and your users defeat surveillance and censorship. "
 "Learn how you can deploy onion services."
 msgstr ""
+"Los servicios onion te ayudan a vos y a tus usuarios a derrotar a la "
+"vigilancia y a la censura. AprendÃ© cÃ³mo podÃ©s desplegar servicios onion."
 
 #: https//community.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrpage.cta)
 msgid "Grow your .onion"
-msgstr ""
+msgstr "HacÃ© crecer a tu .onion"
 
 #: https//community.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrpage.body)
 msgid "##What are Onion Services?"
-msgstr ""
+msgstr "##Â¿QuÃ© son los Servicios Onion?"
 
 #: https//community.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrpage.body)
@@ -213,11 +218,14 @@ msgid ""
 "onion service gives your users all the security of HTTPS with the added "
 "privacy benefits of Tor Browser."
 msgstr ""
+"Los servicios onion son servicios que solamente pueden ser accedidos sobre "
+"Tor. Correr un servicio onion les da a tus usuarios toda la seguridad de "
+"HTTPS, con los beneficios aÃ±adidos de privacidad del Navegador Tor."
 
 #: https//community.torproject.org/localization/
 #: (content/localization/contents+en.lrpage.title)
 msgid "Localization"
-msgstr ""
+msgstr "AdaptaciÃ³n local"
 
 #: https//community.torproject.org/localization/
 #: (content/localization/contents+en.lrpage.subtitle)
@@ -225,16 +233,19 @@ msgid ""
 "We want Tor to work for everyone in the world, which means our software must"
 " be translated into a lot of languages."
 msgstr ""
+"Queremos que Tor funcione para todos en el mundo, lo que significa que "
+"nuestro software debe ser traducido en un montÃ³n de lenguajes."
 
 #: https//community.torproject.org/localization/
 #: (content/localization/contents+en.lrpage.cta)
 msgid "Help us translate"
-msgstr ""
+msgstr "Ayudanos a traducir"
 
 #: https//community.torproject.org/localization/
 #: (content/localization/contents+en.lrpage.body)
 msgid "##Localization is how we reach a global community."
 msgstr ""
+"##La adaptaciÃ³n local es la manera en que alcanzamos a una comunidad global."
 
 #: https//community.torproject.org/localization/
 #: (content/localization/contents+en.lrpage.body)
@@ -242,6 +253,8 @@ msgid ""
 "In order for Tor to work for everyone, it needs to speak everyone's "
 "languages."
 msgstr ""
+"Con el fin de que Tor funcione para todos, necesita hablar el lenguaje de "
+"todos."
 
 #: https//community.torproject.org/localization/
 #: (content/localization/contents+en.lrpage.body)
@@ -249,6 +262,8 @@ msgid ""
 "Our volunteer translation team works hard to make this a reality, and we can"
 " always use more help."
 msgstr ""
+"Nuestro equipo voluntario de traducciÃ³n trabaja duro para hacer de esto una "
+"realidad, y siempre podemos usar mÃ¡s ayuda."
 
 #: https//community.torproject.org/localization/
 #: (content/localization/contents+en.lrpage.body)
@@ -258,26 +273,30 @@ msgid ""
 " Project website](https://torpat.ch/tpo-locales), but there are many other "
 "documents that we could use help translating as well."
 msgstr ""
+"Nuestras prioridades actuales de traducciÃ³n son el [Navegador "
+"Tor](https://torpat.ch/locales), su documentaciÃ³n, y el [sitio web del Tor "
+"Project](https://torpat.ch/tpo-locales), pero hay muchos otros documentos en"
+" los cuales tambiÃ©n podrÃamos usar ayuda traduciÃ©ndolos."
 
 #: https//community.torproject.org/outreach/
 #: (content/outreach/contents+en.lrpage.title)
 msgid "Outreach"
-msgstr ""
+msgstr "Actividades de difusiÃ³n"
 
 #: https//community.torproject.org/outreach/
 #: (content/outreach/contents+en.lrpage.subtitle)
 msgid "Bring Tor materials to your next community event."
-msgstr ""
+msgstr "LlevÃ¡ materiales de Tor a tu prÃ³ximo evento comunitario."
 
 #: https//community.torproject.org/outreach/
 #: (content/outreach/contents+en.lrpage.cta)
 msgid "Tell the world about Tor"
-msgstr ""
+msgstr "Contale al mundo acerca de Tor"
 
 #:

[tor-commits] [tor-android-service/master] Bug 40001: Remove default bridge 37.218.240.34.

2020-09-01 Thread gk

commit 68b91198066cf89a3664295116b5249b499461d6
Author: Philipp Winter 
Date:   Mon Aug 31 09:13:26 2020 -0700

Bug 40001: Remove default bridge 37.218.240.34.

The colocation site where the bridge is running will be shut down.

This patch fixes tpo/applications/tor-android-service#40001
---
 service/src/main/assets/common/bridges.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/service/src/main/assets/common/bridges.txt 
b/service/src/main/assets/common/bridges.txt
index a913c11..d590c9c 100644
--- a/service/src/main/assets/common/bridges.txt
+++ b/service/src/main/assets/common/bridges.txt
@@ -1,6 +1,5 @@
 obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 
cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ 
iat-mode=1
 obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 
cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg 
iat-mode=1
-obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 
cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg 
iat-mode=1
 obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D 
cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg 
iat-mode=0
 obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 
cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg 
iat-mode=0
 obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 
cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw 
iat-mode=0

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

[tor-commits] [tor-browser-build/master] Bug 40066: Remove default bridge 37.218.240.34.

2020-09-01 Thread gk

commit e8b008d6eb90c8ea06a2562ecda9341ea7a380f5
Author: Philipp Winter 
Date:   Mon Aug 31 09:01:57 2020 -0700

Bug 40066: Remove default bridge 37.218.240.34.

The colocation site where the bridge is running will be shut down.

This patch fixes tpo/applications/tor-browser-build#40066
---
 .../Bundle-Data/PTConfigs/bridge_prefs.js  | 23 +++---
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js 
b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
index 282e56f..f3202c0 100644
--- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
+++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js
@@ -5,18 +5,17 @@ 
pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4");
 pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 192.95.36.142:443 
CDF2E852BF539B82BD10E27E9115A31734E378C2 
cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ 
iat-mode=1");
 pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 38.229.1.78:80 
C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 
cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg 
iat-mode=1");
 /**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.3"/**/, 
/**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 
cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ 
iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 
37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 
cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg 
iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 
37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D 
cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 85.31.186.98:443 
011F2599C0E9B27EE74B353155E244813763C3E5 
cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 85.31.186.26:443 
91A6354697E6B02A386312F68D82CF86824D3606 
cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 144.217.20.138:80 
FB70B257C162BF1038CA669D568D76F5B7F0BABB 
cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 
193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA 
cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 
193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF 
cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 
193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF 
cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 
209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 
cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 
146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 
cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 
45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C 
cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 
[2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C 
cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw 
iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 
37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D 
cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg 
iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 85.31.186.98:443 
011F2599C0E9B27EE74B353155E244813763C3E5 
cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg 
iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 85.31.186.26:443 
91A6354697E6B02A386312F68D82CF86824D3606 
cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw 
iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 144.217.20.138:80 
FB70B257C162BF1038CA669D568D76F5B7F0BABB 
cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw 
iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4

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

2020-09-01 Thread translation

commit f32f8db6f3558bcd4a6604e99c3f963a68d8f1ab
Author: Translation commit bot 
Date:   Tue Sep 1 07:17:51 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+es-AR.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+es-AR.po b/contents+es-AR.po
index 982822d7b2..76b5f7ee06 100644
--- a/contents+es-AR.po
+++ b/contents+es-AR.po
@@ -3265,7 +3265,7 @@ msgstr ""
 #: https//support.torproject.org/about/what-is-tor/
 #: (content/about/what-is-tor/contents+en.lrquestion.description)
 msgid "This set of volunteer relays is called the Tor network."
-msgstr "Este conjunto de repetidores voluntarios es lammado red Tor."
+msgstr "Este conjunto de repetidores voluntarios es llamado red Tor."
 
 #: https//support.torproject.org/about/what-is-tor/
 #: (content/about/what-is-tor/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/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot

2020-09-01 Thread translation

commit 488a239913791149d75a10bc818c8215e7f15833
Author: Translation commit bot 
Date:   Tue Sep 1 07:15:10 2020 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+es-AR.po | 43 ---
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/contents+es-AR.po b/contents+es-AR.po
index 5887e19286..6b2c497caf 100644
--- a/contents+es-AR.po
+++ b/contents+es-AR.po
@@ -44,17 +44,21 @@ msgid ""
 "Whether you have a lot of time to volunteer or a little, and whether you "
 "consider yourself technical or not, we want you to join our community, too."
 msgstr ""
+"Si tenÃ©s mucho o poco tiempo para invertir como voluntario, y si te "
+"considerÃ¡s o no tÃ©cnico, tambiÃ©n queremos que te unas a nuestra comunidad."
 
 #: https//community.torproject.org/ (content/contents+en.lrpage.body)
 msgid ""
 "Below you'll find some different ways to volunteer with the Tor community as"
 " well as resources to help you help Tor."
 msgstr ""
+"Abajo vas a encontrar algunas maneras diferentes de ser voluntario con la "
+"comunidad Tor, como tambiÃ©n recursos para ayudarte a ayudar a Tor."
 
 #: https//community.torproject.org/relay/
 #: (content/relay-operations/contents+en.lrpage.title)
 msgid "Relay operations"
-msgstr ""
+msgstr "OperaciÃ³n de repetidores"
 
 #: https//community.torproject.org/relay/
 #: (content/relay-operations/contents+en.lrpage.subtitle)
@@ -62,21 +66,23 @@ msgid ""
 "Relays are the backbone of the Tor network. Help make Tor stronger and "
 "faster by running a relay today."
 msgstr ""
+"Los repetidores son la espina dorsal de la red Tor. AyudÃ¡ a hacer a Tor mÃ¡s 
"
+"fuerte y rÃ¡pido corriendo un repetidor hoy."
 
 #: https//community.torproject.org/relay/
 #: (content/relay-operations/contents+en.lrpage.cta)
 msgid "Grow the Tor network"
-msgstr ""
+msgstr "HacÃ© crecer a la red Tor."
 
 #: https//community.torproject.org/relay/
 #: (content/relay-operations/contents+en.lrpage.body)
 msgid "The Tor network relies on volunteers to donate bandwidth."
-msgstr ""
+msgstr "La red Tor se respalda en voluntarios que donan ancho de banda."
 
 #: https//community.torproject.org/relay/
 #: (content/relay-operations/contents+en.lrpage.body)
 msgid "The more people who run relays, the better the Tor network will be."
-msgstr ""
+msgstr "Cuanto mÃ¡s gente corra repetidores, tanto mejor serÃ¡ la red Tor."
 
 #: https//community.torproject.org/relay/
 #: (content/relay-operations/contents+en.lrpage.body)
@@ -85,31 +91,36 @@ msgid ""
 "need to use Tor, which means we need more dedicated volunteers like you to "
 "run relays."
 msgstr ""
+"La red Tor actual es bastante chica comparada con el nÃºmero de personas que "
+"necesitan usar Tor, lo que significa que necesitamos mÃ¡s voluntarios "
+"dedicados como vos para correr repetidores."
 
 #: https//community.torproject.org/relay/
 #: (content/relay-operations/contents+en.lrpage.body)
 msgid "By running a Tor relay you can help make the Tor network:"
-msgstr ""
+msgstr "Al correr un repetidor Tor, podÃ©s ayudar a hacer la red Tor:"
 
 #: https//community.torproject.org/relay/
 #: (content/relay-operations/contents+en.lrpage.body)
 msgid "* faster (and therefore more usable)"
-msgstr ""
+msgstr "* mÃ¡s rÃ¡pida (y por lo tanto mÃ¡s utilizable)"
 
 #: https//community.torproject.org/relay/
 #: (content/relay-operations/contents+en.lrpage.body)
 msgid "* more robust against attacks"
-msgstr ""
+msgstr "* mÃ¡s robusta contra ataques"
 
 #: https//community.torproject.org/relay/
 #: (content/relay-operations/contents+en.lrpage.body)
 msgid "* more stable in case of outages"
-msgstr ""
+msgstr "* mÃ¡s estable en caso de apagones"
 
 #: https//community.torproject.org/relay/
 #: (content/relay-operations/contents+en.lrpage.body)
 msgid "* safer for its users (spying on more relays is harder than on a few)"
 msgstr ""
+"* mÃ¡s segura para sus usuarios (espiar sobre mÃ¡s repetidores es mÃ¡s 
difÃcil "
+"que sobre unos pocos)"
 
 #: https//community.torproject.org/relay/
 #: (content/relay-operations/contents+en.lrpage.body)
@@ -117,11 +128,14 @@ msgid ""
 "Running a relay requires technical skill and commitment, which is why we've "
 "created a wealth of resources to help our relay operators."
 msgstr ""
+"Correr un repetidor requiere habilidad tÃ©cnica y compromiso, por lo cual "
+"hemos creado una abundancia de recursos para ayudar a nuestros operadores de"
+" repetidores."
 
 #: https//community.torproject.org/training/
 #: (content/training/contents+en.lrpage.title)
 msgid "Training"
-msgstr ""
+msgstr "Entrenamiento"
 
 #: https//community.torproject.org/training/
 #: (content/training/contents+en.lrpage.subtitle)
@@ -130,16 +144,18 @@ msgstr ""
 msgid ""
 "Do you teach your community about using Tor? These resources are for you."
 msgstr ""
+"Â¿Le enseÃ±Ã¡s a tu comunidad acerca del uso de Tor? Estos recursos son para "
+"vos."
 
 #: https//community.torproject.org/training/

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

2020-09-01 Thread translation

commit 0a8773f6c87c94a043ba91478ffe553d2c4fa25e
Author: Translation commit bot 
Date:   Tue Sep 1 06:45:12 2020 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+es-AR.po | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contents+es-AR.po b/contents+es-AR.po
index da37f908e2..5887e19286 100644
--- a/contents+es-AR.po
+++ b/contents+es-AR.po
@@ -24,16 +24,20 @@ msgstr "Unite a la comunidad Tor"
 #: https//community.torproject.org/ (content/contents+en.lrpage.subtitle)
 msgid "Our community is made up of human rights defenders around the world."
 msgstr ""
+"Nuestra comunidad estÃ¡ constituÃda por defensores de los derechos humanos "
+"alrededor del mundo."
 
 #: https//community.torproject.org/ (content/contents+en.lrpage.body)
 msgid "The Tor community is made up of all kinds of contributors."
-msgstr ""
+msgstr "La comunidad Tor estÃ¡ constituÃda por toda clase de contribuyentes."
 
 #: https//community.torproject.org/ (content/contents+en.lrpage.body)
 msgid ""
 "Some people write documentation and bug reports, while others hold Tor "
 "events and conduct outreach."
 msgstr ""
+"Alguna gente escribe la documentaciÃ³n y los reportes de error, mientras que "
+"otros mantienen eventos Tor y conducen las actividades de difusiÃ³n."
 
 #: https//community.torproject.org/ (content/contents+en.lrpage.body)
 msgid ""

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

47 matches

Mail list logo