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

[tor/release-0.4.1] Extract the log_domain_t type to a lower-level header
by dgoulet＠torproject.org 25 Jul '19

25 Jul '19

commit 5fb070a14da4802f11e84ed83143668502a227c4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 19 10:17:22 2019 -0400 Extract the log_domain_t type to a lower-level header This way, both err and log may depend on it. --- src/lib/defs/include.am | 1 + src/lib/defs/logging_types.h | 23 +++++++++++++++++++++++ src/lib/err/.may_include | 3 ++- src/lib/err/backtrace.c | 4 ++-- src/lib/err/backtrace.h | 6 ++++-- src/lib/log/.may_include | 1 + src/lib/log/log.h | 4 +--- 7 files changed, 34 insertions(+), 8 deletions(-) diff --git a/src/lib/defs/include.am b/src/lib/defs/include.am index dfddc92e5..84ee40377 100644 --- a/src/lib/defs/include.am +++ b/src/lib/defs/include.am @@ -3,5 +3,6 @@ noinst_HEADERS += \ src/lib/defs/dh_sizes.h \ src/lib/defs/digest_sizes.h \ + src/lib/defs/logging_types.h \ src/lib/defs/time.h \ src/lib/defs/x25519_sizes.h diff --git a/src/lib/defs/logging_types.h b/src/lib/defs/logging_types.h new file mode 100644 index 000000000..57db81800 --- /dev/null +++ b/src/lib/defs/logging_types.h @@ -0,0 +1,23 @@ +/* Copyright (c) 2001, Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2019, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file logging_types.h + * + * \brief Global definition for types used by logging systems. + **/ + +#ifndef TOR_LOGGING_TYPES_H +#define TOR_LOGGING_TYPES_H + +/* We define this here so that it can be used both by backtrace.h and + * log.h. + */ + +/** Mask of zero or more log domains, OR'd together. */ +typedef uint64_t log_domain_mask_t; + +#endif diff --git a/src/lib/err/.may_include b/src/lib/err/.may_include index daa1b6e4c..314424545 100644 --- a/src/lib/err/.may_include +++ b/src/lib/err/.may_include @@ -1,5 +1,6 @@ orconfig.h lib/cc/*.h +lib/defs/*.h lib/err/*.h lib/subsys/*.h -lib/version/*.h \ No newline at end of file +lib/version/*.h diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c index f5fa7ec29..e6cbe3d32 100644 --- a/src/lib/err/backtrace.c +++ b/src/lib/err/backtrace.c @@ -115,7 +115,7 @@ clean_backtrace(void **stack, size_t depth, const ucontext_t *ctx) * that with a backtrace log. Send messages via the tor_log function at * logger". */ void -log_backtrace_impl(int severity, uint64_t domain, const char *msg, +log_backtrace_impl(int severity, log_domain_mask_t domain, const char *msg, tor_log_fn logger) { size_t depth; @@ -240,7 +240,7 @@ remove_bt_handler(void) #ifdef NO_BACKTRACE_IMPL void -log_backtrace_impl(int severity, uint64_t domain, const char *msg, +log_backtrace_impl(int severity, log_domain_mask_t domain, const char *msg, tor_log_fn logger) { logger(severity, domain, "%s. (Stack trace not available)", msg); diff --git a/src/lib/err/backtrace.h b/src/lib/err/backtrace.h index ba3049ed1..dcd22cfef 100644 --- a/src/lib/err/backtrace.h +++ b/src/lib/err/backtrace.h @@ -13,11 +13,13 @@ #include "orconfig.h" #include "lib/cc/compat_compiler.h" #include "lib/cc/torint.h" +#include "lib/defs/logging_types.h" -typedef void (*tor_log_fn)(int, uint64_t, const char *fmt, ...) +typedef void (*tor_log_fn)(int, log_domain_mask_t, const char *fmt, ...) CHECK_PRINTF(3,4); -void log_backtrace_impl(int severity, uint64_t domain, const char *msg, +void log_backtrace_impl(int severity, log_domain_mask_t domain, + const char *msg, tor_log_fn logger); int configure_backtrace_handler(const char *tor_version); void clean_up_backtrace_handler(void); diff --git a/src/lib/log/.may_include b/src/lib/log/.may_include index 11c87f0a0..54d96324d 100644 --- a/src/lib/log/.may_include +++ b/src/lib/log/.may_include @@ -1,6 +1,7 @@ orconfig.h lib/cc/*.h +lib/defs/*.h lib/smartlist_core/*.h lib/err/*.h lib/fdio/*.h diff --git a/src/lib/log/log.h b/src/lib/log/log.h index 301c7d571..c4a27782c 100644 --- a/src/lib/log/log.h +++ b/src/lib/log/log.h @@ -16,6 +16,7 @@ #include <stdarg.h> #include "lib/cc/torint.h" #include "lib/cc/compat_compiler.h" +#include "lib/defs/logging_types.h" #include "lib/testsupport/testsupport.h" #ifdef HAVE_SYSLOG_H @@ -132,9 +133,6 @@ * would. Used as a flag, not a log domain. */ #define LD_NOFUNCNAME (UINT64_C(1)<<63) -/** Mask of zero or more log domains, OR'd together. */ -typedef uint64_t log_domain_mask_t; - /** Configures which severities are logged for each logging domain for a given * log target. */ typedef struct log_severity_list_t {

1 0

[tor/release-0.4.1] Fix clang-detected errors related to log_domain_mask_t
by dgoulet＠torproject.org 25 Jul '19

25 Jul '19

commit 167d873bdec3354a74417473043b2e82b6723177 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 24 09:08:48 2019 -0400 Fix clang-detected errors related to log_domain_mask_t --- src/lib/log/log.c | 4 ++-- src/test/test_options.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/log/log.c b/src/lib/log/log.c index 756eb2a97..d95bf1ff6 100644 --- a/src/lib/log/log.c +++ b/src/lib/log/log.c @@ -1022,7 +1022,7 @@ flush_pending_log_callbacks(void) do { SMARTLIST_FOREACH_BEGIN(messages, pending_log_message_t *, msg) { const int severity = msg->severity; - const int domain = msg->domain; + const log_domain_mask_t domain = msg->domain; for (lf = logfiles; lf; lf = lf->next) { if (! lf->callback || lf->seems_dead || ! (lf->severities->masks[SEVERITY_MASK_IDX(severity)] & domain)) { @@ -1377,7 +1377,7 @@ parse_log_severity_config(const char **cfg_ptr, if (!strcmp(domain, "*")) { domains = ~0u; } else { - int d; + log_domain_mask_t d; int negate=0; if (*domain == '~') { negate = 1; diff --git a/src/test/test_options.c b/src/test/test_options.c index d2f0c1121..7009910b0 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -31,7 +31,7 @@ typedef struct { int severity; - uint32_t domain; + log_domain_mask_t domain; char *msg; } logmsg_t;

1 0

[tor/release-0.4.1] Start on 0.4.1.4-rc changelog
by nickm＠torproject.org 25 Jul '19

25 Jul '19

commit 08b3436ae8b244787faae1b98d7c8d0e38f7ba21 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 25 09:00:08 2019 -0400 Start on 0.4.1.4-rc changelog --- ChangeLog | 38 ++++++++++++++++++++++++++++++++++++++ changes/bug30649 | 4 ---- changes/bug30894 | 4 ---- changes/bug31003 | 4 ---- changes/chutney_ci | 3 --- changes/ticket28795 | 5 ----- changes/ticket30871 | 6 ------ 7 files changed, 38 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5bfce1ac5..ca6ebaff2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,41 @@ +Changes in version 0.4.1.4-rc - 2019-07-?? + Tor 0.4.1.4-rc fixes a few bugs from previous versions of Tor, and + updates to a new list of fallback directories. If no new bugs are + found, the next release in the 0.4.1.x serious should be stable. + + o Major bugfixes (circuit build, guard): + - When considering upgrading circuits from "waiting for guard" to + "open", always ignore the ones that are mark for close. Else, we + can end up in the situation where a subsystem is notified of that + circuit opening but still marked for close leading to undesirable + behavior. Fixes bug 30871; bugfix on 0.3.0.1-alpha. + + o Minor features (continuous integration): + - Our Travis configuration now uses Chutney to run some network + integration tests automatically. Closes ticket 29280. + + o Minor features (fallback directory list): + - Replace the 157 fallbacks originally introduced in Tor 0.3.5.6-rc + in December 2018 (of which ~122 were still functional), with a + list of 148 fallbacks (70 new, 78 existing, 79 removed) generated + in June 2019. Closes ticket 28795. + + o Minor bugfixes (circuit padding): + - On relays, properly check that a padding machine is absent before + logging a warn about it being absent. Fixes bug 30649; bugfix + on 0.4.1.1-alpha. + + o Minor bugfixes (crash on exit): + - Avoid a set of possible code paths that could use try to use freed + memory in routerlist_free() while Tor was exiting. Fixes bug + 31003; bugfix on 0.1.2.2-alpha. + + o Minor bugfixes (memory leaks): + - Fix a trivial memory leak when parsing an invalid value from a + download schedule in the configuration. Fixes bug 30894; bugfix + on 0.3.4.1-alpha. + + Changes in version 0.4.1.3-alpha - 2019-06-25 Tor 0.4.1.3-alpha resolves numerous bugs left over from the previous alpha, most of them from earlier release series. diff --git a/changes/bug30649 b/changes/bug30649 deleted file mode 100644 index 3f5768bcb..000000000 --- a/changes/bug30649 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (circuit padding): - - On relays, properly check that a padding machine is absent before - logging a warn about it being absent. Fixes bug 30649; - bugfix on 0.4.1.1-alpha. diff --git a/changes/bug30894 b/changes/bug30894 deleted file mode 100644 index 64c14c4e6..000000000 --- a/changes/bug30894 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (memory leaks): - - Fix a trivial memory leak when parsing an invalid value - from a download schedule in the configuration. Fixes bug - 30894; bugfix on 0.3.4.1-alpha. diff --git a/changes/bug31003 b/changes/bug31003 deleted file mode 100644 index 6c7516338..000000000 --- a/changes/bug31003 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (crash on exit): - - Avoid a set of possible code paths that could use try to use freed memory - in routerlist_free() while Tor was exiting. Fixes bug 31003; bugfix on - 0.1.2.2-alpha. diff --git a/changes/chutney_ci b/changes/chutney_ci deleted file mode 100644 index b17d58732..000000000 --- a/changes/chutney_ci +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features (continuous integration): - - Our Travis configuration now uses Chutney to run some network - integration tests automatically. Closes ticket 29280. diff --git a/changes/ticket28795 b/changes/ticket28795 deleted file mode 100644 index 6ae72562b..000000000 --- a/changes/ticket28795 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features (fallback directory list): - - Replace the 157 fallbacks originally introduced in Tor 0.3.5.6-rc - in December 2018 (of which ~122 were still functional), with a - list of 148 fallbacks (70 new, 78 existing, 79 removed) generated - in June 2019. Closes ticket 28795. diff --git a/changes/ticket30871 b/changes/ticket30871 deleted file mode 100644 index 81c076bb0..000000000 --- a/changes/ticket30871 +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixes (circuit build, guard): - - When considering upgrading circuits from "waiting for guard" to "open", - always ignore the ones that are mark for close. Else, we can end up in - the situation where a subsystem is notified of that circuit opening but - still marked for close leading to undesirable behavior. Fixes bug 30871; - bugfix on 0.3.0.1-alpha.

1 0

[tor/release-0.4.1] Bump version to 0.4.1.4-rc
by nickm＠torproject.org 25 Jul '19

25 Jul '19

commit b2a6b52825cbe3925692bbb00214b0d460333d9a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 25 09:00:53 2019 -0400 Bump version to 0.4.1.4-rc --- 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 cbad429ce..63b864d1b 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.1.3-alpha-dev]) +AC_INIT([tor],[0.4.1.4-rc]) 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-06-25"], # for 0.4.1.3-alpha-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-07-25"], # for 0.4.1.4-rc [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 0a5642911..b20d276a7 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.1.3-alpha-dev" +!define VERSION "0.4.1.4-rc" !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 8b0855987..64dccf2e1 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.1.3-alpha-dev" +#define VERSION "0.4.1.4-rc"

1 0

[tor/master] Bump version to 0.4.1.4-rc
by nickm＠torproject.org 25 Jul '19

25 Jul '19

commit b2a6b52825cbe3925692bbb00214b0d460333d9a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 25 09:00:53 2019 -0400 Bump version to 0.4.1.4-rc --- 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 cbad429ce..63b864d1b 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.1.3-alpha-dev]) +AC_INIT([tor],[0.4.1.4-rc]) 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-06-25"], # for 0.4.1.3-alpha-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-07-25"], # for 0.4.1.4-rc [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 0a5642911..b20d276a7 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.1.3-alpha-dev" +!define VERSION "0.4.1.4-rc" !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 8b0855987..64dccf2e1 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.1.3-alpha-dev" +#define VERSION "0.4.1.4-rc"

1 0

[tor/master] Merge branch 'maint-0.4.1'
by nickm＠torproject.org 25 Jul '19

25 Jul '19

commit 7082cc16841f29183187dfa369749942cf8f1564 Merge: 2944b091f b2a6b5282 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 25 09:01:20 2019 -0400 Merge branch 'maint-0.4.1' "ours" to avoid version bump.

1 0

[tor/maint-0.4.1] Bump version to 0.4.1.4-rc
by nickm＠torproject.org 25 Jul '19

25 Jul '19

commit b2a6b52825cbe3925692bbb00214b0d460333d9a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 25 09:00:53 2019 -0400 Bump version to 0.4.1.4-rc --- 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 cbad429ce..63b864d1b 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.1.3-alpha-dev]) +AC_INIT([tor],[0.4.1.4-rc]) 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-06-25"], # for 0.4.1.3-alpha-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-07-25"], # for 0.4.1.4-rc [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 0a5642911..b20d276a7 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.1.3-alpha-dev" +!define VERSION "0.4.1.4-rc" !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 8b0855987..64dccf2e1 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.1.3-alpha-dev" +#define VERSION "0.4.1.4-rc"

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by nickm＠torproject.org 25 Jul '19

25 Jul '19

commit d62af7ae3f233fb62d0591b739edb9a1a149a05b Merge: 08b3436ae b2a6b5282 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 25 09:01:38 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0

[collector/master] Add change log entry for Cobertura deps.
by karsten＠torproject.org 24 Jul '19

24 Jul '19

commit 7f36a2b12eb5e25c441e0d8a40c5c9a7de19821c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 24 19:56:18 2019 +0200 Add change log entry for Cobertura deps. --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55118c2..3a07711 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ checkstyle-8.15.jar, commons-beanutils-1.9.3.jar, commons-collections3-3.2.2.jar, commons-logging-1.2.jar, guava-19.0.jar, java-atk-wrapper.jar, and picocli-3.9.2.jar. + * Update Cobertura dependencies to versions found in Debian buster, + including: asm4-5.0.4.jar, asm4-util-5.0.4.jar, + asm4-tree-5.0.4.jar, asm4-commons-5.0.4.jar, + asm4-analysis-5.0.4.jar, and commons-lang3-3.8.jar # Changes in version 1.9.1 - 2019-05-29

1 0

[metrics-lib/master] Add change log entry for Cobertura deps.
by karsten＠torproject.org 24 Jul '19

24 Jul '19

commit 4ffa637c56d676dc2c0ceeec48556110aee2050a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 24 19:56:39 2019 +0200 Add change log entry for Cobertura deps. --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66a626a..e3622e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ checkstyle-8.15.jar, commons-beanutils-1.9.3.jar, commons-collections3-3.2.2.jar, commons-logging-1.2.jar, guava-19.0.jar, java-atk-wrapper.jar, and picocli-3.9.2.jar. + * Update Cobertura dependencies to versions found in Debian buster, + including: asm4-5.0.4.jar, asm4-util-5.0.4.jar, + asm4-tree-5.0.4.jar, asm4-commons-5.0.4.jar, + asm4-analysis-5.0.4.jar, and commons-lang3-3.8.jar # Changes in version 2.6.2 - 2019-05-29

1 0