[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 1628af235e5fe06536ad6ec32bf87f2225c82d32 Merge: ef17aa0d8d 421ce94395 Author: David Goulet Date: Mon Jan 24 10:49:41 2022 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/fallbackdirs-2022-01-24 | 2 + changes/geoip-2022-01-24| 3 + configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/app/config/fallback_dirs.inc| 966 +- src/config/geoip| 19654 +- src/config/geoip6 | 13316 --- src/win32/orconfig.h| 2 +- 8 files changed, 21957 insertions(+), 11990 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 5c575c6f92c2563bb1ae4d639b40fe1e3680d3e2 Merge: ea4bc55f2e 72041c6306 Author: David Goulet Date: Tue Jan 18 13:07:30 2022 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket40509 | 4 src/core/or/protover.c | 12 ++-- src/test/test_protover.c | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit d2c55cea061ab12ce85c45f31c7b90d7b652af19 Merge: ef6568b832 501d8bbd4c Author: David Goulet Date: Tue Jan 18 13:15:38 2022 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 src/feature/relay/router.c | 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit ef6568b832333c709e3b99a63838754fd99e0c56 Merge: 5c575c6f92 e523480691 Author: David Goulet Date: Tue Jan 18 13:15:29 2022 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket40544 | 3 +++ src/app/main/main.c | 2 +- 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit ea4bc55f2ede71bb5b88a0e521c174a9cb37b676 Merge: e085591c98 4a24673436 Author: Alexander Færøy Date: Mon Nov 8 14:16:18 2021 + Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug40429| 5 + changes/ticket40511 | 6 ++ configure.ac| 14 +- 3 files changed, 24 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit e085591c98884296419f6b7d910d06bff7684de7 Merge: 37303de391 439e17180c Author: David Goulet Date: Fri Nov 5 10:33:53 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 src/core/or/protover.c| 113 +- src/core/or/protover.h| 4 ++ src/feature/dirauth/dirvote.c | 13 ++--- 3 files changed, 120 insertions(+), 10 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 37303de391e367da9b4be23b003e058a6c698726 Merge: 5117492620 cfd1482f78 Author: Alexander Færøy Date: Fri Nov 5 03:10:28 2021 + Merge branch 'maint-0.3.5' into release-0.3.5 .gitlab-ci.yml | 8 1 file changed, 8 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 5117492620609fd3ea940b1d5851670ba61e9320 Merge: 73f78a4888 1902edaf52 Author: David Goulet Date: Wed Nov 3 09:47:43 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 doc/asciidoc-helper.sh | 9 + scripts/ci/ci-driver.sh | 2 +- 2 files changed, 6 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 73f78a4888b3bb01a1586cba5aca8689655c58f5 Merge: f439d0fe44 5c8deef9b6 Author: Alexander Færøy Date: Fri Oct 29 16:56:32 2021 + Merge branch 'maint-0.3.5' into release-0.3.5 src/test/test_switch_id.c | 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit f439d0fe4430a1d4c114afc788a1e03999a70e51 Merge: e0a96cf2b6 92fedb9f44 Author: David Goulet Date: Fri Oct 29 09:20:21 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 Makefile.am| 4 changes/ticket26299| 3 +++ doc/asciidoc-helper.sh | 4 +++- doc/nofooter.conf | 3 +++ 4 files changed, 13 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit e0a96cf2b6d2c21e0c8db0a285c0a86286e47821 Merge: e51b25c02d fa438b6cf0 Author: David Goulet Date: Thu Oct 28 09:42:43 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 2 files 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit e51b25c02d44b8ff7f6b84951e0cd90cc100589c Merge: e33c6717b8 14385ce71e Author: David Goulet Date: Tue Oct 26 14:33:48 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 scripts/ci/ci-driver.sh | 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit e33c6717b8a453485d5813bcf61ec68a79d06035 Merge: df6e03a092 66193ee708 Author: David Goulet Date: Tue Oct 26 11:31:45 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit df6e03a09268d5996295dd61cbee3e4845395c6e Merge: 08e4b8d2fc 9280f32fc0 Author: David Goulet Date: Tue Oct 26 09:18:08 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit c0c34004993daebb4403bf095e2c853fc375b79a Merge: 2a247f4255 66e8e0f71b Author: David Goulet Date: Thu Oct 21 10:01:38 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket40493 | 2 + src/app/config/fallback_dirs.inc | 951 +++ 2 files changed, 472 insertions(+), 481 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 2a247f425556a72b9652360635638e383d06d603 Merge: 46de5eb054 7372739765 Author: Alexander Færøy Date: Wed Oct 20 21:44:56 2021 + Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket30477| 4 src/feature/relay/router.c | 23 +++ src/feature/relay/router.h | 1 + 3 files changed, 28 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 46de5eb054cfdcedad0f7971d9a0defbd5e21db0 Merge: a9913435bc 5a043825d0 Author: Alexander Færøy Date: Wed Oct 20 17:36:06 2021 + Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug40371| 6 ++ src/feature/relay/dns.c | 9 - 2 files changed, 6 insertions(+), 9 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit a9913435bc66e5f0ec539c9ce6f72a3e52aa4f08 Merge: bc106b9e16 44e105c27f Author: David Goulet Date: Tue Oct 19 10:24:24 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket40476 | 8 ++ src/core/or/connection_edge.c | 3 - src/feature/control/control.c | 40 src/feature/dircache/dircache.c | 58 +--- src/feature/hs/hs_common.h | 2 +- src/feature/hs/hs_config.c | 10 +- src/feature/hs/hs_intropoint.c | 3 +- src/test/include.am | 11 +-- src/test/test_dir_handle_get.c | 74 +-- src/test/test_entryconn.c | 41 - src/test/test_hs_common.c | 9 +- src/test/test_hs_config.c | 199 +--- src/test/test_hs_intropoint.c | 64 - src/test/test_hs_service.c | 5 +- 14 files changed, 72 insertions(+), 455 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit bc106b9e168730efa406b209acc7625c9c2e0133 Merge: 2d54f2002a fcef8e3f75 Author: David Goulet Date: Mon Sep 13 13:25:23 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 .gitlab-ci.yml| 9 ++- src/test/test_switch_id.c | 60 --- 2 files changed, 65 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 2d54f2002a26bc84a41d15ab62b78abdfbc13f82 Merge: 15139a1c00 a8ce645ab0 Author: David Goulet Date: Mon Aug 16 16:34:52 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 16eb4d4c8bef4210b1c2cb57393b550cd271febd Merge: c62d13fd8f b07cd2ee90 Author: Alexander Færøy Date: Mon Aug 16 13:58:31 2021 + Merge branch 'maint-0.3.5' into release-0.3.5 .gitlab-ci.yml | 16 1 file changed, 8 insertions(+), 8 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit a2e39fa3b014dda71d6d6ece1cb7f8e114fd1c06 Merge: 4f20c0d9d4 2984fba97a Author: Nick Mathewson Date: Mon Aug 16 08:21:28 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 4f20c0d9d4e1b2023053b384e15f770dc2fe670d Merge: b3ec9e961e 041a0a362f Author: David Goulet Date: Fri Aug 13 09:48:50 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit f55edf5b34852289c34d023a1a72494c184f424e Merge: a141b355a1 eca5b62213 Author: David Goulet Date: Thu Aug 12 12:13:25 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/geoip-2021-08-12 | 3 + src/config/geoip | 11954 +++-- src/config/geoip6| 7433 +--- 3 files changed, 11890 insertions(+), 7500 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit a141b355a16b96dd477af18f2949bceb2465c504 Merge: ae6ab63f24 7e0971d868 Author: Alexander Færøy Date: Wed Aug 11 13:15:58 2021 + Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket40447 | 2 + src/app/config/fallback_dirs.inc | 948 --- 2 files changed, 482 insertions(+), 468 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit ae6ab63f242f9e1da446737d9293c2415365bbc2 Merge: 9c52846fe5 fe5a9db1e6 Author: Alexander Færøy Date: Wed Aug 11 13:14:26 2021 + Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug40078 | 3 +++ src/lib/crypt_ops/crypto_ed25519.c | 2 +- 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 9c52846fe5ab6f0d2ef99f665844037f910a62cc Merge: f863870398 399518da02 Author: Alexander Færøy Date: Wed Aug 11 12:52:08 2021 + Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket40301 | 4 src/feature/dircache/dircache.c | 35 +++ src/feature/dircache/dircache.h | 2 +- src/lib/compress/compress_zstd.c | 4 ++-- src/test/test_dir.c | 26 -- 5 files changed, 26 insertions(+), 45 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit f86387039897ee1e8cccfc8060e74bdefa70c1fc Merge: b925cef1e3 87492154e0 Author: Nick Mathewson Date: Mon Jun 14 11:49:01 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit e2138627f9b52e9e8aa93387e17f37f3a21d5efd Merge: b5eb1ba722 f57b5c48e0 Author: Nick Mathewson Date: Thu Jun 10 12:30:29 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug40392 | 4 src/feature/hs/hs_descriptor.c | 3 ++- 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit aceda675466b5ddf66381da41bb3830d2368c7bb Merge: c5922244e2 7fdfc2ea54 Author: Nick Mathewson Date: Thu Jun 10 08:37:34 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit b5eb1ba7220d366c0dc10ae6e292f2c909550801 Merge: 62128193e2 adb248b6d6 Author: Nick Mathewson Date: Thu Jun 10 08:53:07 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket40389 | 3 +++ src/core/or/relay.c | 25 +++-- 2 files changed, 26 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 62128193e23d4806f38bd638fc880aae9e0bd797 Merge: aceda67546 d71bf986b4 Author: Nick Mathewson Date: Thu Jun 10 08:42:14 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug40391 | 9 + src/core/or/circuitmux.c | 8 2 files changed, 13 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit c5922244e27f72a0b974920d56475450932568ff Merge: d6e2516031 9ceb2c317b Author: Nick Mathewson Date: Thu Jun 10 08:32:12 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket40390 | 8 src/lib/crypt_ops/crypto_rand.c | 2 +- 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit d6e2516031daa3e081ed7efdbd4e298fd4e7a290 Merge: 60070546a7 520d5c108f Author: Nick Mathewson Date: Thu Jun 10 08:21:47 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/geoip-2021-06-10 |3 + src/config/geoip | 4764 +++--- src/config/geoip6| 2826 --- 3 files changed, 4536 insertions(+), 3057 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit fe328e2f332662d7bf16adaa18f6c96c43b3f83f Merge: a4e8624db1 ed7f4ad4a9 Author: Nick Mathewson Date: Mon Jun 7 13:32:35 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit a4e8624db15a3445cbc942b81e953b67518487ac Merge: 6dc3423e3e 42ba87d964 Author: Alexander Færøy Date: Tue May 25 13:25:23 2021 + Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug40399 | 5 + src/lib/tls/tortls.h | 1 - src/lib/tls/tortls_nss.c | 7 --- src/lib/tls/tortls_openssl.c | 13 - src/test/test_tortls_openssl.c | 20 5 files changed, 5 insertions(+), 41 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 6dc3423e3ebd7ab10647b54b87584764349f4a50 Merge: d6816de3e0 e2c1ac214c Author: Nick Mathewson Date: Fri May 7 10:41:33 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit d6816de3e09bf35c2b3150f42dc9dbc82651b6fc Merge: 5f35664b15 621f8a304a Author: Nick Mathewson Date: Fri May 7 09:53:57 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227 -- src/config/geoip6| 1702 3 files changed, 3098 insertions(+), 1834 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 5f35664b1543aae92f38bc2f1afbfe5b7920e56c Merge: c2997d7ee7 32eea3b006 Author: Nick Mathewson Date: Wed Apr 21 10:34:28 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 62002e828483843914271ce00fc6e5ed100b8124 Merge: b5a6de9e83 131e2d99a4 Author: David Goulet Date: Wed Apr 14 08:39:16 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 src/app/config/fallback_dirs.inc | 2 -- 1 file changed, 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit b5a6de9e83616cfe0d1536a99893da7758eb93cb Merge: 8376fdb586 ee7c50b8a7 Author: Nick Mathewson Date: Tue Apr 13 16:59:15 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket40265 |3 + src/app/config/fallback_dirs.inc | 1040 -- 2 files changed, 660 insertions(+), 383 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 8376fdb5868565ae4ff91c2748045ea373559055 Merge: 1693b6151e 32f5ad7665 Author: Nick Mathewson Date: Tue Apr 13 10:36:00 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/geoip-2021-04-13 | 3 + src/config/geoip | 10953 + src/config/geoip6| 2608 +++ 3 files changed, 6970 insertions(+), 6594 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 1693b6151e1369ce0938761cac95e7a0a524f5f3 Merge: 50d4300e77 3271c0bde7 Author: Nick Mathewson Date: Tue Mar 16 09:18:51 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 0d04a9a82945680788cff446215b98fd68b9f055 Merge: 2b1c08567d f078aab71e Author: Nick Mathewson Date: Mon Mar 15 09:01:59 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug40316 | 5 + src/feature/dirauth/dirvote.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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 2b1c08567d7ced8c188d5e195598158a214fcc99 Merge: 72a0cdb1cd efca9ce41c Author: Nick Mathewson Date: Mon Mar 15 08:54:00 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket40286_minimal| 7 --- src/feature/dirparse/unparseable.c | 7 +-- 2 files changed, 9 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 9dc1838693bec6842ce0d8ee0a6acc3573ae46d0 Merge: c9b4d4aa75 1a0b5fd569 Author: Nick Mathewson Date: Mon Mar 15 07:42:55 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 72a0cdb1cdda3e596cbf24a543e10de43c9211a5 Merge: 9dc1838693 f46f4562cf Author: Nick Mathewson Date: Mon Mar 15 08:52:28 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket40286_minimal| 5 + src/feature/dirparse/unparseable.c | 6 ++ 2 files changed, 11 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit c9b4d4aa754c35b4785a4ddc56ea301c65c65914 Merge: 9bcd9523be 02230575c4 Author: Nick Mathewson Date: Fri Mar 12 11:36:34 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 LICENSE | 43 ++- changes/geoip-2021-03-12 | 2 +- 2 files changed, 11 insertions(+), 34 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 9bcd9523bea0c78dc17a1f0ca8c8f204b0e57584 Merge: 2bc49d3828 aa6c7741e8 Author: Nick Mathewson Date: Fri Mar 12 11:30:21 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/geoip-2021-03-12 | 9 + src/config/geoip | 144354 ++-- src/config/geoip6| 62679 +++ 3 files changed, 95249 insertions(+), 111793 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 2bc49d3828f71439593c760848e2fc15ee30b67a Merge: fdd4bc3f43 296a557bfc Author: David Goulet Date: Mon Mar 1 08:24:28 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket40309 | 3 +++ configure.ac | 1 - src/app/main/main.c | 1 - src/lib/meminfo/meminfo.c | 23 - src/lib/meminfo/meminfo.h | 1 - src/test/test_util.c | 52 --- 6 files changed, 3 insertions(+), 78 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit fdd4bc3f4348d55f3f316ec80aec790770b3 Merge: cd60c6ec6b 21317c9229 Author: Nick Mathewson Date: Wed Feb 3 13:39:54 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit b9689553d68d9483762d1d9fc4956c69fea73556 Merge: c3741d754e f322ea3fa8 Author: David Goulet Date: Wed Feb 3 09:11:14 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 4dfada509a1ebf21aecc35af28308cd8675f31e8 Merge: bf80465d86 c2cee6c780 Author: David Goulet Date: Wed Feb 3 08:54:40 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit c3741d754eed8848b3009f728cb8d33d75c86549 Merge: 4dfada509a a3cef41fc3 Author: David Goulet Date: Wed Feb 3 08:56:38 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit bf80465d86832c6ae2faf582d5ada18371b51370 Merge: a5b4ee2a01 98590621bb Author: David Goulet Date: Wed Feb 3 08:51:36 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit a5b4ee2a01128a97e5b9ec8f50b975a5aaf40551 Merge: 16bd8c7247 9eba65bd8b Author: David Goulet Date: Wed Feb 3 08:44:19 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket2667 | 4 ++ src/core/or/address_set.c | 74 +++ src/core/or/address_set.h | 20 +- src/core/or/connection_edge.c | 25 src/feature/nodelist/dirlist.c | 36 + src/feature/nodelist/dirlist.h | 2 + src/feature/nodelist/nodelist.c | 87 +++-- src/feature/nodelist/nodelist.h | 4 ++ src/test/test_address_set.c | 87 + 9 files changed, 325 insertions(+), 14 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 3ec07671c1d2a46d735d08e941ba922fe55e70d2 Merge: f25c604e97 9556276f07 Author: David Goulet Date: Thu Jan 28 12:46:30 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit f25c604e9790fc999dffe782076dae3e8ee2f464 Merge: c25d549647 290007e3c4 Author: David Goulet Date: Thu Jan 28 12:42:31 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit c25d549647855f30052daf244b5ec9f91fc6c5f5 Merge: 5db8bffa43 02bd135cb1 Author: David Goulet Date: Thu Jan 28 12:36:42 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 5db8bffa4315a6c71ed20da01ff9e4634aa3ff96 Merge: de6644bcba 1bdccc03a9 Author: David Goulet Date: Thu Jan 28 12:14:10 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket40237 | 5 src/core/mainloop/mainloop.c | 3 ++- src/feature/hs/hs_cache.c| 5 +++- src/feature/hs/hs_client.c | 8 --- src/feature/hs/hs_common.c | 12 +++--- src/feature/hs/hs_service.c | 7 -- src/feature/hs_common/shared_random_client.c | 23 -- src/feature/nodelist/nodelist.c | 2 +- src/test/test_hs_cache.c | 7 +++--- src/test/test_hs_client.c| 36 +++- src/test/test_hs_common.c| 36 ++-- src/test/test_hs_service.c | 21 src/test/test_shared_random.c| 22 + 13 files changed, 122 insertions(+), 65 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit de6644bcba8a660c4ef10a42fb139d11be92e233 Merge: b5fd3f127f 045db909c2 Author: David Goulet Date: Thu Jan 28 12:08:20 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit b5fd3f127f1b84f3c9083425c43708ced12cfa2f Merge: 1f39a13d14 c6fb26695b Author: David Goulet Date: Thu Jan 28 12:04:42 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 1f39a13d1459e64bf861174f0f5d49d04f7c06fa Merge: 869fa2a2ef 8f13257ccd Author: David Goulet Date: Thu Jan 28 12:02:43 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug40117 | 5 + src/feature/rend/rendmid.c | 6 -- 2 files changed, 9 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 869fa2a2ef5978a6fc328f4d30376ecd1b06e2d2 Merge: dec3041952 2cf1365c17 Author: David Goulet Date: Thu Jan 28 12:00:17 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit dec3041952ae4c9ea0ed621b149e6e047738c617 Merge: d4e5066bf2 3ebf75993f Author: Nick Mathewson Date: Thu Jan 28 11:20:20 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit d4e5066bf2d1e3092c4870f6c5f7fa5576af5f5a Merge: 5ba521297f 65087903d9 Author: David Goulet Date: Thu Jan 21 16:18:43 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 .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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 5ba521297f78072dd7a655935f17d114fc89c7a3 Merge: 05ee5b983c 8500700aa4 Author: David Goulet Date: Thu Jan 21 16:06:54 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 .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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 05ee5b983c679527a0998458706dbdd11f891198 Merge: e85f517831 faf7b550e7 Author: Nick Mathewson Date: Tue Jan 19 12:53:52 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug40113 | 3 +++ src/test/test_connection.c | 7 --- 2 files changed, 7 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit e85f5178314ef26f75a8a225391e3f680a1d33a5 Merge: 9e03ef3e6b 2d5b21598e Author: Nick Mathewson Date: Tue Jan 19 12:45:07 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 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(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 9e03ef3e6bf8ba8fef55b7acc3efce182308bb22 Merge: 5aceb7ca19 7a82fbfdab Author: David Goulet Date: Wed Jan 13 10:38:05 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 .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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 5aceb7ca192b42fe1cdd940465a6ee2655d47cd5 Merge: 6cd23b29d2 6c0f15500b Author: Nick Mathewson Date: Mon Jan 11 14:37:28 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 6cd23b29d262da3ecd07208804804d66550a6c9a Merge: 1cd40f532e fcae26adf7 Author: Nick Mathewson Date: Mon Nov 16 22:42:22 2020 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 1cd40f532efadf716f1ce63f21e22730d40614c8 Merge: a0b827eb5b 862c44e4ec Author: Nick Mathewson Date: Thu Nov 12 08:13:37 2020 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 73b1d93d757840a7162dc04a0caa691d03e17b37 Merge: 412da7c85c 665083be9f Author: Nick Mathewson Date: Mon Nov 9 17:14:58 2020 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit ec9d646923bb32eb9dedd71a854031bf1fca87e3 Merge: 55b8eedba8 52e439c13e Author: Nick Mathewson Date: Mon Nov 9 16:13:42 2020 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 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(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 55b8eedba8902610fa594b14715e4cdd3d2e925d Merge: 58b23b33e4 dd63b97288 Author: Alexander Færøy Date: Wed Oct 28 15:17:51 2020 + Merge branch 'maint-0.3.5' into release-0.3.5 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 58b23b33e45f1aa643e890543ecc0f43878cf038 Merge: c80052f603 741edf1b45 Author: Nick Mathewson Date: Wed Oct 7 09:29:17 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug32588 | 4 ++ src/app/config/config.c| 5 +- src/app/config/config.h| 4 ++ src/feature/relay/router.c | 77 ++--- src/feature/relay/router.h | 2 + src/test/test_config.c | 66 + src/test/test_router.c | 119 + 7 files changed, 245 insertions(+), 32 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit c80052f60399a4b16dbb42ad1648633e0236e8bd Merge: c18d0b378c b404f085ad Author: Nick Mathewson Date: Wed Oct 7 08:38:30 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket40003| 3 +++ src/feature/rend/rendservice.c | 19 +++ 2 files changed, 22 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit c18d0b378c8230c7c2d05a0a555d54e162533794 Merge: 0343ec056e 5f5587ee50 Author: Nick Mathewson Date: Wed Oct 7 08:29:31 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket33880 | 6 ++ src/core/or/channel.c | 32 +--- 2 files changed, 35 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 0343ec056e14a655fe9003024d2cd5e1fc806d51 Merge: 3fe253e6e1 ad7ffa5240 Author: Nick Mathewson Date: Wed Oct 7 08:26:04 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket33747| 7 +++ src/core/mainloop/connection.c | 7 ++- src/core/or/connection_st.h| 3 +++ src/feature/relay/ext_orport.c | 5 - 4 files changed, 20 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 3fe253e6e1e799202828b4f6fcd13793a73389f5 Merge: c3845263fe 98e14720b5 Author: Nick Mathewson Date: Wed Oct 7 08:16:19 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/log_32868 | 4 +++ src/feature/nodelist/node_select.c | 54 +++--- 2 files changed, 54 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit c3845263fe5cf1a9f30a824c5a516adc1a1dd95e Merge: 3144e2ce2d 968b6c30c1 Author: Nick Mathewson Date: Wed Oct 7 08:10:08 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket40035 | 5 + src/lib/tls/tortls_nss.c | 10 ++ 2 files changed, 15 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 3144e2ce2d07b6b19c7c553b8066081afef76f7a Merge: 2c5a2c6997 e0e0ef713e Author: Nick Mathewson Date: Wed Oct 7 08:08:01 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 2c5a2c6997444817599a8dc5f8d6826c71d0e965 Merge: 412b665d5f 84a5bd48e2 Author: Nick Mathewson Date: Wed Oct 7 08:05:40 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket40081| 6 ++ src/core/or/channel.c | 44 ++-- src/core/or/channel.h | 9 +++-- src/core/or/channeltls.c | 32 ++-- src/core/or/circuitbuild.c | 2 ++ src/test/test_channel.c| 13 + 6 files changed, 32 insertions(+), 74 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 412b665d5f2511eaa914c9dad46012596817950e Merge: 995a3d5e17 ed6a328297 Author: Nick Mathewson Date: Wed Oct 7 08:03:52 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/parallel_unit_test | 4 src/test/include.am| 22 +++--- src/test/testing_common.c | 42 ++ src/test/unittest_part1.sh | 3 +++ src/test/unittest_part2.sh | 3 +++ src/test/unittest_part3.sh | 3 +++ src/test/unittest_part4.sh | 3 +++ src/test/unittest_part5.sh | 3 +++ src/test/unittest_part6.sh | 3 +++ src/test/unittest_part7.sh | 3 +++ src/test/unittest_part8.sh | 3 +++ 11 files changed, 89 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 995a3d5e1721f6f0d4973a53fe0eb34b273445da Merge: db76015f6f faf89ec6c2 Author: David Goulet Date: Tue Sep 22 13:47:08 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit db76015f6f05dd48d3660bd86e4777c1feacf152 Merge: 28bbd16daf 8458c8211e Author: Nick Mathewson Date: Mon Sep 21 12:59:03 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 .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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 28bbd16dafcf9f24a451fe2d3176efd7d2ad3248 Merge: 814fa6d636 0b77c706a1 Author: Nick Mathewson Date: Fri Sep 18 19:06:16 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 .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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 814fa6d636da2acd1733dcfc1cf59e12ccfc804a Merge: 3ee664bb33 7945e075a4 Author: David Goulet Date: Fri Sep 18 09:45:25 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 3ee664bb332f88a64d1daecbca687262872b1364 Merge: ee72c517b2 47f1d19f8e Author: Nick Mathewson Date: Thu Sep 17 13:56:40 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit ee72c517b2cce9df02000c7c456cea07e3d2f158 Merge: d605622ade 72484a4953 Author: Nick Mathewson Date: Thu Aug 13 14:20:39 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug40099 | 4 src/test/test_rendcache.c | 2 +- 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit d605622aded18c2d0c78f81c3c75735d4cf982ff Merge: ac5a06d42c aeafb7f44f Author: Nick Mathewson Date: Wed Aug 12 20:21:04 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 .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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit ac5a06d42c0eed5686d7d63efc2610a8b2420a14 Merge: 607325122f f5b9471547 Author: Nick Mathewson Date: Wed Aug 12 12:29:17 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 .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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 607325122f3c65419f514d49586ae26837d808b6 Merge: 1cefff8581 8182f1351a Author: Nick Mathewson Date: Wed Aug 12 08:39:41 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 .appveyor.yml | 8 1 file changed, 8 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 1cefff8581a3b377ed74583dc3af1c0fc2deadf5 Merge: d9b28a2dd1 adb7268236 Author: Nick Mathewson Date: Tue Aug 11 12:37:08 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 .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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit d9b28a2dd1a950dfce6351d2c6c7c9e9704c2c1e Merge: 5a509fbdf3 aa2c93b90b Author: Nick Mathewson Date: Tue Aug 11 11:03:24 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 5a509fbdf32c31e0e824b63b9f97c4bf48a5124d Merge: e748c1d1e7 8a0f530adf Author: Nick Mathewson Date: Tue Aug 11 10:44:40 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 .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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit e748c1d1e7bd098cfbbf97aabb97e76d2c4c720b Merge: 1279db39eb e873c7e893 Author: Nick Mathewson Date: Mon Aug 10 19:31:56 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 .gitlab-ci.yml| 120 ++-- scripts/ci/ci-driver.sh | 424 ++ src/feature/rend/rendclient.c | 4 +- src/lib/net/address.c | 2 +- 4 files changed, 534 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 1279db39ebf820ccbfda67919a3a2ebf1c5b0cf6 Merge: 25811d4e72 bac8967e24 Author: Nick Mathewson Date: Thu Aug 6 13:24:11 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 .gitlab-ci.yml | 32 ++-- 1 file changed, 2 insertions(+), 30 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
commit 25811d4e72e9cdfea79053c46d890843788f1987 Merge: 50f5f0001c c4742b89b2 Author: Alexander Færøy Date: Fri Jul 31 02:03:34 2020 + Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug40076| 5 src/lib/container/buffers.c | 2 ++ src/test/test_buffers.c | 64 + 3 files changed, 71 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
