[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 7915b651d9e926d829d2241a161c7afdaf0e7ffb Merge: 34919368ce 45d9830493 Author: Nick Mathewson Date: Thu Aug 13 14:20:39 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 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/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 34919368cebb1e635d10694d8ec42911db909130 Merge: 309eafbc3c 07f0210a05 Author: Nick Mathewson Date: Wed Aug 12 20:21:04 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .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.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 309eafbc3c0064a670f5f4b11c3639f7ade6229b Merge: 489d33e190 02bb719a94 Author: Nick Mathewson Date: Wed Aug 12 12:29:17 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .gitlab-ci.yml | 36 --- Makefile.am | 2 ++ scripts/ci/ci-driver.sh | 77 + 3 files changed, 67 insertions(+), 48 deletions(-) diff --cc Makefile.am index 3b30c01f00,f6346fe0fc..1041494da7 --- a/Makefile.am +++ b/Makefile.am @@@ -162,53 -157,40 +162,55 @@@ include src/include.a include doc/include.am include contrib/include.am + manpages: $(nodist_man1_MANS) + EXTRA_DIST+= \ - ChangeLog \ - CONTRIBUTING\ - CODE_OF_CONDUCT \ - INSTALL \ - LICENSE \ - Makefile.nmake \ - README \ - ReleaseNotes\ - scripts/maint/checkIncludes.py \ - scripts/maint/checkSpace.pl \ - scripts/maint/checkShellScripts.sh \ - scripts/maint/practracker/README\ - scripts/maint/practracker/exceptions.txt\ - scripts/maint/practracker/includes.py \ - scripts/maint/practracker/metrics.py\ - scripts/maint/practracker/practracker.py\ - scripts/maint/practracker/practracker_tests.py \ - scripts/maint/practracker/problem.py\ - scripts/maint/practracker/testdata/.may_include \ - scripts/maint/practracker/testdata/a.c \ - scripts/maint/practracker/testdata/b.c \ - scripts/maint/practracker/testdata/ex0-expected.txt \ - scripts/maint/practracker/testdata/ex0.txt \ - scripts/maint/practracker/testdata/ex1-expected.txt \ - scripts/maint/practracker/testdata/ex1.txt \ - scripts/maint/practracker/testdata/ex1-overbroad-expected.txt \ - scripts/maint/practracker/testdata/ex.txt \ - scripts/maint/practracker/testdata/header.h \ - scripts/maint/practracker/testdata/not_c_file \ - scripts/maint/practracker/test_practracker.sh \ - scripts/maint/practracker/util.py + ChangeLog \ + CONTRIBUTING\ + CODE_OF_CONDUCT \ + INSTALL \ + LICENSE \ + Makefile.nmake \ + README \ + ReleaseNotes\ + scripts/maint/checkIncludes.py \ + scripts/maint/checkSpace.pl \ + scripts/maint/checkSpaceTest.sh \ + scripts/maint/checkspace_tests/dubious.c\ + scripts/maint/checkspace_tests/dubious.h\ + scripts/maint/checkspace_tests/expected.txt \ + scripts/maint/checkspace_tests/good_guard.h \ + scripts/maint/checkspace_tests/same_guard.h \ + scripts/maint/checkspace_tests/subdir/dubious.c \ + scripts/maint/checkShellScripts.sh \ + scripts/maint/practracker/README\ + scripts/maint/practracker/exceptions.txt\ + scripts/maint/practracker/includes.py \ + scripts/maint/practracker/metrics.py\ + scripts/maint/practracker/practracker.py\ + scripts/maint/practracker/practracker_tests.py \ + scripts/maint/practracker/problem.py\ + scripts/maint/practracker/testdata/.may_include \ + scripts/maint/practracker/testdata/a.c \ + scripts/maint/practracker/testdata/b.c \ + scripts/maint/practracker/testdata/ex0-expected.txt \ + scripts/maint/practracker/testdata/ex0.txt \ + scripts/maint/practracker/testdata/ex1-expected.txt \ + scripts/maint/practracker/testdata/ex1.txt \ + scripts/maint/practracker/testdata/ex1-overbroad-expected.txt \ + scripts/maint/practracker/testdata/ex1-regen-expected.txt
[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 489d33e1903115d952a3f40bcfaa0fd524bc62f8 Merge: 0ec2d1528c 6ef40144ae Author: Nick Mathewson Date: Wed Aug 12 08:39:41 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .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.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 0ec2d1528cc8f80fe134c37961f8724696468aa9 Merge: 6bee9bd481 c6c0af403c Author: Nick Mathewson Date: Tue Aug 11 12:37:08 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .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.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 6bee9bd48169f23a3ce713dd30d6b8e2681fa127 Merge: 262ddfee7a da8577bb75 Author: Nick Mathewson Date: Tue Aug 11 11:03:24 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 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.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 262ddfee7a8816b9f7990467df0e495e27f387db Merge: f3fcc89d05 e4a6d9d5a9 Author: Nick Mathewson Date: Tue Aug 11 10:44:40 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .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.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit f3fcc89d055811065bd9fe723b4d71b755b82edc Merge: 39d5e7c764 68f8250cbb Author: Nick Mathewson Date: Mon Aug 10 19:33:06 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .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/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 39d5e7c76464f4e6dae9762210363de3da7230df Merge: e78a7450a2 352991c843 Author: Nick Mathewson Date: Thu Aug 6 13:24:11 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .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/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit e78a7450a2990a75380885786a5840f15f482131 Merge: 3b8bf743ae 4e684c8695 Author: Alexander Færøy Date: Fri Jul 31 02:03:34 2020 + Merge branch 'maint-0.4.2' into maint-0.4.3 changes/bug40076| 5 src/lib/buf/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
[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 3b8bf743ae6eca261dd46cde94371a4cca0c0689 Merge: 97d0cb83ed cdb0e6c252 Author: Nick Mathewson Date: Wed Jul 29 12:37:07 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 changes/bug31036| 3 +++ src/lib/fdio/fdio.c | 6 +++--- 2 files changed, 6 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.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 97d0cb83ed096fea9917237d68fe7700fe9ed206 Merge: 6354b70e49 c0bc30b6f0 Author: Nick Mathewson Date: Mon Jul 27 12:56:18 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 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/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 6354b70e49a50815dce94906122266c6bb744e63 Merge: 0acc3ae879 3bcbd69a77 Author: Nick Mathewson Date: Thu Jul 23 10:09:14 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 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/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 42c0358ceb2b030e9b9f751ad02ddd82b5912038 Merge: 7ba849349 49b4d1765 Author: Nick Mathewson Date: Thu Jul 9 13:14:58 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 `-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/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 70161785f94ee9e1571af4ec804bf57f877f40e8 Merge: af08dad6d 5aaecf6d0 Author: Nick Mathewson Date: Thu Jul 9 10:30:46 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 `-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/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit af08dad6d1b00f1f433787d2712568b07f782729 Merge: c364e0e83 283ce30c5 Author: Nick Mathewson Date: Thu Jul 9 09:28:53 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 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/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit c364e0e83bd98bf66b68cdacff28ad6c5924abf5 Merge: a213d2793 b81e24cda Author: Alexander Færøy Date: Wed Jul 8 00:36:48 2020 + Merge branch 'maint-0.4.2' into maint-0.4.3 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/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit a213d2793860240b315f372159311f307aed68ca Merge: 5a5ff3d8c 19d579e8c Author: Alexander Færøy Date: Tue Jul 7 14:48:36 2020 + Merge branch 'maint-0.4.2' into maint-0.4.3 .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/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 5a5ff3d8c5d6b27d5c0371a3bbb0113332e2a9f9 Merge: 322abd4fd 07d8d398c Author: David Goulet Date: Thu Jul 2 07:20:57 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 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/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 1932a84ef523c9408907498c9148915760c90826 Merge: 322abd4fd 38208185b Author: George Kadianakis Date: Wed Jul 1 12:55:02 2020 +0300 Merge branch 'maint-0.4.2' into maint-0.4.3 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/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 322abd4fd9ce7e3d60f10e1ef4d343c42d14a9ba Merge: 5a38c73f7 dbb70d85b Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.4.2' into 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/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit fb46d1bb3488a6deedc7172a58554e0953c7df87 Merge: 38f3cf410 881f50a9a Author: Alexander Færøy Date: Tue Jun 30 14:16:16 2020 + Merge branch 'maint-0.4.2' into 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/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 38f3cf4103cc87d6de711e5495bdac01bbe47879 Merge: 2042ebe88 c9c4a3d0f Author: Alexander Færøy Date: Tue Jun 30 14:03:04 2020 + Merge branch 'maint-0.4.2' into 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/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 2042ebe88ee49259ec0665032a9bfa39ba6eb9cb Merge: c57896a76 483082b57 Author: Alexander Færøy Date: Tue Jun 30 13:48:49 2020 + Merge branch 'maint-0.4.2' into 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/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit c57896a76e2e858a74c8ea9c9c037761b0b40e5b Merge: eef77227e b0bfee8c7 Author: Alexander Færøy Date: Tue Jun 30 13:37:20 2020 + Merge branch 'maint-0.4.2' into 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/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit eef77227efce958382e3b221d86e6dba3b4a058a Merge: d124cfc05 d235e523d Author: Nick Mathewson Date: Mon Jun 29 13:57:41 2020 -0400 Merge branch 'maint-0.4.2' into 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/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit d124cfc0584883d55cb00f975a170d2b68bf7281 Merge: 31bdfd492 a692b87f8 Author: Nick Mathewson Date: Mon Jun 29 13:55:22 2020 -0400 Merge branch 'maint-0.4.2' into 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/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 31bdfd4920849a38c7bd2ed2d8ef1b8645c65790 Merge: f862971d0 0575a182a Author: Nick Mathewson Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.2' into 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/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit f862971d04149e1b62bc7cd058c4b72a4d07eacd Merge: 3008255ae 216456299 Author: Nick Mathewson Date: Mon Jun 29 12:58:50 2020 -0400 Merge branch 'maint-0.4.2' into 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/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 183d0d30d66aaae058cd180292779d770182ef80 Merge: 272c17113 fd8ce812b Author: Nick Mathewson Date: Mon Jun 29 12:55:35 2020 -0400 Merge branch 'maint-0.4.2' into 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/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 272c171136f4ed7660ef409f75ce7bac29a004f3 Merge: 754d4e9a1 0f218a05a Author: David Goulet Date: Fri Jun 12 12:55:41 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .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
