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

[onionperf/develop] Merge branch 'phw-enhancement-33432-3' into develop
by karsten＠torproject.org 27 Aug '20

27 Aug '20

commit c707674ba9b0d7931038c12bbe2d01585a88eb22 Merge: dfec0b8 b8f1e5c Author: Karsten Loesing <karsten.loesing(a)gmx.net> 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/… [View More]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=58888, 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', + help="""Use and drop guards every N > 0 hours, or do not use guards at all if N = 0""", + metavar="N", type=type_nonnegative_integer, + action="store", dest="drop_guards_interval_hours", + default=0) + onion_or_inet_only_group = measure_parser.add_mutually_exclusive_group() onion_or_inet_only_group.add_argument('-o', '--onion-only', [View Less]

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 27 Aug '20

27 Aug '20

commit 0b53764906a1166e70f24efad039e45689c222cf Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 27 06:17:53 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es-AR.po | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contents+es-AR.po b/contents+es-AR.po index 7905287a52..6b4566c661 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -8158,6 +8158,9 @@ msgid "" "guide](https://community.torproject.… [View More]

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 27 Aug '20

27 Aug '20

commit 4fd3798b1ab42628a58251d458cacb2b7cf57d88 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 27 05:17:52 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es-AR.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contents+es-AR.po b/contents+es-AR.po index b09c93ab4b..7905287a52 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -8097,6 +8097,8 @@ msgid "" "* As root, add the … [View More]

1 0

[nyx/master] Replace all trac links
by atagar＠torproject.org 27 Aug '20

27 Aug '20

commit 46d8dbedf5a80da321eef66f83b90929b857e581 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Aug 26 17:06:08 2020 -0700 Replace all trac links Trac is read-only and will be discontinued at some point. Moving our links to GitLab. --- nyx/log.py | 4 +++- web/changelog/index.html | 38 ++++++++++++++++---------------- web/changelog/legacy.html | 56 +++++++++++++++++++++++------------------------ web/index.html | 14 +++--------- … [View More]

1 0

[nyx/master] Drop OnionView from list of other UIs
by atagar＠torproject.org 27 Aug '20

27 Aug '20

commit afacdd8979003776ec088e9fb3d789ea7e03d363 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Aug 26 14:07:58 2020 -0700 Drop OnionView from list of other UIs OnionView's link is now a 404. Caught thanks to Julian. --- web/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/web/index.html b/web/index.html index 84632ef..4f8ce33 100644 --- a/web/index.html +++ b/web/index.html @@ -169,7 +169,6 @@ <li><a href="https://gitorious.… [View More]

1 0

[tpo/master] Deprecate old Tor Browser version
by sysrqb＠torproject.org 26 Aug '20

26 Aug '20

commit 781630f27d6deb6b20f6d0ec6b8a3dd78f58fc45 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Aug 26 23:37:18 2020 +0000 Deprecate old Tor Browser version 9.5, 9.5.1, 10.0a1, 10.0a2, 10.0a4) --- .../torbrowser/RecommendedTBBVersions/contents.lr | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index a7f2b73d.… [View More]

1 0

[tpo/master] Add new Tor Browser version 10.0a6
by sysrqb＠torproject.org 26 Aug '20

26 Aug '20

commit bc9906a2328b25cba4acdf0f789fbd06d5f40ac8 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Aug 26 23:34:49 2020 +0000 Add new Tor Browser version 10.0a6 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 6 +++++- databags/versions.ini | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/… [View More]

1 0

[tpo/master] Add new Tor Browser version 9.5.4 (Android)
by sysrqb＠torproject.org 26 Aug '20

26 Aug '20

commit 099a4f3328503b1afe41d344e4bd1bb2e2ea4d7a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Aug 26 23:34:18 2020 +0000 Add new Tor Browser version 9.5.4 (Android) --- databags/versions.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini index 110594a5..9bd371a5 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -3,7 +3,7 @@ version = 9.5.4 win32 = 0.4.3.6 [torbrowser-android-stable] … [View More]

1 0

[tor/master] ci: Add tracing build to Gitlab CI
by ahf＠torproject.org 26 Aug '20

26 Aug '20

commit 20a990cea3be353357723fa03b824dc9cfc6dd8c Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Aug 25 10:04:25 2020 -0400 ci: Add tracing build to Gitlab CI Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- .gitlab-ci.yml | 12 ++++++++++++ changes/ticket40038 | 3 +++ scripts/ci/ci-driver.sh | 5 +++++ 3 files changed, 20 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 176c71f8f0..48bcf6b000 100644 --- a/.gitlab-… [View More]ci.yml +++ b/.gitlab-ci.yml @@ -92,6 +92,7 @@ variables: - if [ "$STEM" = yes ]; then git clone --depth 1 https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi # TODO: This next line should not be debian-only. - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 https://git.torproject.org/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi + - if [ "$TRACING" = yes ]; then apt install liblttng-ust-dev; fi # Minmal check on debian: just make, make check. # @@ -155,3 +156,14 @@ debian-integration: STEM: "yes" script: - ./scripts/ci/ci-driver.sh + +##### +# Tracing build on Debian stable. +debian-tracing: + image: debian:stable + <<: *debian-template + variables: + TRACING: "yes" + CHECK: "no" + script: + - ./scripts/ci/ci-driver.sh diff --git a/changes/ticket40038 b/changes/ticket40038 new file mode 100644 index 0000000000..df648f7a7a --- /dev/null +++ b/changes/ticket40038 @@ -0,0 +1,3 @@ + o Testing (CI): + - Build tracing configure option into our CI. Closes ticket 40038. + diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index 527bba82e5..cd91a91bbf 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -33,6 +33,7 @@ COVERAGE="${COVERAGE:-no}" RUST="${RUST:-no}" DOXYGEN="${DOXYGEN:-no}" ASCIIDOC="${ASCIIDOC:-no}" +TRACING="${TRACING:-no}" # Options for which tests to run. All should be yes/no. CHECK="${CHECK:-yes}" @@ -191,6 +192,7 @@ yes_or_no COVERAGE yes_or_no RUST yes_or_no DOXYGEN yes_or_no ASCIIDOC +yes_or_no TRACING yes_or_no RUN_STAGE_CONFIGURE yes_or_no RUN_STAGE_BUILD @@ -241,6 +243,9 @@ fi if [[ "$ASCIIDOC" != "yes" ]]; then configure_options+=("--disable-asciidoc") fi +if [[ "$TRACING" == "yes" ]]; then + configure_options+=("--enable-tracing-instrumentation-lttng") +fi ############################################################################# # Tell the user about our versions of different tools and packages. [View Less]

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/136'
by ahf＠torproject.org 26 Aug '20

26 Aug '20

commit 3c884bc9e077e997b5fffebc1d62bd690fc0cc05 Merge: 511730db2d 20a990cea3 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Aug 26 22:15:04 2020 +0000 Merge remote-tracking branch 'tor-gitlab/mr/136' .gitlab-ci.yml | 12 ++++++++++++ changes/ticket40038 | 3 +++ scripts/ci/ci-driver.sh | 5 +++++ 3 files changed, 20 insertions(+)

1 0