February 2019 - tor-commits - lists.torproject.org

[tpo/master] Update Tor Browser versions
by hiro＠torproject.org 19 Feb '19

19 Feb '19

commit 62f7063841f631219e19da2b475635a0a05a83c2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 12 12:20:46 2019 +0100 Update Tor Browser versions --- databags/versions.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/databags/versions.ini b/databags/versions.ini index 5072ae5..005de2b 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -1,11 +1,11 @@ [torbrowser-stable] -version = 8.0.4 -release_date = 2018-11-17 -win32 = 0.3.4.9 +version = 8.0.5 +release_date = 2019-01-29 +win32 = 0.3.5.7 [torbrowser-alpha] -version = 8.5a6 -release_date = 2018-12-11 +version = 8.5a7 +release_date = 2019-01-30 [torbrowser-develop-branch] version = maint-8.0

1 0

[tpo/master] Update torbrowser-develop-branch
by hiro＠torproject.org 19 Feb '19

19 Feb '19

commit 76f846871ae30c81ca30a5d057759273a22a394f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 12 12:19:06 2019 +0100 Update torbrowser-develop-branch --- databags/versions.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini index 9698353..5072ae5 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -8,7 +8,7 @@ version = 8.5a6 release_date = 2018-12-11 [torbrowser-develop-branch] -version = maint-7.5 +version = maint-8.0 [tor-stable] version = 0.3.5.7

1 0

[tpo/master] correct qbi nickname
by hiro＠torproject.org 19 Feb '19

19 Feb '19

commit ed477496f80b64cbf6473dfb19467b239eeb4a92 Author: emma peel <emma.peel(a)riseup.net> Date: Tue Feb 12 12:55:31 2019 +0100 correct qbi nickname --- content/about/people/qbi/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/people/qbi/contents.lr b/content/about/people/qbi/contents.lr index 23662ea..327ac85 100644 --- a/content/about/people/qbi/contents.lr +++ b/content/about/people/qbi/contents.lr @@ -4,7 +4,7 @@ role: core --- name: Jens Kubieziel --- -nickname: redshiftzero +nickname: qbi --- twitter_handle: qbi ---

1 0

[tpo/staging] String concatenation for localization
by hiro＠torproject.org 19 Feb '19

19 Feb '19

commit 2ee2e938991d53941c1b01779c249f9ad5a0cd77 Author: hiro <hiro(a)torproject.org> Date: Tue Feb 19 15:47:57 2019 +0100 String concatenation for localization --- templates/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/contact.html b/templates/contact.html index e4dcc18..d24eace 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -92,7 +92,7 @@ <div class="row"> <div class="col-md-8 p-0 pr-5"> <h3 class="text-primary display-5">{{ _('Email us') }}</h3> - <p class="text-tpo">{{ _('For questions and comments about Tor the non-profit organization: trademark questions, affiliation and coordination, contract inquiries, etc, please email <a href="">frontdesk(a)rt.torproject.org</a>. For donor-related questions, contact <a href="">giving(a)torproject.org</a>')|safe }}.</p> + <p class="text-tpo">{{ _('For questions and comments about Tor the non-profit organization: trademark questions, affiliation and coordination, contract inquiries, etc, please email') }}<a href="mailto:frontdesk@rt.torproject.org">frontdesk(a)rt.torproject.org</a>. {{ _('For donor-related questions, contact') }} <a href="mailto:giving@torproject.org">giving(a)torproject.org</a>.</p> </div> <div class="d-block d-sm-none container py-3"> <div class="row border-bottom border-light"><p></p></div>

1 0

[tor/master] Bump to 0.4.1.0-alpha-dev
by nickm＠torproject.org 19 Feb '19

19 Feb '19

commit 9a158a45b1fe9f36cf0d41c5d1dcec7be74f1719 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 09:29:43 2019 -0500 Bump to 0.4.1.0-alpha-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 7de3c3a46..6036cdffe 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.0.1-alpha-dev]) +AC_INIT([tor],[0.4.1.0-alpha-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2019-01-18"], # for 0.4.0.1-alpha +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-02-19"], # for 0.4.1.0-alpha-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 4f2f82d00..419b5aa58 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.0.1-alpha-dev" +!define VERSION "0.4.1.0-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index c618c5b49..892531ceb 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.0.1-alpha-dev" +#define VERSION "0.4.1.0-alpha-dev"

1 0

[webwml/master] Remove 8.5a7 from RecommendedTBBVersions
by boklm＠torproject.org 19 Feb '19

19 Feb '19

commit 80d143faeabfbefdca0f64707a248171cba1a5d8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 19 14:26:38 2019 +0100 Remove 8.5a7 from RecommendedTBBVersions --- projects/torbrowser/RecommendedTBBVersions | 4 ---- 1 file changed, 4 deletions(-) diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 11ff9a49..1c351a66 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,10 +3,6 @@ "8.0.6-MacOS", "8.0.6-Linux", "8.0.6-Windows", -"8.5a7", -"8.5a7-MacOS", -"8.5a7-Linux", -"8.5a7-Windows", "8.5a8", "8.5a8-MacOS", "8.5a8-Linux",

1 0

[onionperf/master] Adds v3 onion service support
by irl＠torproject.org 19 Feb '19

19 Feb '19

commit c8b0fc22809900ee35938ee7f89e853c923a5bb9 Author: Ana Custura <ana(a)nestat.org.uk> Date: Thu Feb 14 17:59:11 2019 +0100 Adds v3 onion service support --- onionperf/measurement.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/onionperf/measurement.py b/onionperf/measurement.py index 245cddb..cc76ce8 100644 --- a/onionperf/measurement.py +++ b/onionperf/measurement.py @@ -170,6 +170,7 @@ class Measurement(object): self.threads = None self.done_event = None self.hs_service_id = None + self.hs_v3_service_id = None self.www_docroot = "{0}/htdocs".format(self.datadir_path) 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, @@ -219,8 +220,9 @@ class Measurement(object): general_writables.append(tor_writable) server_urls = [] - if do_onion and self.hs_service_id is not None: + if do_onion and self.hs_service_id is not None and self.hs_v3_service_id is not None: server_urls.append("{0}.onion:{1}".format(self.hs_service_id, client_tgen_connect_port)) + server_urls.append("{0}.onion:{1}".format(self.hs_v3_service_id, client_tgen_connect_port)) if do_inet: connect_ip = client_tgen_connect_ip if client_tgen_connect_ip != '0.0.0.0' else util.get_ip_address() server_urls.append("{0}:{1}".format(connect_ip, client_tgen_connect_port)) @@ -264,6 +266,14 @@ class Measurement(object): torctl.remove_ephemeral_hidden_service(self.hs_service_id) except: pass # this fails to authenticate if tor proc is dead + if self.hs_v3_service_id is not None: + try: + with Controller.from_port(port=self.hs_v3_control_port) as torctl: + torctl.authenticate() + torctl.remove_ephemeral_hidden_service(self.hs_v3_service_id) + except: pass # this fails to authenticate if tor proc is dead + + # logging.disable(logging.INFO) self.done_event.set() for t in self.threads: @@ -364,7 +374,7 @@ WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nUseEntryGuards self.threads.append(torctl_helper) if hs_port_mapping is not None: - logging.info("Creating ephemeral hidden service...") + logging.info("Creating ephemeral hidden service with v2 onions...") with Controller.from_port(port=control_port) as torctl: torctl.authenticate() response = torctl.create_ephemeral_hidden_service(hs_port_mapping, detached=True, await_publication=True) @@ -372,6 +382,13 @@ WarnUnsafeSocks 0\nSafeLogging 0\nMaxCircuitDirtiness 60 seconds\nUseEntryGuards self.hs_control_port = control_port logging.info("Ephemeral hidden service is available at {0}.onion".format(response.service_id)) + logging.info("Creating ephemeral hidden service with v3 onions...") + with Controller.from_port(port=control_port) as torctl: + torctl.authenticate() + response = torctl.create_ephemeral_hidden_service(hs_port_mapping, detached=True, await_publication=True, key_content='ED25519-V3') + self.hs_v3_service_id = response.service_id + self.hs_v3_control_port = control_port + logging.info("Ephemeral hidden service is available at {0}.onion".format(response.service_id)) return tor_writable, torctl_writable def __get_download_count(self, tgen_logpath):

1 0

[onionperf/master] Disable test_utils.test_find_file_paths_pairs
by irl＠torproject.org 19 Feb '19

19 Feb '19

commit 3ad3dc950e5bc18e9af79da6e11cf37ae2e7f727 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Tue Feb 19 09:12:33 2019 +0000 Disable test_utils.test_find_file_paths_pairs This test fails currently because the output of the function test_find_file_paths_pairs is not deterministic. It seems to depend on some ordering that happens due to the filesystem. --- onionperf/tests/test_utils.py | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/onionperf/tests/test_utils.py b/onionperf/tests/test_utils.py index 0e7dfeb..940e0b6 100644 --- a/onionperf/tests/test_utils.py +++ b/onionperf/tests/test_utils.py @@ -55,20 +55,24 @@ def test_find_file_paths_with_dash(): paths = util.find_file_paths(DATA_DIR + "/-", pattern) assert_equals(paths, ['-']) -def test_find_file_paths_pairs(): - """ - Uses util.find_file_paths_pairs to find existing files in the test data - directory matching either of two given patterns. - it returns tuples consisting of a list containing matching file and an empty list. - The position of the empty lists is dependent on which pattern was matched. - If a file matches the first pattern, the second item in the tuple will be empty. - If a file matches the second pattern, the first item in the tuple will be empty. - """ - data_dir = "data" - first_pattern = ['.*tgen\.log'] - second_pattern = ['.*torctl\.log'] - paths = util.find_file_paths_pairs(data_dir, first_pattern, second_pattern) - assert_equals(paths, [([], ['data/logs/onionperf20190101.torctl.log']), ([], ['data/logs/onionperf.torctl.log']), (['data/logs/onionperf.tgen.log'], []), (['data/logs/onionperf20190101.tgen.log'], [])]) +#def test_find_file_paths_pairs(): +# """ +# Uses util.find_file_paths_pairs to find existing files in the test data +# directory matching either of two given patterns. +# it returns tuples consisting of a list containing matching file and an empty list. +# The position of the empty lists is dependent on which pattern was matched. +# If a file matches the first pattern, the second item in the tuple will be empty. +# If a file matches the second pattern, the first item in the tuple will be empty. +# """ +# first_pattern = ['.*tgen\.log'] +# second_pattern = ['.*torctl\.log'] +# paths = util.find_file_paths_pairs(DATA_DIR, first_pattern, second_pattern) +# assert_equals(paths, [ +# ([], [absolute_data_path("logs/onionperf20190101.torctl.log")]), +# ([], [absolute_data_path("logs/onionperf.torctl.log")]), +# ([absolute_data_path("logs/onionperf.tgen.log")], []), +# ([absolute_data_path("logs/onionperf20190101.tgen.log")], []) +# ]) def test_find_path_with_binpath(): """

1 0

[onionperf/master] Use pkg_resources to locate test data
by irl＠torproject.org 19 Feb '19

19 Feb '19

commit 57fbea4dd675d8912998b5f58e6dcdc17992cf32 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Tue Feb 19 09:12:03 2019 +0000 Use pkg_resources to locate test data --- onionperf/tests/test_utils.py | 52 +++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/onionperf/tests/test_utils.py b/onionperf/tests/test_utils.py index 5024bb5..0e7dfeb 100644 --- a/onionperf/tests/test_utils.py +++ b/onionperf/tests/test_utils.py @@ -1,12 +1,25 @@ +import datetime +import hashlib import os -import sys +import pkg_resources import shutil +import sys import tempfile -import datetime -import hashlib -from onionperf import util + from nose.tools import assert_equals +from onionperf import util + +def absolute_data_path(relative_path=""): + """ + Returns an absolute path for test data given a relative path. + """ + return pkg_resources.resource_filename("onionperf", + "tests/data/" + + relative_path) + +DATA_DIR = absolute_data_path() + def test_make_dir(): """ Creates a temporary working directory, and then a directory within it. @@ -27,11 +40,10 @@ def test_find_file_paths(): Uses util.find_file_paths to find an existing file in the test data directory, given a pattern. The function returns the full path to the file. """ - data_dir = "data" pattern = ["abcdef"] - paths = util.find_file_paths(data_dir, pattern) + paths = util.find_file_paths(DATA_DIR, pattern) print(paths) - assert_equals(paths, ["data/dirs/abcdefg.txt"]) + assert_equals(paths, [absolute_data_path("dirs/abcdefg.txt")]) def test_find_file_paths_with_dash(): """ @@ -39,9 +51,8 @@ def test_find_file_paths_with_dash(): pattern. Ensures the path returned by the function defaults to stdin if there is a dash detected at the end of the given directory. """ - data_dir = "data" pattern = ["abcdef"] - paths = util.find_file_paths(data_dir + "/-", pattern) + paths = util.find_file_paths(DATA_DIR + "/-", pattern) assert_equals(paths, ['-']) def test_find_file_paths_pairs(): @@ -92,17 +103,17 @@ def test_is_exe(): Checks a non-executable file path is not accepted Checks a directory path is not accepted """ - assert(util.is_exe("data/bin/script")) - assert(not util.is_exe("data/bin/script_no_exe")) - assert(not util.is_exe("data/bin/")) + assert(util.is_exe(absolute_data_path("bin/script"))) + assert(not util.is_exe(absolute_data_path("bin/script_no_exe"))) + assert(not util.is_exe(absolute_data_path("bin/"))) def test_which(): """ Uses util.which with an executable file and a search path in the test data directory. Checks the full path of the file is identified. """ - test_binary = util.which("script", search_path="data/bin/") - assert_equals(test_binary, "data/bin/script") + test_binary = util.which("script", search_path=absolute_data_path("bin/")) + assert_equals(test_binary, absolute_data_path("bin/script")) def test_which_not_executable(): """ @@ -110,7 +121,8 @@ def test_which_not_executable(): in the test data directory. Checks the non-executable file is not identified as a program to run. """ - test_binary = util.which("script_non_exe", search_path="data/bin/") + test_binary = util.which( + "script_non_exe", search_path=absolute_data_path("bin/")) assert_equals(test_binary, None) def test_which_full_path(): @@ -119,8 +131,10 @@ def test_which_full_path(): search path. Checks the full path of the file is identified. """ - test_binary = util.which("data/bin/script", search_path="data/bin/") - assert_equals(test_binary, "data/bin/script") + test_binary = util.which( + absolute_data_path("bin/script"), + search_path=absolute_data_path("bin/")) + assert_equals(test_binary, absolute_data_path("bin/script")) def test_date_to_string(): @@ -200,7 +214,7 @@ def test_data_source_file(): for this object. DataSouce.source is verified against the contents of the input file. """ - test_data_source = util.DataSource("data/simplefile") + test_data_source = util.DataSource(absolute_data_path("simplefile")) test_data_source.open() data_source_file_handle = test_data_source.source data_source_contents = data_source_file_handle.read() @@ -215,7 +229,7 @@ def test_data_source_compressed_file(): Verifies DataSource.compress is set to True. DataSouce.source is verified against the contents of the input file. """ - test_data_source = util.DataSource("data/simplefile.xz") + test_data_source = util.DataSource(absolute_data_path("simplefile.xz")) test_data_source.open() data_source_file_handle = test_data_source.source data_source_contents = data_source_file_handle.read()

1 0

[onionperf/master] Adds *.pyc to gitignore
by irl＠torproject.org 19 Feb '19

19 Feb '19

commit 22142fec842bb484c25ae1f532c1575848485cc2 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Tue Feb 19 09:11:00 2019 +0000 Adds *.pyc to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5c71b44..5487017 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ onionperf-data venv *.json.xz *.pdf +*.pyc

1 0