[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 2933c371887d07704fd6101b82302a8b952d638c Merge: f3ba71bbee 8a17999da3 Author: Nick Mathewson Date: Wed Feb 3 13:39:28 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 "ours" to avoid version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 903bfc4eca6a02c56db66c708f3f102129a470df Merge: 36b51a1c71 e50648582b Author: David Goulet Date: Wed Feb 3 08:54:40 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 src/core/or/connection_edge.c | 2 +- src/feature/nodelist/nodelist.c | 63 - src/feature/nodelist/nodelist.h | 3 +- src/test/test_address_set.c | 12 4 files changed, 57 insertions(+), 23 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 61e38deb56bc36b28efb0c552e63d031675a8334 Merge: eda81ea27e 890a9e89ba Author: David Goulet Date: Wed Feb 3 09:11:14 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 src/core/or/address_set.c | 75 --- src/core/or/address_set.h | 15 -- 2 files changed, 90 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit eda81ea27ee72682d5533ee072cdf1061becfdc9 Merge: 903bfc4eca cc5d5a5d1e Author: David Goulet Date: Wed Feb 3 08:56:38 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 src/core/or/connection_edge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 36b51a1c716200c65f5bb9f233c461208a8d924c Merge: b2434d30d2 0f8195406e Author: David Goulet Date: Wed Feb 3 08:51:37 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 src/core/or/connection_edge.c | 12 src/feature/nodelist/nodelist.c | 8 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit ea380162025d392803a96d331c8dc64bef56f2e7 Merge: be81ecba3a 79cb47cfc2 Author: David Goulet Date: Thu Jan 28 12:46:31 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug33781 | 7 +++ src/lib/fs/files.c | 8 +--- src/test/test_util.c | 49 + 3 files changed, 61 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit be81ecba3a770690d949aa0b71a8e88c90752199 Merge: a3f2bc8f13 f058db1f3d Author: David Goulet Date: Thu Jan 28 12:42:31 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug40190 | 4 src/core/proto/proto_socks.c | 7 ++- 2 files changed, 10 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit a3f2bc8f13eaa0868192b80186710c0765f26c59 Merge: 2c4a2a93d3 f3da5f88d7 Author: David Goulet Date: Thu Jan 28 12:36:42 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug40210 | 5 + src/ext/keccak-tiny/keccak-tiny.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 2c4a2a93d34087afa833b25562341ba02276009c Merge: 1887231afb dd5fbc1bd9 Author: David Goulet Date: Thu Jan 28 12:14:10 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit ed0fcfd2b8804e639fc859b7e63e57d7e52747f5 Merge: 737cd79c42 6186288eb6 Author: David Goulet Date: Thu Jan 28 12:08:21 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 737cd79c42576ce47db89e2f2b7bc2f95ba363a2 Merge: f8fea8b979 a17be1b5b6 Author: David Goulet Date: Thu Jan 28 12:04:42 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/ticket40165| 5 + changes/ticket40170| 3 +++ configure.ac | 19 ++- src/lib/crypt_ops/compat_openssl.h | 5 - src/lib/crypt_ops/crypto_openssl_mgt.c | 13 +++-- src/lib/crypt_ops/crypto_openssl_mgt.h | 3 +-- src/test/test_tortls_openssl.c | 3 +-- 7 files changed, 39 insertions(+), 12 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit bcb8afe38e7a79cc3d9bffb3ffdcf772202aba43 Merge: 09a1a34ad1 c3ed4b2e56 Author: Nick Mathewson Date: Thu Jan 28 11:18:30 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 "ours" to avoid version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 09a1a34ad1167fd0c9c97b323fa4e227394bd41f Merge: 2a3cf37450 641dce2d6b Author: David Goulet Date: Thu Jan 21 16:18:43 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitignore | 1 + 1 file changed, 1 insertion(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 2a3cf374508f48adc45b6cc6825dd341a71f5a0b Merge: d54cd853ad c09f8da8a9 Author: David Goulet Date: Thu Jan 21 16:06:54 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitignore | 3 +++ Makefile.am| 14 ++ changes/ticket40227| 4 scripts/maint/gen_ccls_file.sh | 20 4 files changed, 41 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit d54cd853ad22ae02b3b41a10b3f19455f8ae Merge: 4c82c2d1d4 9b390a556e Author: Nick Mathewson Date: Tue Jan 19 12:53:52 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 4c82c2d1d4a9800f82bcc47c227a8e6a2a0d168d Merge: 61ee17eb1e a22bfe04bc Author: Nick Mathewson Date: Tue Jan 19 12:49:22 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/40241_v2| 4 src/core/or/channeltls.c| 4 +--- src/core/or/circuitlist.c | 4 +--- src/feature/client/entrynodes.c | 4 +--- src/feature/rend/rendclient.c | 4 +--- src/lib/log/util_bug.h | 11 +++ 6 files changed, 19 insertions(+), 12 deletions(-) diff --cc src/lib/log/util_bug.h index 6b27b36f03,d9dbc7ee09..684dc7c6dd --- a/src/lib/log/util_bug.h +++ b/src/lib/log/util_bug.h @@@ -247,15 -240,20 +247,26 @@@ IF_BUG_ONCE__(ASSERT_PREDICT_UNLIKELY_(cond), \ IF_BUG_ONCE_VARNAME__(__LINE__)) +#endif /* defined(ALL_BUGS_ARE_FATAL) || ... */ + + /** + * Use this macro after a nonfatal assertion, and before a case statement + * where you would want to fall through. + */ + #ifdef ALL_BUGS_ARE_FATAL + #define FALLTHROUGH_UNLESS_ALL_BUGS_ARE_FATAL \ + abort() + #else + #define FALLTHROUGH_UNLESS_ALL_BUGS_ARE_FATAL FALLTHROUGH + #endif + -/** Define this if you want Tor to crash when any problem comes up, - * so you can get a coredump and track things down. */ -// #define tor_fragile_assert() tor_assert_unreached(0) +/** In older code, we used tor_fragile_assert() to mark optional failure + * points. At these points, we could make some debug builds fail. + * (But release builds would continue.) + * + * To get the same behaviour in recent tor versions, define + * ALL_BUGS_ARE_FATAL, and use any non-fatal assertion or *BUG() macro. + */ #define tor_fragile_assert() tor_assert_nonfatal_unreached_once() void tor_assertion_failed_(const char *fname, unsigned int line, ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 61ee17eb1e3b0c7b92bfa80f3f0f7cbb986db71b Merge: 5a822b462a 17eb635532 Author: David Goulet Date: Wed Jan 13 10:38:05 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitignore | 3 +++ 1 file changed, 3 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 5a822b462aaa8cf3cd749c253bb1e9e5f4f37fa2 Merge: 77bb4b0838 4b39f46a61 Author: Nick Mathewson Date: Mon Jan 11 14:37:29 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/40241 | 4 src/core/or/channeltls.c| 3 ++- src/core/or/circuitlist.c | 2 ++ src/feature/client/entrynodes.c | 2 ++ src/feature/rend/rendclient.c | 2 ++ 5 files changed, 12 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 77bb4b0838da1d1c1cb7d2d47b02954abeb00a21 Merge: 9001732394 2e7cbd7a9c Author: Alexander Færøy Date: Thu Nov 19 17:43:59 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug40179_part2 | 4 src/test/test_config.c | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 90017323942dc56b23d98c34894542e30856aeac Merge: 3f1544bbd9 7c0778ef7e Author: Nick Mathewson Date: Mon Nov 16 22:42:22 2020 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug40179_part1 | 4 src/test/hs_ntor_ref.py | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 09b4c73fe499c185bcdddb40e949185a51003d40 Merge: 494ced690d fd22fa183b Author: Nick Mathewson Date: Thu Nov 12 08:12:20 2020 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 "ours" to avoid version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 494ced690d4db09b5660472df490f9c8512c2684 Merge: 210a94b231 3d3dc08ed8 Author: Nick Mathewson Date: Mon Nov 9 17:13:41 2020 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 "-s ours" to avoid version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit ec0f000445fdc3fd7809032c763b67880a6391c4 Merge: b0e6ec627c 0b2c64effd Author: Nick Mathewson Date: Mon Nov 9 16:17:42 2020 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug40080 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/channel.h | 3 +++ src/core/or/circuitbuild.c | 24 4 files changed, 30 insertions(+), 5 deletions(-) diff --cc src/core/or/channel.h index 82d89471b4,becb0c973a..fa4ce4f703 --- a/src/core/or/channel.h +++ b/src/core/or/channel.h @@@ -735,6 -733,11 +735,9 @@@ int channel_is_outgoing(channel_t *chan void channel_mark_client(channel_t *chan); void channel_clear_client(channel_t *chan); int channel_matches_extend_info(channel_t *chan, extend_info_t *extend_info); + int channel_remote_identity_matches(const channel_t *chan, + const char *rsa_id_digest, + const ed25519_public_key_t *ed_id); -int channel_matches_target_addr_for_extend(channel_t *chan, - const tor_addr_t *target); unsigned int channel_num_circuits(channel_t *chan); MOCK_DECL(void,channel_set_circid_type,(channel_t *chan, crypto_pk_t *identity_rcvd, ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit b0e6ec627cb76478507a746090b64c0458723460 Merge: 26cfac1880 4876409c2a Author: Alexander Færøy Date: Wed Oct 28 15:39:37 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 changes/ticket40133 | 5 ++ src/core/or/protover.c | 4 +- src/rust/protover/errors.rs | 2 +- src/rust/protover/protoset.rs | 20 +--- src/rust/protover/protover.rs | 10 ++-- src/rust/protover/tests/protover.rs | 60 +++- src/test/test_protover.c| 91 + 7 files changed, 66 insertions(+), 126 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit ef70f5f42a875c8d1d1280c6ef6f86d01983b6ef Merge: 96b69152ce 8e7778ec8a Author: Nick Mathewson Date: Wed Oct 7 09:29:17 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 96b69152ce72bce001fd711958b72c75a486eafa Merge: 0e2e517019 40f0db75bd Author: Nick Mathewson Date: Wed Oct 7 08:38:30 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 0e2e517019bf3c8779c9a3f81e453277a372c9f3 Merge: faac186075 884cad3edf Author: Nick Mathewson Date: Wed Oct 7 08:35:18 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug34400 | 5 + src/feature/control/control_cmd.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit faac18607521380ff330a6e0b207e7b1d3d35384 Merge: ad62cf2ac9 3e9fa5a029 Author: Nick Mathewson Date: Wed Oct 7 08:29:32 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit ad62cf2ac9100c66dcd51f0adbb22ff4bc64faa4 Merge: a44bcc309d 701a1936fa Author: Nick Mathewson Date: Wed Oct 7 08:26:04 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit a44bcc309d3dea5f61306b6f2b2c55f85ce4382b Merge: c65f4eaf06 a49373844c Author: Nick Mathewson Date: Wed Oct 7 08:16:19 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit c65f4eaf06c8bc1317a5fb588a81ee3c3844fcdb Merge: 8505dd5e37 9587512578 Author: Nick Mathewson Date: Wed Oct 7 08:10:08 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 8505dd5e372a055014b9305171a5b4b707746120 Merge: 30c6b42d34 902982 Author: Nick Mathewson Date: Wed Oct 7 08:08:02 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/ticket40073| 3 +++ src/core/mainloop/connection.c | 9 - 2 files changed, 11 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 30c6b42d3447bb8c00eba7fc1c53cb5b2c5ecbc5 Merge: 7097d1bab9 8a561fc5bf Author: Nick Mathewson Date: Wed Oct 7 08:05:40 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 7097d1bab91cc2a9fe0e7b450cd5171d494e8d19 Merge: a914ac5d7c b5a88e8d47 Author: Nick Mathewson Date: Wed Oct 7 08:02:18 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit b6429430c65211b045ac227b412161318ff35d0d Merge: 1cce0588e1 beffad8529 Author: David Goulet Date: Tue Sep 22 13:47:08 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/ticket40135 | 3 +++ src/feature/hs_common/shared_random_client.c | 4 2 files changed, 3 insertions(+), 4 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 1cce0588e10b952d6acff8e55365011bdabbefdb Merge: 09813fe31e 0d78fbb718 Author: Nick Mathewson Date: Mon Sep 21 12:59:03 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitlab-ci.yml | 46 ++ scripts/ci/ci-driver.sh | 20 2 files changed, 66 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 09813fe31e506daf16fe29d830aef848f16ac18f Merge: 2e3603d96d b643ced022 Author: Nick Mathewson Date: Fri Sep 18 19:06:16 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitlab-ci.yml | 27 ++- scripts/ci/ci-driver.sh | 5 + 2 files changed, 31 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 2e3603d96d156348b2c591a28b8861babfd53ddd Merge: 54cd2578ef 2ddbfc64af Author: David Goulet Date: Fri Sep 18 09:45:25 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/ticket40126 | 4 src/test/test_rendcache.c | 1 + 2 files changed, 5 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 54cd2578efa9137bac3220230345c6f4121be20b Merge: bf5bf33661 078194ecaf Author: Nick Mathewson Date: Thu Sep 17 13:56:40 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/ticket40125 | 4 src/test/test_rendcache.c | 2 ++ 2 files changed, 6 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit ef18fb56c95c7761017eb8bb36a97415d7bb82ce Merge: 26b257757b 7915b651d9 Author: Nick Mathewson Date: Thu Aug 13 14:20:39 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug40099 | 4 src/test/test_rendcache.c | 1 + 2 files changed, 5 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 9d77ed7be2da18bef3ab1258f277c527347a94a7 Merge: f98b1988ec 34919368ce Author: Nick Mathewson Date: Wed Aug 12 20:21:04 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitlab-ci.yml | 34 +- scripts/ci/ci-driver.sh | 34 +++--- 2 files changed, 52 insertions(+), 16 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit f98b1988ec5ca1eb3d2923faf43c1df7541efafb Merge: 670f5632a5 309eafbc3c Author: Nick Mathewson Date: Wed Aug 12 12:29:17 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitlab-ci.yml | 36 --- Makefile.am | 2 ++ scripts/ci/ci-driver.sh | 77 + 3 files changed, 67 insertions(+), 48 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 670f5632a54e5ae119e9d92eaebc583aab3fe0d1 Merge: 537be1da33 489d33e190 Author: Nick Mathewson Date: Wed Aug 12 08:40:10 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 "ours" merge to avoid MR 122 -- we already merged MR 123. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 2b968446d9c0634a6fb3305a10879b4f29684877 Merge: 673d02bdb0 0ec2d1528c Author: Nick Mathewson Date: Tue Aug 11 12:37:08 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitlab-ci.yml | 5 +++-- scripts/ci/ci-driver.sh | 27 ++- 2 files changed, 29 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 673d02bdb0517cc9867d0f67aec887f71e6d1ce5 Merge: 2a7e71c956 6bee9bd481 Author: Nick Mathewson Date: Tue Aug 11 11:03:24 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 scripts/ci/ci-driver.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit d83703317d8dc9ca9118c161cf4e383b3d121084 Merge: ab9c35f043 262ddfee7a Author: Nick Mathewson Date: Tue Aug 11 10:44:40 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitlab-ci.yml | 5 + scripts/ci/ci-driver.sh | 5 + 2 files changed, 10 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 7d80bf80fe9017e04fff4b588f49d0393332ebee Merge: c1b440f760 f3fcc89d05 Author: Nick Mathewson Date: Mon Aug 10 19:33:07 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitlab-ci.yml| 120 ++-- scripts/ci/ci-driver.sh | 424 ++ src/feature/rend/rendclient.c | 4 +- 3 files changed, 533 insertions(+), 15 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit c1b440f7606303225b20e7a7a893afe6ecbc504e Merge: 18d2c7c5d7 39d5e7c764 Author: Nick Mathewson Date: Thu Aug 6 13:24:12 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 4c22050de14244418b1b3dbce124544e7fb40e4a Merge: b4400e2093 e78a7450a2 Author: Alexander Færøy Date: Fri Jul 31 02:03:35 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 0c8c295963b5389684d3b41e9260f7fbba4dfe2a Merge: c7502b6503 3b8bf743ae Author: Nick Mathewson Date: Wed Jul 29 12:37:08 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 31eba7f009367cd51e5bf5189a3a4f4ca7b404ac Merge: 95914ceb57 97d0cb83ed Author: Nick Mathewson Date: Mon Jul 27 12:56:19 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 07934664c56f3b5b9f500d2906b0cd7c7b39ec31 Merge: 1ee164afc2 6354b70e49 Author: Nick Mathewson Date: Thu Jul 23 10:09:14 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/ticket40061 | 5 + src/app/config/fallback_dirs.inc | 503 ++- 2 files changed, 238 insertions(+), 270 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 515d4f1e93bcf9160c8b41d5a90b3144388f706f Merge: eb427f309c 0acc3ae879 Author: David Goulet Date: Mon Jul 13 15:03:34 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 Makefile.am | 3 +-- changes/ticket40030 | 7 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --cc Makefile.am index 1a1fa9b658,3b30c01f00..8a26c6403b --- a/Makefile.am +++ b/Makefile.am @@@ -273,13 -271,8 +273,12 @@@ check-local: check-spaces\ check-changes \ check-includes \ + check-best-practices\ - shellcheck \ - check-cocci + shellcheck +# test-network requires a copy of Chutney in $CHUTNEY_PATH. +# Chutney can be cloned from https://git.torproject.org/chutney.git . +.PHONY: need-chutney-path need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \ echo '$$CHUTNEY_PATH was not set.'; \ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit eb6fc9f9bd89a02088af1cfa6fb4e39fe15ea9fc Merge: 3efd60474 3517d2032 Author: Nick Mathewson Date: Thu Jul 9 13:15:23 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 `-s ours` to avoid version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit f9f4c4ab1d37920eb76b024a1057a0b26ddb8377 Merge: e500ea2ea 7ba849349 Author: Nick Mathewson Date: Thu Jul 9 10:31:16 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 `-s ours` to avoid version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 0f39cc10f65df9fa52123eb607f5f1474c10e58b Merge: 1af7f40da af08dad6d Author: Nick Mathewson Date: Thu Jul 9 09:28:53 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug33119 | 4 +++ src/lib/tls/tortls_nss.c | 47 +++ src/test/test_tortls.c | 73 ++ src/test/test_tortls_openssl.c | 70 4 files changed, 118 insertions(+), 76 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 9603d8af0b36dc8faf297c2a300becebfc2f721b Merge: d4c79cae7 c364e0e83 Author: Alexander Færøy Date: Wed Jul 8 00:36:48 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug40028 | 3 +++ src/lib/tls/x509.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit d4c79cae76536673184ffd4f6116bcd07fd0b1f5 Merge: 05ca50c9a a213d2793 Author: Alexander Færøy Date: Tue Jul 7 14:48:36 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 .appveyor.yml | 2 +- changes/ticket40026 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 8da10e8237df074194594823e6102f7bc6e811ae Merge: 0d02c053f 5a5ff3d8c Author: David Goulet Date: Thu Jul 2 07:20:58 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug16016 | 4 src/feature/nodelist/routerlist.c | 6 +- 2 files changed, 9 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 0d02c053f84cbbca6c373ccea5b2174e6c62e3c4 Merge: 9638c6d7a 1932a84ef Author: George Kadianakis Date: Wed Jul 1 12:55:03 2020 +0300 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/ticket33346 | 3 +++ src/lib/sandbox/sandbox.c | 3 +++ 2 files changed, 6 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 9638c6d7a7c9de5336eab16eb013f97a62c75022 Merge: 0d5152fc5 322abd4fd Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 0d5152fc532a6a6738023d01b9a5b89db6ac7757 Merge: bb5745d65 5a38c73f7 Author: Alexander Færøy Date: Tue Jun 30 14:19:44 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit bb5745d6568ffcaebbe0c69d8e6865ba5eb163ca Merge: 572cf774b fb46d1bb3 Author: Alexander Færøy Date: Tue Jun 30 14:16:16 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 572cf774b974edc83631e8f59dfe18e39f093571 Merge: aced9be22 38f3cf410 Author: Alexander Færøy Date: Tue Jun 30 14:03:04 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit aced9be2243e823be3b3d771ae2dc59514fb5eba Merge: 21cf91ee2 2042ebe88 Author: Alexander Færøy Date: Tue Jun 30 13:48:49 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 21cf91ee2c3bb664253cc096c1aaa45fd491594e Merge: feddba6f8 c57896a76 Author: Alexander Færøy Date: Tue Jun 30 13:37:20 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit feddba6f8b5af92cc7618d09c99b3290d7372174 Merge: b2ce815bd eef77227e Author: Nick Mathewson Date: Mon Jun 29 13:57:50 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit b2ce815bd8ddcde2ea49b0020b3feda83d88444f Merge: 9e85515f8 d124cfc05 Author: Nick Mathewson Date: Mon Jun 29 13:56:16 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 9e85515f8335428242f0f1751de1e03077fb0133 Merge: 6fb31bb34 31bdfd492 Author: Nick Mathewson Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 6fb31bb34a92d35d1c74af976a46bace4fcccf35 Merge: 41a424390 f862971d0 Author: Nick Mathewson Date: Mon Jun 29 12:58:50 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 41a424390107f62a754f7344f23ffe9958e00c6d Merge: 2c61f22e4 3008255ae Author: Nick Mathewson Date: Mon Jun 29 12:56:50 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 2c61f22e438d5ba13ace278af5c9c1005dde58f1 Merge: 68d848e24 183d0d30d Author: Nick Mathewson Date: Mon Jun 29 12:55:35 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
commit 75734f48aabb955ed39c42dfd37849a7fa3df423 Merge: 52edea121 272c17113 Author: David Goulet Date: Fri Jun 12 12:55:41 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .travis.yml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit 1d32c3114fa3ebcd4219eba6ad7bb2a57b878511 Merge: f548f1475 754d4e9a1 Author: Nick Mathewson Date: Fri Jun 5 12:37:30 2020 -0400 Merge branch 'maint-0.4.3' .appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit 3ec65c0826991b1dbb96a6ca5bd9002df4a0bfad Merge: 22a26a273 6b05d447b Author: George Kadianakis Date: Tue Jun 2 14:05:43 2020 +0300 Merge branch 'maint-0.4.3' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit b6e60f26dd04fa4f2ae8020b4148147380b6d28b Merge: 5922087ea 688d1b3f0 Author: Nick Mathewson Date: Mon Jun 1 09:48:56 2020 -0400 Merge branch 'maint-0.4.3' changes/bug34299 | 3 +++ doc/tor.1.txt| 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --cc doc/tor.1.txt index 3dd7f5a64,88cf47f2f..7b3150e2a --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@@ -3014,54 -3007,19 +3014,54 @@@ on the public Tor network and their target user audience can periodically fetch the list of available community bridges to stay up-to-date. (Default: not set) -[[V3AuthVotingInterval]] **V3AuthVotingInterval** __N__ **minutes**|**hours**:: -V3 authoritative directories only. Configures the server's preferred voting -interval. Note that voting will __actually__ happen at an interval chosen -by consensus from all the authorities' preferred intervals. This time -SHOULD divide evenly into a day. (Default: 1 hour) +[[ConsensusParams]] **ConsensusParams** __STRING__:: +STRING is a space-separated list of key=value pairs that Tor will include +in the "params" line of its networkstatus vote. -[[V3AuthVoteDelay]] **V3AuthVoteDelay** __N__ **minutes**|**hours**:: -V3 authoritative directories only. Configures the server's preferred delay -between publishing its vote and assuming it has all the votes from all the -other authorities. Note that the actual time used is not the server's -preferred time, but the consensus of all preferences. (Default: 5 minutes) +[[DirAllowPrivateAddresses]] **DirAllowPrivateAddresses** **0**|**1**:: +If set to 1, Tor will accept server descriptors with arbitrary "Address" +elements. Otherwise, if the address is not an IP address or is a private IP +address, it will reject the server descriptor. Additionally, Tor +will allow exit policies for private networks to fulfill Exit flag +requirements. (Default: 0) + +[[GuardfractionFile]] **GuardfractionFile** __FILENAME__:: +V3 authoritative directories only. Configures the location of the +guardfraction file which contains information about how long relays +have been guards. (Default: unset) -[[V3AuthDistDelay]] **V3AuthDistDelay** __N__ **minutes**|**hours**:: +[[MinMeasuredBWsForAuthToIgnoreAdvertised]] **MinMeasuredBWsForAuthToIgnoreAdvertised** __N__:: +A total value, in abstract bandwidth units, describing how much +measured total bandwidth an authority should have observed on the network +before it will treat advertised bandwidths as wholly +unreliable. (Default: 500) + +[[MinUptimeHidServDirectoryV2]] **MinUptimeHidServDirectoryV2** __N__ **seconds**|**minutes**|**hours**|**days**|**weeks**:: - Minimum uptime of a v2 hidden service directory to be accepted as such by - authoritative directories. (Default: 25 hours) ++Minimum uptime of a relay to be accepted as a hidden service directory ++by directory authorities. (Default: 96 hours) + +[[RecommendedClientVersions]] **RecommendedClientVersions** __STRING__:: +STRING is a comma-separated list of Tor versions currently believed to be +safe for clients to use. This information is included in version 2 +directories. If this is not set then the value of **RecommendedVersions** +is used. When this is set then **VersioningAuthoritativeDirectory** should +be set too. + +[[RecommendedServerVersions]] **RecommendedServerVersions** __STRING__:: +STRING is a comma-separated list of Tor versions currently believed to be +safe for servers to use. This information is included in version 2 +directories. If this is not set then the value of **RecommendedVersions** +is used. When this is set then **VersioningAuthoritativeDirectory** should +be set too. + +[[RecommendedVersions]] **RecommendedVersions** __STRING__:: +STRING is a comma-separated list of Tor versions currently believed to be +safe. The list is included in each directory, and nodes which pull down the +directory learn whether they need to upgrade. This option can appear +multiple times: the values from multiple lines are spliced together. When +this is set then **VersioningAuthoritativeDirectory** should be set too. + +[[V3AuthDistDelay]] **V3AuthDistDelay** __N__ **seconds**|**minutes**|**hours**:: V3 authoritative directories only. Configures the server's preferred delay between publishing its consensus and signature and assuming it has all the signatures from all the other authorities. Note that the actual time used ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit 5d79b43717608b769ffda0a297bc0306bcceaa98 Merge: 8d8a9d7f1 6891d1bbc Author: George Kadianakis Date: Thu May 28 12:52:48 2020 +0300 Merge branch 'maint-0.4.3' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit 9b55a62e732afe95238221378b22de1386c7adda Merge: 32e791be0 bdb3be011 Author: Nick Mathewson Date: Tue May 19 09:39:12 2020 -0400 Merge branch 'maint-0.4.3' changes/ticket34255_043| 3 +++ src/lib/conf/confdecl.h| 6 +++--- src/lib/container/smartlist.c | 2 +- src/lib/string/compat_ctype.c | 1 + src/lib/wallclock/time_to_tm.c | 1 + 5 files changed, 9 insertions(+), 4 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit 8d59897e58ab5c79cf7b981d05b8244a68eaf9ac Merge: 85cfd04c0 c0dd2a6e3 Author: Nick Mathewson Date: Fri May 15 09:02:30 2020 -0400 Merge branch 'maint-0.4.3' "ours" to avoid version bump ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit ec2f6d69d7327381656ef6a5b1005aeb7247dcc3 Merge: 8d59897e5 bcaf480ae Author: Nick Mathewson Date: Fri May 15 10:25:27 2020 -0400 Merge branch 'maint-0.4.3' configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit db4815dd8e7477803bc29c89284a7641b20ab5ba Merge: ec2f6d69d 6f2b6ede1 Author: Nick Mathewson Date: Fri May 15 10:28:36 2020 -0400 Merge branch 'maint-0.4.3' changes/bug34233 | 4 1 file changed, 4 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit fbd384cf893bb675157fa754014ec63ffa2f5d61 Merge: bbfdee4c4 75fc33f33 Author: Nick Mathewson Date: Thu May 14 10:38:18 2020 -0400 Merge branch 'maint-0.4.3' "ours" to avoid 0.4.3.5 version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit 371d5ece5b3243538637ceef2d5e91b944d12420 Merge: 1557e73c8 ee6409ab6 Author: Nick Mathewson Date: Thu May 14 10:20:08 2020 -0400 Merge branch 'maint-0.4.3' .travis.yml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit 3a785dd5beeaadcd4205f24d6949fdbbdfb5651e Merge: e39b35f1d b444096be Author: Nick Mathewson Date: Wed May 6 17:17:19 2020 -0400 Merge branch 'maint-0.4.3' changes/bug34131 | 4 src/core/or/connection_edge.c | 6 -- src/core/or/connection_or.c| 1 + src/feature/control/btrack_orconn_cevent.c | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit e39b35f1de689fd1ad1ad3a6a902bf6371e6f5ce Merge: 4a2347d29 ae1ebb5f4 Author: Nick Mathewson Date: Wed May 6 16:58:12 2020 -0400 Merge branch 'maint-0.4.3' changes/bug34078 | 5 + 1 file changed, 5 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit 4a2347d2902c2688e766e4a83a5db69847b7b578 Merge: 42246f8c9 c11672820 Author: Nick Mathewson Date: Wed May 6 16:55:41 2020 -0400 Merge branch 'maint-0.4.3' Amazingly, this time we had no merge conflicts with "falls through" comments. src/app/config/quiet_level.c | 2 +- src/core/or/channeltls.c | 2 +- src/core/or/circuitbuild.c| 2 +- src/core/or/circuitlist.c | 2 +- src/core/or/circuituse.c | 2 +- src/core/or/connection_edge.c | 6 ++-- src/core/or/crypt_path.c | 2 +- src/core/or/onion.c | 2 +- src/core/or/policies.c| 2 +- src/core/or/reasons.c | 2 +- src/core/or/relay.c | 2 +- src/core/or/scheduler.c | 4 +-- src/core/or/sendme.c | 2 +- src/core/proto/proto_socks.c | 4 +-- src/ext/csiphash.c| 14 - src/ext/ed25519/donna/modm-donna-32bit.h | 48 +++ src/ext/ed25519/donna/modm-donna-64bit.h | 24 src/feature/client/entrynodes.c | 2 +- src/feature/control/control_cmd.c | 2 +- src/feature/dirclient/dirclient.c | 2 +- src/feature/dirparse/parsecommon.c| 2 +- src/feature/relay/dns.c | 2 +- src/feature/rend/rendclient.c | 2 +- src/lib/crypt_ops/crypto_digest_nss.c | 26 - src/lib/crypt_ops/crypto_digest_openssl.c | 10 +++ src/test/test_socks.c | 2 +- 26 files changed, 86 insertions(+), 86 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit 82effefb69defc757ed2f576d40badbd8460f757 Merge: 42dfcd0ae fecc5fd38 Author: Nick Mathewson Date: Wed May 6 16:47:03 2020 -0400 Merge branch 'maint-0.4.3' configure.ac | 16 src/core/proto/proto_socks.c | 5 - src/ext/ed25519/donna/ed25519_tor.c | 4 +++- src/feature/dirauth/keypin.c | 2 +- src/feature/relay/dns.c | 2 +- src/lib/cc/compat_compiler.h | 6 ++ src/lib/crypt_ops/crypto_digest_nss.c | 2 +- src/lib/net/address.c | 1 + 8 files changed, 33 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit 42246f8c9aee97d3efb0b437369554a3fa6f6890 Merge: 82effefb6 2cd1c0765 Author: Nick Mathewson Date: Wed May 6 16:50:21 2020 -0400 Merge branch 'maint-0.4.3' src/feature/hs/hs_dos.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit f96b6ccee1945b2db32c858837ac21c6d81c820b Merge: 6dc9930d3 e61867416 Author: Nick Mathewson Date: Mon May 4 10:25:53 2020 -0400 Merge branch 'maint-0.4.3' changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- src/feature/hs/hs_client.c| 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit b2849f449b2efa4d6826166a92f35c7627d65f91 Merge: e3b1e617a 42507429c Author: Nick Mathewson Date: Tue Apr 21 12:22:37 2020 -0400 Merge branch 'maint-0.4.3' changes/bug33918 | 3 +++ src/core/or/channeltls.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit 202a57e45834a4a3a6c551b96b801b3ef1af1954 Merge: e96bd196a 2e80d7f19 Author: Nick Mathewson Date: Mon Apr 13 17:02:38 2020 -0400 Merge branch 'maint-0.4.3' "ours" to avoid version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit e22a8d9c956f838138a7e5bc0714b1bb99f0e2a5 Merge: 80031db32 55cb6c3fc Author: Nick Mathewson Date: Mon Apr 13 14:14:41 2020 -0400 Merge branch 'maint-0.4.3' changes/bug33545 | 4 src/feature/control/control_hs.c | 9 - src/feature/hs/hs_client.c | 7 +++ src/feature/hs/hs_client.h | 2 +- src/feature/hs/hs_descriptor.c | 8 ++-- src/test/test_hs_client.c| 4 src/test/test_hs_control.c | 14 ++ 7 files changed, 44 insertions(+), 4 deletions(-) diff --cc src/feature/hs/hs_descriptor.c index a39a4a09c,d1c81bbff..50a46fb40 --- a/src/feature/hs/hs_descriptor.c +++ b/src/feature/hs/hs_descriptor.c @@@ -1429,14 -1434,17 +1429,18 @@@ decrypt_descriptor_cookie(const hs_desc tor_assert(!fast_mem_is_zero( (char *) &desc->superencrypted_data.auth_ephemeral_pubkey, sizeof(desc->superencrypted_data.auth_ephemeral_pubkey))); - tor_assert(!fast_mem_is_zero((char *) client_auth_sk, - sizeof(*client_auth_sk))); - tor_assert(!fast_mem_is_zero((char *) desc->subcredential, DIGEST256_LEN)); + tor_assert(!fast_mem_is_zero((char *) desc->subcredential.subcred, + DIGEST256_LEN)); + /* Catch potential code-flow cases of an unitialized private key sneaking +* into this function. */ + if (BUG(fast_mem_is_zero((char *)client_auth_sk, sizeof(*client_auth_sk { + goto done; + } + /* Get the KEYS component to derive the CLIENT-ID and COOKIE-KEY. */ keystream_length = -build_descriptor_cookie_keys(desc->subcredential, DIGEST256_LEN, +build_descriptor_cookie_keys(&desc->subcredential, client_auth_sk, &desc->superencrypted_data.auth_ephemeral_pubkey, &keystream); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit 11fbd1f064751e38ccd79e7823adb688b1293e59 Merge: 25729910a bfea7a732 Author: Nick Mathewson Date: Thu Apr 9 08:38:59 2020 -0400 Merge branch 'maint-0.4.3' "ours" to avoid version bump ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit 25729910af31266f74e55f4a00ee86be188f92c3 Merge: 29693b83b c4da0a509 Author: Nick Mathewson Date: Thu Apr 9 08:33:36 2020 -0400 Merge branch 'maint-0.4.3' src/lib/sandbox/sandbox.c | 1 + 1 file changed, 1 insertion(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit f431b78465ca8f1339598aa81b85300528c29de3 Merge: 4e3a17fac 1ae0839ef Author: teor Date: Thu Apr 9 19:42:36 2020 +1000 Merge branch 'maint-0.4.3' "ours" merge, because we only want to remove check-best-practices from check-local in 0.4.2 and 0.4.3. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit 59819b2916ec6d405f9f905dfa5a79791c7cfa48 Merge: 9bd73da7c 2d6f00e45 Author: teor Date: Thu Apr 9 11:03:40 2020 +1000 Merge branch 'maint-0.4.3' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit 4e3a17facdf67dc5634f2899a7839b99b515fe63 Merge: 59819b291 f6efb3a18 Author: teor Date: Thu Apr 9 11:06:51 2020 +1000 Merge branch 'maint-0.4.3' "ours" merge, to avoid taking PR 1854, which reverts "Prefer IPv6 by default" for 0.4.3 only. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit c1bf819a31d729abee8cf1440cefb7b4776248cc Merge: 0b0b8a5b6 34faee060 Author: David Goulet Date: Wed Apr 8 09:42:13 2020 -0400 Merge branch 'maint-0.4.3' src/test/test_addr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit 7adf72f1b426d8fa6e9f7439e735ce1d38ae57fa Merge: 5c35bb38d 80a306c6e Author: teor Date: Sun Apr 5 17:17:51 2020 +1000 Merge branch 'maint-0.4.3' doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'maint-0.4.3'
commit 5c35bb38dfb07e58332a63d2705ea68d4392df2d Merge: 1e7597436 613077229 Author: teor Date: Sun Apr 5 17:12:11 2020 +1000 Merge branch 'maint-0.4.3' doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits