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

[tor/master] main: remove level number comments from the subsystem list (master)
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit 5fa75a6cd45d81476d5648665717d46a406845bf Author: teor <teor(a)torproject.org> Date: Tue Sep 10 09:04:38 2019 +1000 main: remove level number comments from the subsystem list (master) Part of 31615. --- src/app/main/subsystem_list.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c index d525708e7..67cb12363 100644 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@ -53,7 +53,7 @@ const subsys_fns_t *tor_subsystems[] = { &sys_ocirc_event, &sys_btrack, - &sys_evloop, /* -20 */ + &sys_evloop, &sys_mainloop, &sys_or,

1 0

[tor/master] main: add some newlines to the subsystem list, for readability
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit 39c7f46d363d8a0b0ccb29bc967004160a477dda Author: teor <teor(a)torproject.org> Date: Tue Sep 10 09:06:36 2019 +1000 main: add some newlines to the subsystem list, for readability --- src/app/main/subsystem_list.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c index 67cb12363..1af9340c1 100644 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@ -39,11 +39,14 @@ const subsys_fns_t *tor_subsystems[] = { &sys_winprocess, &sys_torerr, + &sys_wallclock, &sys_threads, &sys_logging, + &sys_time, &sys_network, + &sys_compress, &sys_crypto, &sys_tortls,

1 0

[tor/master] Merge branch 'tor-github/pr/1311'
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit 049705fc1c9d1c0cee120dc8cbd1a719c6e45e85 Merge: 3b32f2508 39c7f46d3 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Sep 11 09:36:28 2019 -0400 Merge branch 'tor-github/pr/1311' changes/bug31615 | 5 +++++ src/app/main/subsystem_list.c | 43 ++++++++++++++++++++++------------------ src/lib/err/torerr_sys.c | 5 ++++- src/lib/log/log_sys.c | 2 ++ src/lib/net/network_sys.c | 4 +++- src/lib/process/winprocess_sys.c | 2 ++ src/lib/thread/compat_threads.c | 2 ++ src/lib/time/time_sys.c | 4 +++- src/lib/wallclock/approx_time.c | 4 +++- 9 files changed, 48 insertions(+), 23 deletions(-)

1 0

[tor/master] build: The <sys/sysctl.h> is now deprecated on Linux
by asn＠torproject.org 11 Sep '19

11 Sep '19

commit 409df19b5a0053175f05851086e6ef35c5bce2c0 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Sep 9 11:55:33 2019 -0400 build: The <sys/sysctl.h> is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/ticket31673 b/changes/ticket31673 new file mode 100644 index 000000000..3b2bb4a46 --- /dev/null +++ b/changes/ticket31673 @@ -0,0 +1,3 @@ + o New system requirements (build system): + - Do not include the deprecated <sys/sysctl.h> on Linux or Windows system. + Closes 31673; diff --git a/src/lib/meminfo/meminfo.c b/src/lib/meminfo/meminfo.c index f23318889..f4fa45167 100644 --- a/src/lib/meminfo/meminfo.c +++ b/src/lib/meminfo/meminfo.c @@ -18,9 +18,6 @@ #include "lib/log/log.h" #include "lib/malloc/malloc.h" -#ifdef HAVE_SYS_SYSCTL_H -#include <sys/sysctl.h> -#endif #ifdef HAVE_FCNTL_H #include <fcntl.h> #endif @@ -36,6 +33,10 @@ #endif #include <string.h> +#if defined(HAVE_SYS_SYSCTL_H) && !defined(_WIN32) && !defined(__linux__) +#include <sys/sysctl.h> +#endif + DISABLE_GCC_WARNING(aggregate-return) /** Call the platform malloc info function, and dump the results to the log at * level <b>severity</b>. If no such function exists, do nothing. */

1 0

[tor/master] Merge branch 'tor-github/pr/1307'
by asn＠torproject.org 11 Sep '19

11 Sep '19

commit 3b32f2508ca320e63956a3bb746729e1a4fb0190 Merge: e7565855c 409df19b5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Sep 11 16:19:21 2019 +0300 Merge branch 'tor-github/pr/1307' changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/master] practracker: handle empty files.
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit 03040903e677172ce46319b83f9d00bafb33fad7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 2 15:33:59 2019 -0400 practracker: handle empty files. Previously practracker would fail on a file with no lines. --- scripts/maint/practracker/metrics.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/maint/practracker/metrics.py b/scripts/maint/practracker/metrics.py index 9f69b2ac1..4c62bc242 100644 --- a/scripts/maint/practracker/metrics.py +++ b/scripts/maint/practracker/metrics.py @@ -8,6 +8,7 @@ import re def get_file_len(f): """Get file length of file""" + i = -1 for i, l in enumerate(f): pass return i + 1

1 0

[tor/master] practracker: Fix indentation in util.py
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit 3a2964577e397319fe89cbba5393818beab665bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 2 15:40:03 2019 -0400 practracker: Fix indentation in util.py This commit only changes whitespace and removes a temporary comment. --- scripts/maint/practracker/util.py | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/scripts/maint/practracker/util.py b/scripts/maint/practracker/util.py index 854d369f7..4b4256552 100644 --- a/scripts/maint/practracker/util.py +++ b/scripts/maint/practracker/util.py @@ -22,23 +22,22 @@ def get_tor_c_files(tor_topdir, include_dirs=None): else: topdirs = [ os.path.join(tor_topdir, inc) for inc in include_dirs ] - # TO THE REVIEWER: I will fix this indentation shortly. -nm for topdir in topdirs: - for root, directories, filenames in os.walk(topdir): - # Remove all the directories that are excluded. - directories[:] = [ d for d in directories - if _norm(os.path.join(root,d)) not in exclude_dirs ] - directories.sort() - filenames.sort() - for filename in filenames: - # We only care about .c and .h files - if not (filename.endswith(".c") or filename.endswith(".h")): - continue - if filename in EXCLUDE_FILES: - continue - - full_path = os.path.join(root,filename) - - files_list.append(full_path) + for root, directories, filenames in os.walk(topdir): + # Remove all the directories that are excluded. + directories[:] = [ d for d in directories + if _norm(os.path.join(root,d)) not in exclude_dirs ] + directories.sort() + filenames.sort() + for filename in filenames: + # We only care about .c and .h files + if not (filename.endswith(".c") or filename.endswith(".h")): + continue + if filename in EXCLUDE_FILES: + continue + + full_path = os.path.join(root,filename) + + files_list.append(full_path) return files_list

1 0

[tor/master] Practracker: only consider files under "src/"
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit 651bbe8a0d5fbff261a98314b56f57314ea394cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 2 15:31:31 2019 -0400 Practracker: only consider files under "src/" --- changes/ticket31578 | 6 ++++++ scripts/maint/practracker/practracker.py | 5 ++++- scripts/maint/practracker/test_practracker.sh | 1 + scripts/maint/practracker/util.py | 12 +++++++++--- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/changes/ticket31578 b/changes/ticket31578 new file mode 100644 index 000000000..220efffa6 --- /dev/null +++ b/changes/ticket31578 @@ -0,0 +1,6 @@ + o Minor bugfixes (practracker): + - When running check-best-practices, only consider files in the + src subdirectory. Previously we had recursively considered + all subdirectories, which made us get confused by the + temporary directories made by "make distcheck". Fixes bug + 31578; bugfix on 0.4.1.1-alpha. diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py index 6483b88da..537f755c8 100755 --- a/scripts/maint/practracker/practracker.py +++ b/scripts/maint/practracker/practracker.py @@ -195,6 +195,9 @@ def main(argv): help="Maximum lines per function") parser.add_argument("--max-dependency-violations", default=MAX_DEP_VIOLATIONS, help="Maximum number of dependency violations to allow") + parser.add_argument("--include-dir", action="append", + default=["src"], + help="A directory (under topdir) to search for source") parser.add_argument("topdir", default=".", nargs="?", help="Top-level directory for the tor source") args = parser.parse_args(argv[1:]) @@ -216,7 +219,7 @@ def main(argv): filt.addThreshold(problem.DependencyViolationItem("*", int(args.max_dependency_violations))) # 1) Get all the .c files we care about - files_list = util.get_tor_c_files(TOR_TOPDIR) + files_list = util.get_tor_c_files(TOR_TOPDIR, args.include_dir) # 2) Initialize problem vault and load an optional exceptions file so that # we don't warn about the past diff --git a/scripts/maint/practracker/test_practracker.sh b/scripts/maint/practracker/test_practracker.sh index c878ca558..78e96ba47 100755 --- a/scripts/maint/practracker/test_practracker.sh +++ b/scripts/maint/practracker/test_practracker.sh @@ -25,6 +25,7 @@ DATA="${PRACTRACKER_DIR}/testdata" run_practracker() { "${PYTHON:-python}" "${PRACTRACKER_DIR}/practracker.py" \ + --include-dir "" \ --max-include-count=0 --max-file-size=0 --max-function-size=0 --terse \ "${DATA}/" "$@"; } diff --git a/scripts/maint/practracker/util.py b/scripts/maint/practracker/util.py index 695668f56..854d369f7 100644 --- a/scripts/maint/practracker/util.py +++ b/scripts/maint/practracker/util.py @@ -3,22 +3,28 @@ import os # We don't want to run metrics for unittests, automatically-generated C files, # external libraries or git leftovers. EXCLUDE_SOURCE_DIRS = {"src/test/", "src/trunnel/", "src/rust/", - "src/ext/", ".git/"} + "src/ext/" } EXCLUDE_FILES = {"orconfig.h"} def _norm(p): return os.path.normcase(os.path.normpath(p)) -def get_tor_c_files(tor_topdir): +def get_tor_c_files(tor_topdir, include_dirs=None): """ Return a list with the .c and .h filenames we want to get metrics of. """ files_list = [] exclude_dirs = { _norm(os.path.join(tor_topdir, p)) for p in EXCLUDE_SOURCE_DIRS } + if include_dirs is None: + topdirs = [ tor_topdir ] + else: + topdirs = [ os.path.join(tor_topdir, inc) for inc in include_dirs ] - for root, directories, filenames in os.walk(tor_topdir): + # TO THE REVIEWER: I will fix this indentation shortly. -nm + for topdir in topdirs: + for root, directories, filenames in os.walk(topdir): # Remove all the directories that are excluded. directories[:] = [ d for d in directories if _norm(os.path.join(root,d)) not in exclude_dirs ]

1 0

[tor/master] Merge branch 'ticket31578' into ticket31578_merged
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit e7565855c0105836857acf9c67363d1f6948e4ac Merge: 796a9b37e 03040903e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 11 08:59:29 2019 -0400 Merge branch 'ticket31578' into ticket31578_merged changes/ticket31578 | 6 ++++ scripts/maint/practracker/metrics.py | 1 + scripts/maint/practracker/practracker.py | 5 +++- scripts/maint/practracker/test_practracker.sh | 10 +++++-- scripts/maint/practracker/util.py | 43 +++++++++++++++------------ 5 files changed, 42 insertions(+), 23 deletions(-) diff --cc scripts/maint/practracker/practracker.py index 78003fb78,537f755c8..ce9c5f5d8 --- a/scripts/maint/practracker/practracker.py +++ b/scripts/maint/practracker/practracker.py @@@ -218,11 -216,10 +221,11 @@@ def main(argv) filt.addThreshold(problem.FileSizeItem("*.h", int(args.max_h_file_size))) filt.addThreshold(problem.IncludeCountItem("*.h", int(args.max_h_include_count))) filt.addThreshold(problem.FunctionSizeItem("*.c", int(args.max_function_size))) - filt.addThreshold(problem.DependencyViolationItem("*", int(args.max_dependency_violations))) + filt.addThreshold(problem.DependencyViolationItem("*.c", int(args.max_dependency_violations))) + filt.addThreshold(problem.DependencyViolationItem("*.h", int(args.max_dependency_violations))) # 1) Get all the .c files we care about - files_list = util.get_tor_c_files(TOR_TOPDIR) + files_list = util.get_tor_c_files(TOR_TOPDIR, args.include_dir) # 2) Initialize problem vault and load an optional exceptions file so that # we don't warn about the past diff --cc scripts/maint/practracker/test_practracker.sh index 4f8b7e204,78e96ba47..bfbd0c656 --- a/scripts/maint/practracker/test_practracker.sh +++ b/scripts/maint/practracker/test_practracker.sh @@@ -25,9 -25,8 +25,13 @@@ DATA="${PRACTRACKER_DIR}/testdata run_practracker() { "${PYTHON:-python}" "${PRACTRACKER_DIR}/practracker.py" \ - --max-include-count=0 --max-file-size=0 \ - --max-h-include-count=0 --max-h-file-size=0 \ - --max-function-size=0 --terse \ + --include-dir "" \ - --max-include-count=0 --max-file-size=0 --max-function-size=0 --terse \ ++ --max-file-size=0 \ ++ --max-function-size=0 \ ++ --max-h-file-size=0 \ ++ --max-h-include-count=0 \ ++ --max-include-count=0 \ ++ --terse \ "${DATA}/" "$@"; } compare() {

1 0

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

11 Sep '19

commit 2e8cbf09637c4117087054a57dfebfa85e50d67a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 11 12:22:57 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- zh_TW/network-settings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_TW/network-settings.dtd b/zh_TW/network-settings.dtd index 520eba104..3fff34e92 100644 --- a/zh_TW/network-settings.dtd +++ b/zh_TW/network-settings.dtd @@ -55,8 +55,8 @@ <!ENTITY torsettings.proxyHelp1 "當您透過公司、學校或者大學網路進行連線時，您可能需要一個本地代理伺服器。如果您不確定是否需要代理伺服器，請參考其他瀏覽器的網路設定或者系統網路設定。"> <!ENTITY torsettings.bridgeHelpTitle "橋接中繼器之說明"> -<!ENTITY torsettings.bridgeHelp1 "網橋是未位於列表的中繼，可以使得tor網絡更難被屏蔽。 不同類別的網橋使用不同方法規避審查。.  obfs使您的通訊類似隨機發出的雜音，meek使您的通訊看起來是訪問他們的服務而不是tor。"> -<!ENTITY torsettings.bridgeHelp2 "因為某些國家嘗試屏蔽tor，一些特定的網橋只能在特定的國家生效在其他地區則會失活。 如果您不確定哪些網橋在您的國家生效，請訪問torproj…"> +<!ENTITY torsettings.bridgeHelp1 "橋接是未列出的中繼，可以使得 Tor 網路更難被封鎖。  不同類型的橋接使用不同方法規避審查。  obfs 使您的通訊類似隨機發出的雜音，meek 使您的通訊看起來是訪問他們的服務而不是 Tor。"> +<!ENTITY torsettings.bridgeHelp2 "因為某些國家嘗試封鎖 Tor，一些特定的橋接只能在特定的國家有效，在其他地區則會失效。  如果您不確定哪些橋接在您的國家有效，請訪問 torproject.org/about/contact.html#support">  -<!ENTITY torprogress.pleaseWait "請耐心等候，我們正在建立tor網絡。 這個過程將會需要幾分鐘的時間。"> +<!ENTITY torprogress.pleaseWait "請耐心等候，我們正在建立 Tor 網路連線。  這個過程可能需要幾分鐘的時間。">

1 0