September 2020 - tor-commits - lists.torproject.org

[onionperf/develop] Bump analysis version to 4.0
by karsten＠torproject.org 16 Sep '20

16 Sep '20

commit d0660c1847b46863783b7006efdac4df8103f123 Author: Ana Custura <ana(a)netstat.org.uk> Date: Thu Sep 10 12:54:41 2020 +0100 Bump analysis version to 4.0 --- onionperf/analysis.py | 4 ++-- onionperf/filtering.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/onionperf/analysis.py b/onionperf/analysis.py index 49c109c..907d451 100644 --- a/onionperf/analysis.py +++ b/onionperf/analysis.py @@ -24,7 +24,7 @@ class OPAnalysis(Analysis): def __init__(self, nickname=None, ip_address=None): super().__init__(nickname, ip_address) - self.json_db = {'type': 'onionperf', 'version': '3.0', 'data': {}} + self.json_db = {'type': 'onionperf', 'version': '4.0', 'data': {}} self.torctl_filepaths = [] def add_torctl_file(self, filepath): @@ -133,7 +133,7 @@ class OPAnalysis(Analysis): if 'type' not in db or 'version' not in db: logging.warning("'type' or 'version' not present in database") return None - elif db['type'] != 'onionperf' or str(db['version']) >= '4.': + elif db['type'] != 'onionperf' or str(db['version']) >= '5.': logging.warning("type or version not supported (type={0}, version={1})".format(db['type'], db['version'])) return None else: diff --git a/onionperf/filtering.py b/onionperf/filtering.py index 0ba9ebc..e8ea164 100644 --- a/onionperf/filtering.py +++ b/onionperf/filtering.py @@ -71,6 +71,7 @@ class Filtering(object): self.analysis = OPAnalysis.load(filename=input_path) self.filter_tor_circuits(self.analysis) self.analysis.json_db["filters"] = self.filters + self.analysis.json_db["version"] = '4.0' self.analysis.json_db = dict(sorted(self.analysis.json_db.items())) self.analysis.save(filename=output_file, output_prefix=output_dir, sort_keys=False)

1 0

[onionperf/develop] Append to existing "filters" field.
by karsten＠torproject.org 16 Sep '20

16 Sep '20

commit c41c0b74c47442dc6f6d23f49a012729f71aee49 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Sep 16 12:01:07 2020 +0200 Append to existing "filters" field. Before this change we would have replaced an existing "filters" field with the filters applied in this run. But if the user runs `onionperf filter` more than once to apply different filters, we'll want to list all filters in the "filters" field. This change also removes a couple of `self.`s, in particular `self.analysis` and `self.filters`, because one Filtering object can apply filters to more than one analysis. --- onionperf/filtering.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/onionperf/filtering.py b/onionperf/filtering.py index e8ea164..15d9c19 100644 --- a/onionperf/filtering.py +++ b/onionperf/filtering.py @@ -7,7 +7,6 @@ import re from onionperf.analysis import OPAnalysis -from collections import defaultdict class Filtering(object): @@ -15,7 +14,6 @@ class Filtering(object): self.fingerprints_to_include = None self.fingerprints_to_exclude = None self.fingerprint_pattern = re.compile("\$?([0-9a-fA-F]{40})") - self.filters = defaultdict(list) def include_fingerprints(self, path): self.fingerprints_to_include = [] @@ -40,11 +38,12 @@ class Filtering(object): def filter_tor_circuits(self, analysis): if self.fingerprints_to_include is None and self.fingerprints_to_exclude is None: return - self.filters["tor/circuits"] = [] + filters = analysis.json_db.setdefault("filters", {}) + tor_circuits_filters = filters.setdefault("tor/circuits", []) if self.fingerprints_to_include: - self.filters["tor/circuits"].append({"name": "include_fingerprints", "filepath": self.fingerprints_to_include_path }) + tor_circuits_filters.append({"name": "include_fingerprints", "filepath": self.fingerprints_to_include_path }) if self.fingerprints_to_exclude: - self.filters["tor/circuits"].append({"name": "exclude_fingerprints", "filepath": self.fingerprints_to_exclude_path }) + tor_circuits_filters.append({"name": "exclude_fingerprints", "filepath": self.fingerprints_to_exclude_path }) for source in analysis.get_nodes(): tor_circuits = analysis.get_tor_circuits(source) filtered_circuit_ids = [] @@ -68,10 +67,9 @@ class Filtering(object): tor_circuits[circuit_id] = dict(sorted(tor_circuit.items())) def apply_filters(self, input_path, output_dir, output_file): - self.analysis = OPAnalysis.load(filename=input_path) - self.filter_tor_circuits(self.analysis) - self.analysis.json_db["filters"] = self.filters - self.analysis.json_db["version"] = '4.0' - self.analysis.json_db = dict(sorted(self.analysis.json_db.items())) - self.analysis.save(filename=output_file, output_prefix=output_dir, sort_keys=False) + analysis = OPAnalysis.load(filename=input_path) + self.filter_tor_circuits(analysis) + analysis.json_db["version"] = '4.0' + analysis.json_db = dict(sorted(analysis.json_db.items())) + analysis.save(filename=output_file, output_prefix=output_dir, sort_keys=False)

1 0

[onionperf/develop] Change filter mode to filter Tor circuits.
by karsten＠torproject.org 16 Sep '20

16 Sep '20

commit 9d0c80561b84905e72b41758dfcb7b712f5f407f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 31 11:30:53 2020 +0200 Change filter mode to filter Tor circuits. This new filter mode removes Tor circuits that don't match the provided fingerprints and leaves TGen transfers/streams untouched. At the same time the visualize mode only includes TGen transfers/streams with an existing mapping between TGen transfers/streams and Tor streams/circuits. This patch changes the default behavior of the visualize mode. The original behavior of visualizing TGen transfers/streams *without* an existing mapping to Tor streams/circuits can be selected with the --outer-join switch, even though that's rather an edge use case. Another minor change is that the filtered analysis files is not written with sort_keys=True anymore, which would have produced a newly sorted file with keys in alphabetic order rather than the original insert order. The result is an actually useful diff. --- onionperf/analysis.py | 13 +++++------- onionperf/filtering.py | 49 ++++++++-------------------------------------- onionperf/onionperf | 24 +++++++++++++++++------ onionperf/visualization.py | 33 ++++++++++++++++++++----------- 4 files changed, 53 insertions(+), 66 deletions(-) diff --git a/onionperf/analysis.py b/onionperf/analysis.py index b2f483f..49c109c 100644 --- a/onionperf/analysis.py +++ b/onionperf/analysis.py @@ -62,13 +62,7 @@ class OPAnalysis(Analysis): self.json_db['data'][self.nickname]["tgen"].pop("stream_summary") self.did_analysis = True - def set_tgen_transfers(self, node, tgen_transfers): - self.json_db['data'][node]['tgen']['transfers'] = tgen_transfers - - def set_tgen_streams(self, node, tgen_streams): - self.json_db['data'][node]['tgen']['streams'] = tgen_streams - - def save(self, filename=None, output_prefix=os.getcwd(), do_compress=True, date_prefix=None): + def save(self, filename=None, output_prefix=os.getcwd(), do_compress=True, date_prefix=None, sort_keys=True): if filename is None: base_filename = "onionperf.analysis.json.xz" if date_prefix is not None: @@ -85,7 +79,7 @@ class OPAnalysis(Analysis): logging.info("saving analysis results to {0}".format(filepath)) outf = util.FileWritable(filepath, do_compress=do_compress) - json.dump(self.json_db, outf, sort_keys=True, separators=(',', ': '), indent=2) + json.dump(self.json_db, outf, sort_keys=sort_keys, separators=(',', ': '), indent=2) outf.close() logging.info("done!") @@ -109,6 +103,9 @@ class OPAnalysis(Analysis): except: return None + def set_tor_circuits(self, node, tor_circuits): + self.json_db['data'][node]['tor']['circuits'] = tor_circuits + def get_tor_streams(self, node): try: return self.json_db['data'][node]['tor']['streams'] diff --git a/onionperf/filtering.py b/onionperf/filtering.py index 9e7b34f..1b614d6 100644 --- a/onionperf/filtering.py +++ b/onionperf/filtering.py @@ -38,41 +38,11 @@ class Filtering(object): if self.fingerprints_to_include is None and self.fingerprints_to_exclude is None: return for source in self.analysis.get_nodes(): - tor_streams_by_source_port = {} - tor_streams = self.analysis.get_tor_streams(source) - for tor_stream in tor_streams.values(): - if "source" in tor_stream and ":" in tor_stream["source"]: - source_port = tor_stream["source"].split(":")[1] - tor_streams_by_source_port.setdefault(source_port, []).append(tor_stream) tor_circuits = self.analysis.get_tor_circuits(source) - tgen_streams = self.analysis.get_tgen_streams(source) - tgen_transfers = self.analysis.get_tgen_transfers(source) - retained_tgen_streams = {} - retained_tgen_transfers = {} - while tgen_streams or tgen_transfers: - stream_id = None - transfer_id = None - source_port = None - unix_ts_end = None + filtered_circuit_ids = [] + for circuit_id, tor_circuit in tor_circuits.items(): keep = False - if tgen_streams: - stream_id, stream_data = tgen_streams.popitem() - if "local" in stream_data["transport_info"] and len(stream_data["transport_info"]["local"].split(":")) > 2: - source_port = stream_data["transport_info"]["local"].split(":")[2] - if "unix_ts_end" in stream_data: - unix_ts_end = stream_data["unix_ts_end"] - elif tgen_transfers: - transfer_id, transfer_data = tgen_transfers.popitem() - if "endpoint_local" in transfer_data and len(transfer_data["endpoint_local"].split(":")) > 2: - source_port = transfer_data["endpoint_local"].split(":")[2] - if "unix_ts_end" in transfer_data: - unix_ts_end = transfer_data["unix_ts_end"] - if source_port and unix_ts_end: - for tor_stream in tor_streams_by_source_port[source_port]: - if abs(unix_ts_end - tor_stream["unix_ts_end"]) < 150.0: - circuit_id = tor_stream["circuit_id"] - if circuit_id and str(circuit_id) in tor_circuits: - tor_circuit = tor_circuits[circuit_id] + if "path" in tor_circuit: path = tor_circuit["path"] keep = True for long_name, _ in path: @@ -85,12 +55,9 @@ class Filtering(object): if self.fingerprints_to_exclude is not None and fingerprint in self.fingerprints_to_exclude: keep = False break - if keep: - if stream_id: - retained_tgen_streams[stream_id] = stream_data - if transfer_id: - retained_tgen_transfers[transfer_id] = transfer_data - self.analysis.set_tgen_streams(source, retained_tgen_streams) - self.analysis.set_tgen_transfers(source, retained_tgen_transfers) - self.analysis.save(filename=output_file, output_prefix=output_dir) + if not keep: + filtered_circuit_ids.append(circuit_id) + for circuit_id in filtered_circuit_ids: + del(tor_circuits[circuit_id]) + self.analysis.save(filename=output_file, output_prefix=output_dir, sort_keys=False) diff --git a/onionperf/onionperf b/onionperf/onionperf index e3f49c8..1efa8cb 100755 --- a/onionperf/onionperf +++ b/onionperf/onionperf @@ -79,8 +79,13 @@ DESC_FILTER = """ Takes an OnionPerf analysis results file or directory as input, applies filters, and produces new OnionPerf analysis results file(s) as output. -This subcommand only filters measurements in `data/[source]/tgen/transfers` -and `data/[source]/tgen/streams`, but leaves any summaries unchanged. +The `filter` subcommand is typically used in combination with the `visualize` +subcommand. The work flow is to filter out any TGen transfers/streams or Tor +streams/circuits that are not supposed to be visualized and then visualize only +those measurements with an existing mapping between TGen transfers/streams and +Tor streams/circuits. + +This subcommand only filters individual objects and leaves summaries unchanged. """ HELP_FILTER = """ Filter OnionPerf analysis results @@ -304,15 +309,15 @@ files generated by this script will be written""", action="store", dest="input") filter_parser.add_argument('--include-fingerprints', - help="""include only measurements with known circuit path and with all + help="""include only Tor circuits with known circuit path and with all relays being contained in the fingerprints file located at PATH""", metavar="PATH", action="store", dest="include_fingerprints", default=None) filter_parser.add_argument('--exclude-fingerprints', - help="""exclude measurements without known circuit path or with any - relays being contained in the fingerprints file located at + help="""exclude Tor circuits without known circuit path or with any + relay being contained in the fingerprints file located at PATH""", metavar="PATH", action="store", dest="exclude_fingerprints", default=None) @@ -337,6 +342,13 @@ files generated by this script will be written""", required="True", action=PathStringArgsAction, dest="datasets") + visualize_parser.add_argument('--outer-join', + help="""Include measurements without an existing mapping between TGen + transfers/streams and Tor streams/circuits, which is the + equivalent of an outer join in the database sense""", + action="store_true", dest="outer_join", + default=False) + visualize_parser.add_argument('-p', '--prefix', help="a STRING filename prefix for graphs we generate", metavar="STRING", type=str, @@ -477,7 +489,7 @@ def visualize(args): if analysis is not None: analyses.append(analysis) tgen_viz.add_dataset(analyses, label) - tgen_viz.plot_all(args.prefix) + tgen_viz.plot_all(args.prefix, outer_join=args.outer_join) def type_nonnegative_integer(value): i = int(value) diff --git a/onionperf/visualization.py b/onionperf/visualization.py index 660f52e..0f69879 100644 --- a/onionperf/visualization.py +++ b/onionperf/visualization.py @@ -31,11 +31,11 @@ class Visualization(object, metaclass=ABCMeta): class TGenVisualization(Visualization): - def plot_all(self, output_prefix): + def plot_all(self, output_prefix, outer_join=False): if len(self.datasets) > 0: prefix = output_prefix + '.' if output_prefix is not None else '' ts = time.strftime("%Y-%m-%d_%H:%M:%S") - self.__extract_data_frame() + self.__extract_data_frame(outer_join) self.data.to_csv("{0}onionperf.viz.{1}.csv".format(prefix, ts)) sns.set_context("paper") self.page = PdfPages("{0}onionperf.viz.{1}.pdf".format(prefix, ts)) @@ -51,7 +51,7 @@ class TGenVisualization(Visualization): self.__plot_errors_time() self.page.close() - def __extract_data_frame(self): + def __extract_data_frame(self, outer_join=False): streams = [] for (analyses, label) in self.datasets: for analysis in analyses: @@ -62,6 +62,7 @@ class TGenVisualization(Visualization): if "source" in tor_stream and ":" in tor_stream["source"]: source_port = tor_stream["source"].split(":")[1] tor_streams_by_source_port.setdefault(source_port, []).append(tor_stream) + tor_circuits = analysis.get_tor_circuits(client) tgen_streams = analysis.get_tgen_streams(client) tgen_transfers = analysis.get_tgen_transfers(client) while tgen_streams or tgen_transfers: @@ -122,20 +123,30 @@ class TGenVisualization(Visualization): unix_ts_end = transfer_data["unix_ts_end"] if "unix_ts_start" in transfer_data: stream["start"] = datetime.datetime.utcfromtimestamp(transfer_data["unix_ts_start"]) + tor_stream = None + tor_circuit = None + if source_port and unix_ts_end: + for s in tor_streams_by_source_port[source_port]: + if abs(unix_ts_end - s["unix_ts_end"]) < 150.0: + tor_stream = s + break + if tor_stream and "circuit_id" in tor_stream: + circuit_id = tor_stream["circuit_id"] + if str(circuit_id) in tor_circuits: + tor_circuit = tor_circuits[circuit_id] if error_code: if error_code == "PROXY": error_code_parts = ["TOR"] else: error_code_parts = ["TGEN", error_code] - if source_port and unix_ts_end: - for tor_stream in tor_streams_by_source_port[source_port]: - if abs(unix_ts_end - tor_stream["unix_ts_end"]) < 150.0: - if "failure_reason_local" in tor_stream: - error_code_parts.append(tor_stream["failure_reason_local"]) - if "failure_reason_remote" in tor_stream: - error_code_parts.append(tor_stream["failure_reason_remote"]) + if tor_stream: + if "failure_reason_local" in tor_stream: + error_code_parts.append(tor_stream["failure_reason_local"]) + if "failure_reason_remote" in tor_stream: + error_code_parts.append(tor_stream["failure_reason_remote"]) stream["error_code"] = "/".join(error_code_parts) - streams.append(stream) + if tor_circuit or outer_join: + streams.append(stream) self.data = pd.DataFrame.from_records(streams, index="id") def __plot_firstbyte_ecdf(self):

1 0

[onionperf/develop] Update README and CHANGELOG
by karsten＠torproject.org 16 Sep '20

16 Sep '20

commit 1b638e34cb0476148dcf93b43b58b54a30c27428 Author: Ana Custura <ana(a)netstat.org.uk> Date: Thu Sep 10 14:46:10 2020 +0100 Update README and CHANGELOG --- CHANGELOG.md | 5 +++++ README.md | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ebd43e1..a7d5005 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ - Add a new `onionperf filter` mode that takes an OnionPerf analysis results file or directory as input, applies filters, and produces new OnionPerf analysis results file(s) as output. + - Bump the analysis version number to 4.0 for new analyses and analyses + produced by the `onionperf filter` mode + - Analyses produced by the `onionperf filter` mode have additional filter + metadata defined in a new 'filters' field, and an optional 'filtered\_out' + field per tor circuit # Changes in version 0.6 - 2020-08-08 diff --git a/README.md b/README.md index 224972c..13a9eee 100644 --- a/README.md +++ b/README.md @@ -254,10 +254,12 @@ onionperf analyze --help ``` ### Filtering measurement results -OnionPerf measurement results can be filtered based on Tor relay fingerprints. -The `filter` mode takes a list of fingerprints and one or more existing analysis files as inputs, and outputs new analysis files containing only the `tgen` results obtained over a Tor circuit path which includes or excludes fingerprints in the input list. +The `filter` subcommand is typically used in combination with the `visualize` subcommand. The workflow is to filter out any Tor streams/circuits that are not desired then visualize only those measurements with an existing mapping between TGen transfers/streams and Tor streams/circuits. -Where excluding fingerprints, if ANY relay fingerprint is matched, the measurement is discarded. Where including fingerprints, ALL relay fingerprints in a path must match for the measurement to be retained. +Currently, OnionPerf measurement results can be filtered based on Tor relay fingerprints, although support for filtering TGen based on transfers/streams may be added in the future. + +The `filter` mode takes a list of fingerprints and one or more existing analysis files as inputs, and outputs new analysis files which include, unchanged, the Tor results obtained over a Tor circuit path which includes or excludes fingerprints in the input list. All other Tor results are also included in the file, but are marked as 'filtered\_out'. +Filter metadata detailing the filter type and path to the input list used is also included in the analysis file. For example, the analysis file produced above can be filtered with the following command, which retains measurements based on fingerprints contained in the file 'fingerprints.txt': @@ -290,6 +292,8 @@ As a result, two files are written to the current working directory: - `onionperf.viz.$datetime.csv` contains visualized data in a CSV file format; and - `onionperf.viz.$datetime.pdf` contains visualizations in a PDF file format. +For analysis files containing tor circuit filters, only measurements with an existing mapping between TGen transfers/streams Tor streams/circuits which have not been marked as 'filtered\_out' are visualized. + Similar to the other modes, OnionPerf's `visualize` mode has command-line parameters for customizing the visualization step: ```shell

1 0

[onionperf/develop] Attempt to clean up CHANGELOG.md and README.md.
by karsten＠torproject.org 16 Sep '20

16 Sep '20

commit f063b636fd26a938a52508424d7abe62cd45ccf0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Sep 16 12:26:56 2020 +0200 Attempt to clean up CHANGELOG.md and README.md. --- CHANGELOG.md | 12 +++++------- README.md | 14 +++++--------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7d5005..13fb202 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,11 @@ -# Changes in version 0.7 - 2020-??-?? +# Changes in version 0.8 - 2020-09-16 - Add a new `onionperf filter` mode that takes an OnionPerf analysis results file or directory as input, applies filters, and produces - new OnionPerf analysis results file(s) as output. - - Bump the analysis version number to 4.0 for new analyses and analyses - produced by the `onionperf filter` mode - - Analyses produced by the `onionperf filter` mode have additional filter - metadata defined in a new 'filters' field, and an optional 'filtered\_out' - field per tor circuit + new OnionPerf analysis results file(s) as output. Bump the analysis + version number to 4.0 to include additional filter metadata defined + in a 'filters' field and an optional 'filtered\_out' field per Tor + circuit. Implements #33260. # Changes in version 0.6 - 2020-08-08 diff --git a/README.md b/README.md index 13a9eee..6e7684f 100644 --- a/README.md +++ b/README.md @@ -252,31 +252,27 @@ OnionPerf's `analyze` mode has several command-line parameters for customizing t ```shell onionperf analyze --help ``` + ### Filtering measurement results -The `filter` subcommand is typically used in combination with the `visualize` subcommand. The workflow is to filter out any Tor streams/circuits that are not desired then visualize only those measurements with an existing mapping between TGen transfers/streams and Tor streams/circuits. +The `filter` subcommand can be used to filter out measurement results based on given criteria. This subcommand is typically used in combination with the `visualize` subcommand. The workflow is to apply one or more filters and then visualize only those measurements with an existing mapping between TGen transfers/streams and Tor streams/circuits. -Currently, OnionPerf measurement results can be filtered based on Tor relay fingerprints, although support for filtering TGen based on transfers/streams may be added in the future. +Currently, OnionPerf measurement results can be filtered based on Tor relay fingerprints found in Tor circuits, although support for filtering based on Tor streams and/or TGen transfers/streams may be added in the future. -The `filter` mode takes a list of fingerprints and one or more existing analysis files as inputs, and outputs new analysis files which include, unchanged, the Tor results obtained over a Tor circuit path which includes or excludes fingerprints in the input list. All other Tor results are also included in the file, but are marked as 'filtered\_out'. -Filter metadata detailing the filter type and path to the input list used is also included in the analysis file. +The `filter` mode takes a list of fingerprints and one or more existing analysis files as inputs and outputs new analysis files with the same contents as the input analysis files plus annotations on those Tor circuits that have been filtered out. If a directory of analysis files is given to '-i', the structure and filenames of that directory are preserved under the path specified with '-o'. -For example, the analysis file produced above can be filtered with the following command, which retains measurements based on fingerprints contained in the file 'fingerprints.txt': +For example, the analysis file produced above can be filtered with the following command, which retains only those Tor circuits with fingerprints contained in the file 'fingerprints.txt': ```shell onionperf filter -i onionperf.analysis.json.xz -o filtered.onionperf.analysis.json.xz --include-fingerprints fingerprints.txt ``` -The output analysis file is written to the path specified with `-o`. If processing a directory of analysis files, its structure and filenames are preserved under the path specified with '-o'. -Note that while the subcommand filters `tgen` measurements, it leaves `tgen` and `tor` summaries in the original analysis file unchanged. - OnionPerf's `filter` command usage can be inspected with: ```shell onionperf filter --help ``` - ### Visualizing measurement results Step two in the analysis is to process analysis files with OnionPerf's `visualize` mode which produces CSV and PDF files as output.

1 0

[onionperf/develop] Merge branch 'acute-task-33260-4' into develop
by karsten＠torproject.org 16 Sep '20

16 Sep '20

commit 76517ac669f3e7575965662507ab970b41395324 Merge: c8275b2 f063b63 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Sep 16 12:28:19 2020 +0200 Merge branch 'acute-task-33260-4' into develop CHANGELOG.md | 9 + README.md | 23 ++ onionperf/analysis.py | 18 +- onionperf/filtering.py | 75 ++++++ onionperf/onionperf | 73 ++++++ onionperf/visualization.py | 31 ++- schema/onionperf-4.0.json | 577 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 793 insertions(+), 13 deletions(-) diff --cc CHANGELOG.md index 80fb14d,13fb202..2c1f5ca --- a/CHANGELOG.md +++ b/CHANGELOG.md @@@ -1,13 -1,12 +1,22 @@@ + # Changes in version 0.8 - 2020-09-16 + + - Add a new `onionperf filter` mode that takes an OnionPerf analysis + results file or directory as input, applies filters, and produces + new OnionPerf analysis results file(s) as output. Bump the analysis + version number to 4.0 to include additional filter metadata defined + in a 'filters' field and an optional 'filtered\_out' field per Tor + circuit. Implements #33260. + +# 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 + 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 + configure the generated TGen model. Implemets #33432. + # Changes in version 0.6 - 2020-08-08 - Update to TGen 1.0.0, use TGenTools for parsing TGen log files, and

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 16 Sep '20

16 Sep '20

commit f2a41ad166b3226b25170f33455df21492fef2cb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 16 15:15:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- is/LC_MESSAGES/bridgedb.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/is/LC_MESSAGES/bridgedb.po b/is/LC_MESSAGES/bridgedb.po index 2603da1dba..ddcdd6be03 100644 --- a/is/LC_MESSAGES/bridgedb.po +++ b/is/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-09-16 12:08+0000\n" +"PO-Revision-Date: 2020-09-16 15:11+0000\n" "Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>\n" "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n" "MIME-Version: 1.0\n" @@ -288,7 +288,7 @@ msgid "" "the pseudo-mechanism \"None\". The following list briefly explains how these\n" "mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n" "mechanisms is." -msgstr "BridgeDB er með fjórar aðferðir til að dreifa brúm: \"HTTPS\", \"Moat\",\n\"Tölvupóstur\" og \"Frátekið\". Brýr sem ekki er dreift með BridgeDB nota\ngervi-aðferðina \"Ekkert\". Eftirfarandi listi skýrir í stuttu máli hvernig þessar\naðferðir virka auk þess sem %sBridgeDB mælingar%s okkar sýna hve vinsæl\nhver aðferð er." +msgstr "BridgeDB er með fjórar aðferðir til að dreifa brúm: \"HTTPS\", \"Síki (Moat)\",\n\"Tölvupóstur (Email)\" og \"Frátekið (Reserved)\". Brýr sem ekki er dreift með BridgeDB nota\ngervi-aðferðina \"Ekkert (None)\". Eftirfarandi listi skýrir í stuttu máli hvernig þessar\naðferðir virka auk þess sem %sBridgeDB mælingar%s okkar sýna hve vinsæl\nhver aðferð er." #: bridgedb/strings.py:115 #, python-format @@ -296,7 +296,7 @@ msgid "" "The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n" "bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n" "solve the subsequent CAPTCHA." -msgstr "" +msgstr "\"HTTPS\" dreifingaraðferðin afhendir brýr í genum þetta vefsvæði. Til að fá\nbrýr skaltu fara á %sbridges.torproject.org%s, veldu þá kosti sem þér henta, og\nleystu síðan CAPTCHA-mennskuprófið sem á eftir fylgir." #: bridgedb/strings.py:119 #, python-format @@ -306,7 +306,7 @@ msgid "" "your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n" "subsequent CAPTCHA, and Tor Browser will automatically add your new\n" "bridges." -msgstr "" +msgstr "\"Síki (Moat)\" dreifingaraðferðin er hluti af Tor-vafranum og gerir notendum kleift\nað biðja um brýr innan úr stillingum Tor-vafrans. Til að ná í brýr skaltu fara í\n%sStillingar Tor%s, smella á \"biðja um nýja brú\", leysa CAPTCHA-mennskuprófið\nsem á eftir fylgir, og þá mun Tor-vafrinn sjálfvirkt bæta inn nýju brúnum þínum." #: bridgedb/strings.py:125 #, python-format @@ -314,7 +314,7 @@ msgid "" "Users can request bridges from the \"Email\" distribution mechanism by sending an\n" "email to %sbridges(a)torproject.org%s and writing \"get transport obfs4\" in the\n" "email body." -msgstr "" +msgstr "Notendur geta beðið um brýr með \"Tölvupóstur\" dreifingaraðferðinni með því að senda\ntölvupóst á %sbridges(a)torproject.org%s og skrifa \"get transport obfs4\" í meginmál\nskilaboðanna." #: bridgedb/strings.py:129 msgid "Reserved" @@ -377,7 +377,7 @@ msgid "" " Manual explains how you can add your bridges to Tor Browser. If you are\n" " using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n" " are using Android, %sclick here%s." -msgstr "" +msgstr " Fyrst þarftu að %ssækja Tor-vafrann%s. Notendahandbók Tor-vafrans\n útskýrir hvernig þú getur bætt brúnum þínum við Tor-vafrann. Ef þú ert að\n nota Windows, Linux eða OS X, %ssmelltu hér%s til að kanna þetta nánar.\n Ef þú ert að nota Android, skaltu %sýta hér%s." #: bridgedb/strings.py:166 msgid ""

1 0

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 16 Sep '20

16 Sep '20

commit e925890cf4caa77f7ed8b55f0da9c34d6cf8ec70 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 16 14:15:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- is/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is/aboutTor.dtd b/is/aboutTor.dtd index bfbdc962f7..435becb678 100644 --- a/is/aboutTor.dtd +++ b/is/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "Styrkja núna">  -<!ENTITY aboutTor.ey2020.useamask "Notaðu grímu, fáðu þér Tor."> +<!ENTITY aboutTor.ey2020.useamask "Fáðu þér grímu - notaðu Tor."> <!ENTITY aboutTor.ey2020.resistsurveillance "Verðu þig fyrir eftirlitsfaraldrinum.">

1 0

[translation/whisperback] https://gitweb.torproject.org/translation.git/commit/?h=whisperback
by translation＠torproject.org 16 Sep '20

16 Sep '20

commit a13a0bb79c679028b8efa03a1c8ee6837c4b33d4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 16 13:18:31 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=whisperback --- sq/sq.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sq/sq.po b/sq/sq.po index 06b70411a9..fb7d4675e0 100644 --- a/sq/sq.po +++ b/sq/sq.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-29 12:08+0200\n" -"PO-Revision-Date: 2020-09-16 08:31+0000\n" +"PO-Revision-Date: 2020-09-16 12:48+0000\n" "Last-Translator: Besnik Bleta <besnik(a)programeshqip.org>\n" "Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/sq/)\n" "MIME-Version: 1.0\n" @@ -145,7 +145,7 @@ msgstr "" #: ../whisperBack/gui.py:377 msgid "This doesn't seem to be a valid URL or OpenPGP key." -msgstr "Kjo s'duket të jetë një URL ose çelës OpenPGP i vlefshëm." +msgstr "Kjo s’duket të jetë një URL ose kyç OpenPGP i vlefshëm." #: ../data/whisperback.ui.h:1 msgid "Copyright © 2009-2018 tails(a)boum.org"

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 16 Sep '20

16 Sep '20

commit 2f847172551303a6b1c5c9ad228f63e8fa86cb48 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 16 13:18:17 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- sq/network-settings.dtd | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sq/network-settings.dtd b/sq/network-settings.dtd index 1250a78fff..5fe283cb57 100644 --- a/sq/network-settings.dtd +++ b/sq/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Konfigurimi i Rrjetit të Tor"> +<!ENTITY torsettings.dialog.title "Rregullime Rrjeti Tor"> <!ENTITY torsettings.wizard.title.default "Connect to Tor"> <!ENTITY torsettings.wizard.title.configure "Konfigurimi i Rrjetit të Tor"> <!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> @@ -16,29 +16,29 @@  -<!ENTITY torsettings.startingTor "Duke pritur që Tor të nisë..."> +<!ENTITY torsettings.startingTor "Po pritet që të niset Tor-i…"> <!ENTITY torsettings.restartTor "Riniseni Tor-in"> <!ENTITY torsettings.reconfigTor "Rikonfiguroni"> <!ENTITY torsettings.discardSettings.prompt "Ju keni konfiguruar urat Tor ose keni futur konfigurimin e proxy-t.  Për të bërë një lidhje të drejtpërdrejtë tek rrjeti Tor, ky konfigurim duhet të hiqet."> <!ENTITY torsettings.discardSettings.proceed "Hiqeni Konfigurimin dhe Lidhuni"> -<!ENTITY torsettings.optional "Me zgjedhje"> +<!ENTITY torsettings.optional "Opsional"> -<!ENTITY torsettings.useProxy.checkbox "Unë përdor një proxy për tu lidhur në Internet"> +<!ENTITY torsettings.useProxy.checkbox "Për t’u lidhur në Internet, unë përdor një ndërmjetës"> <!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> <!ENTITY torsettings.useProxy.address "Adresë"> -<!ENTITY torsettings.useProxy.address.placeholder "Adresa IP ose emri i pritësit"> +<!ENTITY torsettings.useProxy.address.placeholder "Adresë IP ose emër strehë"> <!ENTITY torsettings.useProxy.port "Portë"> <!ENTITY torsettings.useProxy.username "Emër përdoruesi"> <!ENTITY torsettings.useProxy.password "Fjalëkalim"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "Ky kompjuter kalon përmes një muri mbrojtës, që i lejon lidhje vetëm me disa porta."> -<!ENTITY torsettings.firewall.allowedPorts "Portat e Lejuara"> -<!ENTITY torsettings.useBridges.checkbox "TOR është i çensuruar në vëndin tim"> +<!ENTITY torsettings.firewall.checkbox "Ky kompjuter kalon përmes një firewall-i, i cili lejon lidhje vetëm me disa porta."> +<!ENTITY torsettings.firewall.allowedPorts "Porta të Lejuara"> +<!ENTITY torsettings.useBridges.checkbox "TOR censurohet në vendin tim"> <!ENTITY torsettings.useBridges.default "Zgjidh një urë të paracaktuar"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> <!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> @@ -46,15 +46,15 @@ <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> <!ENTITY torsettings.useBridges.captchaSubmit "Parashtroni"> <!ENTITY torsettings.useBridges.custom "Mundëso një urë lidhëse që njoh"> -<!ENTITY torsettings.useBridges.label "Vendos informacion për urën nga një burim i besuar."> -<!ENTITY torsettings.useBridges.placeholder "shkruaj adresën:portën (një për rresht)"> +<!ENTITY torsettings.useBridges.label "Jepni të dhëna ure prej një burimi të besuar."> +<!ENTITY torsettings.useBridges.placeholder "shtypni adresë:portë (një për rresht)"> -<!ENTITY torsettings.copyLog "Kopjojeni Regjistrin e Tor në Kujtesën e fragmenteve"> +<!ENTITY torsettings.copyLog "Kopjo Regjistër Tor në Të papastër"> <!ENTITY torsettings.proxyHelpTitle "Proxy Help"> <!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> -<!ENTITY torsettings.bridgeHelpTitle "Ndihma mbi Relenë e Urë"> +<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> <!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">

1 0