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

[chutney/master] Travis: Set pipefail
by teor＠torproject.org 19 Dec '19

19 Dec '19

commit dc19f219eba7bf15a9a04a4e6a038482c829b139 Author: teor <teor(a)torproject.org> Date: Mon Dec 2 11:56:41 2019 +1000 Travis: Set pipefail --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 07ed4ff..88039a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -204,6 +204,10 @@ addons: # some point to speed up builds. update: true +before_install: + ## Set pipefail: we may use pipes in future + - set -o pipefail || echo "pipefail failed" + install: ## Chutney has no dependencies, apart from tor ## List installed package versions

1 0

[chutney/master] chutney: Prefer python3 when running chutney
by teor＠torproject.org 19 Dec '19

19 Dec '19

commit b53ab19df9bc2fb679a95a27e079dad03418f100 Author: teor <teor(a)torproject.org> Date: Sun Dec 1 18:10:07 2019 +1000 chutney: Prefer python3 when running chutney Python 2 is EOL on 1 January 2020. Part of 32631. --- chutney | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chutney b/chutney index e6fef7e..63f9a47 100755 --- a/chutney +++ b/chutney @@ -12,7 +12,7 @@ then export CHUTNEY_PATH fi -binaries="python python3 python2" +binaries="python3 python python2" if ! test "${PYTHON+y}" then

1 0

[chutney/master] Travis: Show the torrc when the job fails
by teor＠torproject.org 19 Dec '19

19 Dec '19

commit 02a158d3b9e8c00e1b14febc1dd445c6544e572b Author: teor <teor(a)torproject.org> Date: Wed Dec 18 12:27:16 2019 +1000 Travis: Show the torrc when the job fails Diagnostics for 32630. --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 17dd5ac..6bdb518 100644 --- a/.travis.yml +++ b/.travis.yml @@ -279,6 +279,8 @@ after_failure: - ls -al . net ## List the contents of net/nodes - ls -lR net/nodes/ + ## Dump the config + - cat net/nodes/000a*/torrc ## Dump the important directory documents #- cat net/nodes/000a*/cached-certs - cat net/nodes/000a*/cached-consensus

1 0

[chutney/master] Merge remote-tracking branch 'tor-github/pr/44'
by teor＠torproject.org 19 Dec '19

19 Dec '19

commit 8b09bafe9c3731fd05fd9617a780d38a65216d35 Merge: e748a5f f4ecd58 Author: teor <teor(a)torproject.org> Date: Fri Dec 20 10:01:31 2019 +1000 Merge remote-tracking branch 'tor-github/pr/44' .travis.yml | 153 ++++++++++++++++++++++++++++++++++++++-------------- chutney | 2 +- tests/unit-tests.sh | 14 +++-- 3 files changed, 123 insertions(+), 46 deletions(-)

1 0

[tor/master] Code Style: Delete PRIVATE defines that are never used
by teor＠torproject.org 19 Dec '19

19 Dec '19

commit d8b868e483109e32780ec8bfdcefdfbd8355c172 Author: teor <teor(a)torproject.org> Date: Tue Nov 26 09:07:47 2019 +1000 Code Style: Delete PRIVATE defines that are never used Some ".c" files define *_PRIVATE macros, but those macros are not used in any header file. Delete them. These changes were created using the "make autostyle" from 32522, and then split into commits. --- src/core/mainloop/connection.c | 1 - src/core/or/circuitlist.c | 1 - src/feature/dirauth/guardfraction.h | 2 +- src/feature/dircache/dirserv.c | 1 - src/feature/dircommon/voting_schedule.c | 1 - src/feature/hs/hs_config.c | 2 -- src/feature/hs_common/shared_random_client.c | 1 - src/feature/relay/selftest.c | 2 -- src/lib/crypt_ops/crypto_rand_fast.c | 1 - src/lib/crypt_ops/crypto_util.c | 2 -- src/lib/net/socket.c | 1 - src/test/fakecircs.c | 1 - src/test/test_bridges.c | 2 -- src/test/test_dir.c | 1 - src/test/test_procmon.c | 1 - src/test/test_pt.c | 1 - src/test/test_util.c | 3 --- src/test/test_util_format.c | 1 - src/test/test_util_process.c | 1 - 19 files changed, 1 insertion(+), 25 deletions(-) diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 368041f92..3693e1d71 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -66,7 +66,6 @@ * part of a subclass (channel_tls_t). */ #define TOR_CHANNEL_INTERNAL_ -#define CONNECTION_PRIVATE #include "app/config/config.h" #include "core/mainloop/connection.h" #include "core/mainloop/mainloop.h" diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c index 49a63c50a..c67b19f06 100644 --- a/src/core/or/circuitlist.c +++ b/src/core/or/circuitlist.c @@ -99,7 +99,6 @@ #include "lib/compress/compress_zstd.h" #include "lib/buf/buffers.h" -#define OCIRC_EVENT_PRIVATE #include "core/or/ocirc_event.h" #include "ht.h" diff --git a/src/feature/dirauth/guardfraction.h b/src/feature/dirauth/guardfraction.h index 9f01ded83..cae477760 100644 --- a/src/feature/dirauth/guardfraction.h +++ b/src/feature/dirauth/guardfraction.h @@ -16,7 +16,7 @@ STATIC int dirserv_read_guardfraction_file_from_str(const char *guardfraction_file_str, smartlist_t *vote_routerstatuses); -#endif /* defined(DIRSERV_PRIVATE) */ +#endif int dirserv_read_guardfraction_file(const char *fname, smartlist_t *vote_routerstatuses); diff --git a/src/feature/dircache/dirserv.c b/src/feature/dircache/dirserv.c index 85331bfea..53bb9814a 100644 --- a/src/feature/dircache/dirserv.c +++ b/src/feature/dircache/dirserv.c @@ -3,7 +3,6 @@ * Copyright (c) 2007-2019, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#define DIRSERV_PRIVATE #include "core/or/or.h" #include "app/config/config.h" diff --git a/src/feature/dircommon/voting_schedule.c b/src/feature/dircommon/voting_schedule.c index 5576ec69f..76915f6be 100644 --- a/src/feature/dircommon/voting_schedule.c +++ b/src/feature/dircommon/voting_schedule.c @@ -8,7 +8,6 @@ * tor. The full feature is built as part of the dirauth module. **/ -#define VOTING_SCHEDULE_PRIVATE #include "feature/dircommon/voting_schedule.h" #include "core/or/or.h" diff --git a/src/feature/hs/hs_config.c b/src/feature/hs/hs_config.c index ed577daf7..3c302e70b 100644 --- a/src/feature/hs/hs_config.c +++ b/src/feature/hs/hs_config.c @@ -23,8 +23,6 @@ * every option that is common to all version (config_generic_service). **/ -#define HS_CONFIG_PRIVATE - #include "feature/hs/hs_common.h" #include "feature/hs/hs_config.h" #include "feature/hs/hs_client.h" diff --git a/src/feature/hs_common/shared_random_client.c b/src/feature/hs_common/shared_random_client.c index f5328e6e1..999472a86 100644 --- a/src/feature/hs_common/shared_random_client.c +++ b/src/feature/hs_common/shared_random_client.c @@ -8,7 +8,6 @@ * as part of the dirauth module. **/ -#define SHARED_RANDOM_CLIENT_PRIVATE #include "feature/hs_common/shared_random_client.h" #include "app/config/config.h" diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index f8b54ff45..abc87437d 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -12,8 +12,6 @@ * their own bandwidth, before publishing. */ -#define SELFTEST_PRIVATE - #include "core/or/or.h" #include "app/config/config.h" diff --git a/src/lib/crypt_ops/crypto_rand_fast.c b/src/lib/crypt_ops/crypto_rand_fast.c index 8625ebd1c..166c67c87 100644 --- a/src/lib/crypt_ops/crypto_rand_fast.c +++ b/src/lib/crypt_ops/crypto_rand_fast.c @@ -32,7 +32,6 @@ * request. */ -#define CRYPTO_RAND_FAST_PRIVATE #define CRYPTO_PRIVATE #include "lib/crypt_ops/crypto_rand.h" diff --git a/src/lib/crypt_ops/crypto_util.c b/src/lib/crypt_ops/crypto_util.c index 5e3f4a87a..beb45792a 100644 --- a/src/lib/crypt_ops/crypto_util.c +++ b/src/lib/crypt_ops/crypto_util.c @@ -10,8 +10,6 @@ * \brief Common cryptographic utilities. **/ -#define CRYPTO_UTIL_PRIVATE - #include "lib/crypt_ops/crypto_util.h" #include "lib/cc/compat_compiler.h" diff --git a/src/lib/net/socket.c b/src/lib/net/socket.c index e1b82251e..b25be91f4 100644 --- a/src/lib/net/socket.c +++ b/src/lib/net/socket.c @@ -9,7 +9,6 @@ * sockets. **/ -#define SOCKET_PRIVATE #include "lib/net/socket.h" #include "lib/net/socketpair.h" #include "lib/net/address.h" diff --git a/src/test/fakecircs.c b/src/test/fakecircs.c index cb8dafc6b..369a85d7b 100644 --- a/src/test/fakecircs.c +++ b/src/test/fakecircs.c @@ -6,7 +6,6 @@ * \brief Fake circuits API for unit test. **/ -#define CHANNEL_PRIVATE #define CIRCUITBUILD_PRIVATE #define CIRCUITLIST_PRIVATE #define CRYPT_PATH_PRIVATE diff --git a/src/test/test_bridges.c b/src/test/test_bridges.c index 879ae6636..5dd3d0554 100644 --- a/src/test/test_bridges.c +++ b/src/test/test_bridges.c @@ -550,8 +550,6 @@ test_bridges_get_transport_by_bridge_addrport_no_ptlist(void *arg) sweep_bridge_list(); } -#define PT_PRIVATE - /** * Calling get_transport_by_bridge_addrport() with the address and port of a * configured bridge which uses a pluggable transport should return 0 and set diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 02465b07f..523c0719f 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -11,7 +11,6 @@ #define CONTROL_GETINFO_PRIVATE #define DIRCACHE_PRIVATE #define DIRCLIENT_PRIVATE -#define DIRSERV_PRIVATE #define DIRVOTE_PRIVATE #define DLSTATUS_PRIVATE #define HIBERNATE_PRIVATE diff --git a/src/test/test_procmon.c b/src/test/test_procmon.c index e23578f4f..4ade82470 100644 --- a/src/test/test_procmon.c +++ b/src/test/test_procmon.c @@ -1,7 +1,6 @@ /* Copyright (c) 2010-2019, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#define PROCMON_PRIVATE #include "orconfig.h" #include "core/or/or.h" #include "test/test.h" diff --git a/src/test/test_pt.c b/src/test/test_pt.c index 0e391c1ba..268848b98 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -5,7 +5,6 @@ #include "orconfig.h" #define PT_PRIVATE -#define UTIL_PRIVATE #define STATEFILE_PRIVATE #define CONTROL_EVENTS_PRIVATE #define PROCESS_PRIVATE diff --git a/src/test/test_util.c b/src/test/test_util.c index 5f46e4fcf..7f7e157c1 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4,11 +4,8 @@ /* See LICENSE for licensing information */ #include "orconfig.h" -#define COMPAT_PRIVATE #define COMPAT_TIME_PRIVATE -#define UTIL_PRIVATE #define UTIL_MALLOC_PRIVATE -#define SOCKET_PRIVATE #define PROCESS_WIN32_PRIVATE #include "lib/testsupport/testsupport.h" #include "core/or/or.h" diff --git a/src/test/test_util_format.c b/src/test/test_util_format.c index 2859da66b..57c3eee5b 100644 --- a/src/test/test_util_format.c +++ b/src/test/test_util_format.c @@ -7,7 +7,6 @@ #include "test/test.h" #include "lib/crypt_ops/crypto_rand.h" -#define UTIL_FORMAT_PRIVATE #include "lib/encoding/binascii.h" #define NS_MODULE util_format diff --git a/src/test/test_util_process.c b/src/test/test_util_process.c index 4d04eb6df..9c78a8c0e 100644 --- a/src/test/test_util_process.c +++ b/src/test/test_util_process.c @@ -1,7 +1,6 @@ /* Copyright (c) 2010-2019, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#define UTIL_PROCESS_PRIVATE #include "orconfig.h" #include "core/or/or.h"

1 0

[tor/master] Run "make autostyle"
by teor＠torproject.org 19 Dec '19

19 Dec '19

commit 57b6678d52eec334a3e650158ac97d60b5b2b38b Author: teor <teor(a)torproject.org> Date: Fri Dec 20 09:45:53 2019 +1000 Run "make autostyle" --- src/feature/control/control_hs.h | 2 +- src/lib/math/prob_distr.c | 2 +- src/test/fakecircs.c | 2 +- src/test/test_options_act.c | 4 ++-- src/test/testing_common.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/feature/control/control_hs.h b/src/feature/control/control_hs.h index 35ac1b22d..41ba1ee89 100644 --- a/src/feature/control/control_hs.h +++ b/src/feature/control/control_hs.h @@ -29,5 +29,5 @@ int handle_control_onion_client_auth_view(control_connection_t *conn, const control_cmd_args_t *args); -#endif +#endif /* !defined(TOR_CONTROL_HS_H) */ diff --git a/src/lib/math/prob_distr.c b/src/lib/math/prob_distr.c index 1d1748666..02dbc5de5 100644 --- a/src/lib/math/prob_distr.c +++ b/src/lib/math/prob_distr.c @@ -68,7 +68,7 @@ DECLARE_PROB_DISTR_DOWNCAST_FN(logistic) DECLARE_PROB_DISTR_DOWNCAST_FN(log_logistic) DECLARE_PROB_DISTR_DOWNCAST_FN(genpareto) DECLARE_PROB_DISTR_DOWNCAST_FN(weibull) -#endif +#endif /* !defined(COCCI) */ /** * Count number of one bits in 32-bit word. diff --git a/src/test/fakecircs.c b/src/test/fakecircs.c index 82a8722ba..cb8dafc6b 100644 --- a/src/test/fakecircs.c +++ b/src/test/fakecircs.c @@ -22,7 +22,7 @@ #include "core/or/relay.h" #include "core/or/relay_crypto_st.h" -#include "fakecircs.h" +#include "test/fakecircs.h" /** Return newly allocated OR circuit using the given nchan and pchan. It must * be freed with the free_fake_orcirc(). */ diff --git a/src/test/test_options_act.c b/src/test/test_options_act.c index 0a9be28c5..a3c44e66c 100644 --- a/src/test/test_options_act.c +++ b/src/test/test_options_act.c @@ -40,10 +40,10 @@ get_file_mode(const char *fname, unsigned *permissions_out) TT_DIE(("Bad mode %o on %s", mode_, (fn))); \ } \ STMT_END -#else +#else /* defined(_WIN32) */ /* "group-readable" isn't meaningful on windows */ #define assert_mode(fn,mask,expected) STMT_NIL -#endif +#endif /* !defined(_WIN32) */ static or_options_t *mock_opts; static const or_options_t * diff --git a/src/test/testing_common.c b/src/test/testing_common.c index 378a6f192..03e013a26 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -108,7 +108,7 @@ setup_directory(void) /* undo sticky bit so tests don't get confused. */ r = chown(temp_dir, getuid(), getgid()); } -#endif /* defined(_WIN32) */ +#endif /* defined(_WIN32) || ... */ if (r) { fprintf(stderr, "Can't create directory %s:", temp_dir); perror("");

1 0

[tor/master] Code Style: Delete headers that are included twice
by teor＠torproject.org 19 Dec '19

19 Dec '19

commit cd160291a755ac830855e3226e6c470a5b2ecede Author: teor <teor(a)torproject.org> Date: Tue Nov 26 09:10:32 2019 +1000 Code Style: Delete headers that are included twice These changes were created using the "make autostyle" from 32522, and then split into commits. --- src/app/main/main.c | 1 - src/app/main/shutdown.c | 1 - src/core/mainloop/periodic.c | 1 - src/core/or/or.h | 1 - src/core/or/scheduler.c | 1 - src/feature/dirauth/keypin.c | 2 -- src/feature/hs/hs_service.c | 1 - src/lib/confmgt/type_defs.c | 1 - src/lib/crypt_ops/aes_openssl.c | 1 - src/lib/process/env.c | 1 - src/test/test_circuitpadding.c | 1 - src/test/test_hs_control.c | 2 -- src/test/test_relay.c | 1 - src/test/test_relaycell.c | 1 - 14 files changed, 16 deletions(-) diff --git a/src/app/main/main.c b/src/app/main/main.c index 6029ed3d2..4275a98bd 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -67,7 +67,6 @@ #include "lib/osinfo/uname.h" #include "lib/sandbox/sandbox.h" #include "lib/fs/lockfile.h" -#include "lib/net/resolve.h" #include "lib/tls/tortls.h" #include "lib/evloop/compat_libevent.h" #include "lib/encoding/confline.h" diff --git a/src/app/main/shutdown.c b/src/app/main/shutdown.c index cc07b921c..df273b960 100644 --- a/src/app/main/shutdown.c +++ b/src/app/main/shutdown.c @@ -43,7 +43,6 @@ #include "feature/nodelist/networkstatus.h" #include "feature/nodelist/nodelist.h" #include "feature/nodelist/routerlist.h" -#include "feature/nodelist/routerlist.h" #include "feature/relay/ext_orport.h" #include "feature/relay/relay_config.h" #include "feature/rend/rendcache.h" diff --git a/src/core/mainloop/periodic.c b/src/core/mainloop/periodic.c index efc6a6316..490d23c24 100644 --- a/src/core/mainloop/periodic.c +++ b/src/core/mainloop/periodic.c @@ -29,7 +29,6 @@ #include "app/config/config.h" #include "core/mainloop/mainloop.h" #include "core/mainloop/periodic.h" -#include "lib/evloop/compat_libevent.h" /** We disable any interval greater than this number of seconds, on the * grounds that it is probably an absolute time mistakenly passed in as a diff --git a/src/core/or/or.h b/src/core/or/or.h index c044936d3..4d6afc2b0 100644 --- a/src/core/or/or.h +++ b/src/core/or/or.h @@ -24,7 +24,6 @@ #include "lib/arch/bytes.h" #include "lib/cc/compat_compiler.h" -#include "lib/cc/torint.h" #include "lib/container/map.h" #include "lib/buf/buffers.h" #include "lib/container/smartlist.h" diff --git a/src/core/or/scheduler.c b/src/core/or/scheduler.c index 063342480..5b1cd90ae 100644 --- a/src/core/or/scheduler.c +++ b/src/core/or/scheduler.c @@ -12,7 +12,6 @@ #include "lib/buf/buffers.h" #define TOR_CHANNEL_INTERNAL_ #include "core/or/channeltls.h" -#include "lib/evloop/compat_libevent.h" #include "core/or/or_connection_st.h" diff --git a/src/feature/dirauth/keypin.c b/src/feature/dirauth/keypin.c index 3ca2c3ef9..991b7be03 100644 --- a/src/feature/dirauth/keypin.c +++ b/src/feature/dirauth/keypin.c @@ -15,8 +15,6 @@ #include "lib/cc/torint.h" #include "lib/crypt_ops/crypto_digest.h" #include "lib/crypt_ops/crypto_format.h" -#include "lib/crypt_ops/crypto_format.h" -#include "lib/ctime/di_ops.h" #include "lib/ctime/di_ops.h" #include "lib/encoding/binascii.h" #include "lib/encoding/time_fmt.h" diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index 3d152afa1..cfa5d6c6e 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -30,7 +30,6 @@ #include "feature/rend/rendservice.h" #include "lib/crypt_ops/crypto_ope.h" #include "lib/crypt_ops/crypto_rand.h" -#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" #include "feature/hs/hs_circuit.h" diff --git a/src/lib/confmgt/type_defs.c b/src/lib/confmgt/type_defs.c index 7200218f7..00932511a 100644 --- a/src/lib/confmgt/type_defs.c +++ b/src/lib/confmgt/type_defs.c @@ -23,7 +23,6 @@ #include "lib/confmgt/unitparse.h" #include "lib/cc/compat_compiler.h" -#include "lib/conf/conftypes.h" #include "lib/container/smartlist.h" #include "lib/encoding/confline.h" #include "lib/encoding/time_fmt.h" diff --git a/src/lib/crypt_ops/aes_openssl.c b/src/lib/crypt_ops/aes_openssl.c index d493b1846..f5cc97ff6 100644 --- a/src/lib/crypt_ops/aes_openssl.c +++ b/src/lib/crypt_ops/aes_openssl.c @@ -39,7 +39,6 @@ DISABLE_GCC_WARNING(redundant-decls) ENABLE_GCC_WARNING(redundant-decls) -#include "lib/crypt_ops/aes.h" #include "lib/log/log.h" #include "lib/ctime/di_ops.h" diff --git a/src/lib/process/env.c b/src/lib/process/env.c index 3912ade19..88619d1e4 100644 --- a/src/lib/process/env.c +++ b/src/lib/process/env.c @@ -16,7 +16,6 @@ #include "lib/container/smartlist.h" #include "lib/log/util_bug.h" #include "lib/log/log.h" -#include "lib/malloc/malloc.h" #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c index 70e2081c5..78a019de8 100644 --- a/src/test/test_circuitpadding.c +++ b/src/test/test_circuitpadding.c @@ -27,7 +27,6 @@ #include "core/crypto/relay_crypto.h" #include "core/or/protover.h" #include "feature/nodelist/nodelist.h" -#include "lib/evloop/compat_libevent.h" #include "app/config/config.h" #include "feature/nodelist/routerstatus_st.h" diff --git a/src/test/test_hs_control.c b/src/test/test_hs_control.c index dab0a8c60..789072430 100644 --- a/src/test/test_hs_control.c +++ b/src/test/test_hs_control.c @@ -28,8 +28,6 @@ #include "feature/nodelist/routerstatus_st.h" #include "lib/crypt_ops/crypto_format.h" -#include "test/test_helpers.h" - #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> #endif diff --git a/src/test/test_relay.c b/src/test/test_relay.c index f7809b47e..5c95f9fe1 100644 --- a/src/test/test_relay.c +++ b/src/test/test_relay.c @@ -10,7 +10,6 @@ #include "core/or/channeltls.h" #include "feature/stats/rephist.h" #include "core/or/relay.h" -#include "feature/stats/rephist.h" #include "lib/container/order.h" /* For init/free stuff */ #include "core/or/scheduler.h" diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c index c65279fb2..14bd045df 100644 --- a/src/test/test_relaycell.c +++ b/src/test/test_relaycell.c @@ -30,7 +30,6 @@ #include "core/or/half_edge_st.h" #include "feature/client/circpathbias.h" -#include "core/or/connection_edge.h" static int srm_ncalls; static entry_connection_t *srm_conn;

1 0

[tor/master] Makefile/git scripts: Add comments to keep owned file lists in sync
by teor＠torproject.org 19 Dec '19

19 Dec '19

commit ac3a9aaf0dc6f376368f1ad51c79e332da52adc2 Author: teor <teor(a)torproject.org> Date: Tue Nov 26 09:20:57 2019 +1000 Makefile/git scripts: Add comments to keep owned file lists in sync --- Makefile.am | 4 ++++ scripts/coccinelle/check_cocci_parse.sh | 4 ++++ scripts/git/pre-commit.git-hook | 4 ++++ scripts/git/pre-push.git-hook | 6 +++++- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 2dd3a7aa3..811694f0b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -389,6 +389,10 @@ coverage-html-full: all genhtml --branch-coverage -o "$(HTML_COVER_DIR)" "$(HTML_COVER_DIR)/lcov.info" # For scripts: avoid src/ext and src/trunnel. +# Keep these lists consistent: +# - OWNED_TOR_C_FILES in Makefile.am +# - CHECK_FILES in pre-commit.git-hook and pre-push.git-hook +# - try_parse in check_cocci_parse.sh OWNED_TOR_C_FILES=\ $(top_srcdir)/src/lib/*/*.[ch] \ $(top_srcdir)/src/core/*/*.[ch] \ diff --git a/scripts/coccinelle/check_cocci_parse.sh b/scripts/coccinelle/check_cocci_parse.sh index aebfac70f..aaa586c09 100755 --- a/scripts/coccinelle/check_cocci_parse.sh +++ b/scripts/coccinelle/check_cocci_parse.sh @@ -73,6 +73,10 @@ if test $# -ge 1 ; then else cd "$top" || exit 1 # This is the layout in 0.3.5 + # Keep these lists consistent: + # - OWNED_TOR_C_FILES in Makefile.am + # - CHECK_FILES in pre-commit.git-hook and pre-push.git-hook + # - try_parse in check_cocci_parse.sh "$try_parse" \ src/lib/*/*.[ch] \ src/core/*/*.[ch] \ diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook index 95d566b17..d5a75f279 100755 --- a/scripts/git/pre-commit.git-hook +++ b/scripts/git/pre-commit.git-hook @@ -19,6 +19,10 @@ if [ $# -eq 0 ]; then # Use the appropriate owned tor source list to filter the changed files if [ -d src/lib ]; then # This is the layout in 0.3.5 + # Keep these lists consistent: + # - OWNED_TOR_C_FILES in Makefile.am + # - CHECK_FILES in pre-commit.git-hook and pre-push.git-hook + # - try_parse in check_cocci_parse.sh CHECK_FILES="$($CHECK_FILTER \ src/lib/*/*.[ch] \ src/core/*/*.[ch] \ diff --git a/scripts/git/pre-push.git-hook b/scripts/git/pre-push.git-hook index 6a85e951a..8b5efb0a9 100755 --- a/scripts/git/pre-push.git-hook +++ b/scripts/git/pre-push.git-hook @@ -65,6 +65,10 @@ do # files if [ -d src/lib ]; then # This is the layout in 0.3.5 + # Keep these lists consistent: + # - OWNED_TOR_C_FILES in Makefile.am + # - CHECK_FILES in pre-commit.git-hook and pre-push.git-hook + # - try_parse in check_cocci_parse.sh CHECK_FILES="$($CHECK_FILTER \ src/lib/*/*.[ch] \ src/core/*/*.[ch] \ @@ -81,7 +85,7 @@ do src/or/*/*.[ch] \ src/test/*.[ch] \ src/test/*/*.[ch] \ - src/tools/*.[ch] + src/tools/*.[ch] \ )" fi

1 0

[tor-browser/tor-browser-68.3.0esr-9.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by sysrqb＠torproject.org 19 Dec '19

19 Dec '19

commit 4b45c970c7391af1d3a0b2e566d68247d34b6190 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 16 19:55:20 2019 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes bug 31134. --- browser/app/profile/000-tor-browser.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index d02b4e13a2d9..fb99eb6ed7d1 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -226,9 +226,6 @@ pref("browser.policies.testing.disallowEnterprise", true); // Security slider pref("svg.in-content.enabled", true); pref("mathml.disabled", false); -// Mozilla keeps still finding critical bugs in Graphite code. Disable it for -// now, see bug 21726. -pref("gfx.font_rendering.graphite.enabled", false); // Network and performance pref("security.ssl.enable_false_start", true);

1 0

[tor-browser/tor-browser-68.3.0esr-9.5-1] fixup! Pick up latest Torbutton code
by sysrqb＠torproject.org 19 Dec '19

19 Dec '19

commit 4fc2f6a58eb31619a7c2b5882e47f7a95750b57b Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Dec 19 21:56:13 2019 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index d0b975620a1b..21f126b9e971 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit d0b975620a1bcb5988f09c02d5f6f06ed34710ea +Subproject commit 21f126b9e971549dc294fad450fb415da1d3ed43

1 0