[tor-commits] [tor/master] 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/master] 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/master] 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/master] 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/master] 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/master] 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/master] 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/master] 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/master] 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/master] 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/master] Merge branch 'maint-0.4.2' into bug40076_042
commit c2d5ec5e43c2690656ea5a5a384683108782d149 Merge: c4742b89b2 cdb0e6c252 Author: Nick Mathewson Date: Thu Jul 30 14:27:29 2020 -0400 Merge branch 'maint-0.4.2' into bug40076_042 .gitignore | 16 +- .travis.yml| 18 +- ChangeLog | 2731 ++- LICENSE|3 +- Makefile.am| 106 +- ReleaseNotes | 2437 +- autogen.sh |5 +- changes/29241_diagnostic |4 - changes/bug12399 |3 - changes/bug13221 |5 - changes/bug22619 |3 - changes/bug23507 |5 - changes/bug23818_v2|6 - changes/bug23818_v3|6 - changes/bug24661 |3 - changes/bug27197 |3 - changes/bug27199 |3 - changes/bug27740 |4 - changes/bug27741 |5 - changes/bug27750 |6 - changes/bug27800 |4 - changes/bug27804 |3 - changes/bug27841 |7 - changes/bug27948 |6 - changes/bug27963_timeradd |4 - changes/bug27968 |3 - changes/bug28096 | 13 - changes/bug28115 |3 - changes/bug28127 |7 - changes/bug28183 |4 - changes/bug28202 |4 - changes/bug28245 |6 - changes/bug28298 |4 - changes/bug28303 |3 - changes/bug28348_034 |5 - changes/bug28399 |4 - changes/bug28413 |4 - changes/bug28419 |3 - changes/bug28435 |3 - changes/bug28441 |4 - changes/bug28454 |4 - changes/bug28485 |3 - changes/bug28524 |4 - changes/bug28525 |7 - changes/bug28554 |3 - changes/bug28562 |5 - changes/bug28568 |4 - changes/bug28569 |3 - changes/bug28612 |4 - changes/bug28619 |6 - changes/bug28656 |3 - changes/bug28698 |3 - changes/bug28895 |5 - changes/bug28920 |6 - changes/bug28938 |4 - changes/bug28974 |3 - changes/bug28979 |4 - changes/bug28981 |5 - changes/bug28995 |5 - changes/bug29017 |4 - changes/bug29029 |5 - changes/bug29034 |5 - changes/bug29036 |5 - changes/bug29040 |4 - changes/bug29042 |5 - changes/bug29135 |5 - changes/bug29144 |5 - changes/bug29145 |3 - changes/bug29161 |3 - changes/bug29175_035 |4 - changes/bug29241 |6 - changes/bug29244 |4 - changes/bug29530_035 |5 - changes/bug29599 |3 - changes/bug29601 |6 - changes/bug29665 |7 - changes/bug29670 |4 - changes/bug29703 |4 - changes/bug29706_minimal
[tor-commits] [tor/master] 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/master] 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/master] 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/master] 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/master] 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/master] 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/master] 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/master] 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/master] 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/master] 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/master] 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/master] 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/master] 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/master] 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/master] 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/master] 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/master] 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/master] 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/master] 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/master] 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/master] 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
[tor-commits] [tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 754d4e9a17b216c8b3bf5f4ded47d0fd6d1634fa Merge: 6b05d447b 193082895 Author: Nick Mathewson Date: Fri Jun 5 12:37:29 2020 -0400 Merge branch 'maint-0.4.2' into 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.2' into maint-0.4.3
commit bcaf480aee37daf624e9e93077ae1274581a029e Merge: c0dd2a6e3 e75583e71 Author: Nick Mathewson Date: Fri May 15 10:25:27 2020 -0400 Merge branch 'maint-0.4.2' into 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.2' into maint-0.4.3
commit ee6409ab63b1810cb152b09b7b490808ce6d4e6b Merge: b444096be b8bff426f Author: Nick Mathewson Date: Thu May 14 10:20:08 2020 -0400 Merge branch 'maint-0.4.2' into 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.2' into maint-0.4.3
commit e8fdba198eaf3c8d2a622bc02831e3533748c3f5 Merge: ae1ebb5f4 b16c1e4cf Author: Nick Mathewson Date: Wed May 6 17:07:47 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 src/feature/control/btrack_orconn_cevent.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.2' into maint-0.4.3
commit a1365b91ff43e6e520b9a881f720767418daccf6 Merge: 2cd1c0765 28ac17f43 Author: Nick Mathewson Date: Wed May 6 16:54:12 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 This is an "ours" merge to avoid taking the maint-0.4.2 version of the 34078 fix. ___ 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.2' into maint-0.4.3
commit ae1ebb5f44537acc04c0c0338c61b7bdf5a212dc Merge: c11672820 d46f67ef0 Author: Nick Mathewson Date: Wed May 6 16:58:12 2020 -0400 Merge branch 'maint-0.4.2' into 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.2' into maint-0.4.3
commit fecc5fd38d80093a9c189eece4acd41c35cd36c6 Merge: e61867416 d04b708b4 Author: Nick Mathewson Date: Wed May 6 16:47:03 2020 -0400 Merge branch 'maint-0.4.2' into 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.2' into maint-0.4.3
commit e61867416ec23b996de4c6a8c1c6875db549faf2 Merge: 711385c47 bbfc498e2 Author: Nick Mathewson Date: Mon May 4 10:25:52 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/master] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 1ae0839ef24d303f77cec165df5223a66131567c Merge: f6efb3a18 2d34d4d1a Author: teor Date: Thu Apr 9 19:41:19 2020 +1000 Merge branch 'maint-0.4.2' into maint-0.4.3 Remove check-best-practices from check-local in maint-0.4.3. (The check-local jobs are all on separate lines in 0.4.3.) Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --cc Makefile.am index ac61a990f,eaffbe41a..8b55bf0e3 --- a/Makefile.am +++ b/Makefile.am @@@ -267,13 -245,7 +267,12 @@@ test: al shellcheck: $(top_srcdir)/scripts/maint/checkShellScripts.sh -check-local: check-spaces check-changes check-includes shellcheck +check-local: \ + check-spaces\ + check-changes \ + check-includes \ - check-best-practices\ + shellcheck \ + check-cocci need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \ ___ 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.2' into maint-0.4.3
commit 2d6f00e45b3003337242704e0fde2d2adbaa6cf5 Merge: 34faee060 2d7e08d57 Author: teor Date: Thu Apr 9 11:03:34 2020 +1000 Merge branch 'maint-0.4.2' into maint-0.4.3 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h | 3 ++- src/test/test_dos.c | 24 5 files changed, 23 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.2' into maint-0.4.3
commit 03b0d1840a9a416db520107a68509c296f522f2e Merge: 29420ab39 048714d2c Author: Nick Mathewson Date: Wed Mar 25 10:56:27 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .appveyor.yml| 16 ++-- changes/bug33673 | 6 ++ 2 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/master] Merge branch 'maint-0.4.2' into maint-0.4.3
commit eb2d08a72c165ee941607c1b2cc591fb4b5e631b Merge: 725efb7c9 3aa855dc6 Author: teor Date: Fri Mar 20 11:24:57 2020 +1000 Merge branch 'maint-0.4.2' into maint-0.4.3 .appveyor.yml | 2 +- changes/ticket33643 | 5 + changes/ticket33643_part2 | 3 +++ src/test/testing_common.c | 15 +++ 4 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/master] Merge branch 'maint-0.4.2' into maint-0.4.3
commit d925d2995c6b11e4fea3a0637544c23b0b90ff95 Merge: 84f57b69f 190cda0e2 Author: Nick Mathewson Date: Wed Mar 18 12:17:20 2020 -0400 Merge branch 'maint-0.4.2' into 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.2' into maint-0.4.3
commit e0d68ce84fe4536142d7f5e8987a08d9e93ac626 Merge: 6803373aa 85141a3a7 Author: Nick Mathewson Date: Tue Mar 17 15:22:36 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 changes/ticket33119| 8 + src/feature/dirparse/parsecommon.c | 9 - src/lib/crypt_ops/crypto_rsa.c | 27 +++ src/lib/crypt_ops/crypto_rsa.h | 5 ++- src/lib/crypt_ops/crypto_rsa_nss.c | 14 +++- src/lib/crypt_ops/crypto_rsa_openssl.c | 63 -- src/test/test_crypto.c | 39 + 7 files changed, 154 insertions(+), 11 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.2' into maint-0.4.3
commit 84f57b69f31bf47cbc902d853040cb099256ec6d Merge: e0d68ce84 758deaa47 Author: Nick Mathewson Date: Wed Mar 18 08:20:16 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 src/lib/crypt_ops/crypto_rsa_openssl.c | 7 +++ 1 file changed, 7 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.2' into maint-0.4.3
commit 6803373aab2292fe7286d1e19e25d5016b6ac9b8 Merge: bc4c89eb2 4ee269941 Author: Nick Mathewson Date: Tue Mar 17 13:56:10 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 changes/ticket33619 | 5 + src/core/or/circuitpadding.c | 9 ++--- 2 files changed, 11 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.2' into maint-0.4.3
commit bbc80ea042a124a5935bd4264677180efdcb2da2
Merge: 855cd533e e15a621ac
Author: Nick Mathewson
Date: Tue Mar 17 11:45:16 2020 -0400
Merge branch 'maint-0.4.2' into maint-0.4.3
changes/trove_2020_003 | 4
src/feature/hs/hs_client.c | 6 +++---
src/feature/hs/hs_service.c| 6 ++
src/lib/crypt_ops/crypto_ed25519.c | 2 +-
4 files changed, 14 insertions(+), 4 deletions(-)
diff --cc src/feature/hs/hs_client.c
index 61e60,9d67f7127..af8cb0b41
--- a/src/feature/hs/hs_client.c
+++ b/src/feature/hs/hs_client.c
@@@ -1870,9 -1296,9 +1870,9 @@@ hs_client_decode_descriptor(const char
/* Parse descriptor */
ret = hs_desc_decode_descriptor(desc_str, subcredential,
- client_auht_sk, desc);
+ client_auth_sk, desc);
memwipe(subcredential, 0, sizeof(subcredential));
- if (ret < 0) {
+ if (ret != HS_DESC_DECODE_OK) {
goto err;
}
___
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.2' into maint-0.4.3
commit 93d12baf89c2a55b8a3e40a026b3990dd671a1f7 Merge: a255ca9b1 9ef8f5d1b Author: teor Date: Mon Mar 16 20:54:34 2020 +1000 Merge branch 'maint-0.4.2' into maint-0.4.3 .travis.yml | 2 +- changes/ticket32792 | 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.2' into maint-0.4.3
commit a255ca9b1228e70088cd6fd624dbcca86a9376ae Merge: 938487d4b 2f4fa423c Author: Nick Mathewson Date: Fri Mar 13 16:57:27 2020 -0400 Merge branch 'maint-0.4.2' into 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.2' into maint-0.4.3
commit 938487d4b427888fe554dc15e52fca279783 Merge: f68663191 6ed2c9e5f Author: Nick Mathewson Date: Fri Mar 13 16:46:16 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/master] Merge branch 'maint-0.4.2' into maint-0.4.3
commit f686631918a302344c7f1bf6effb7f0d7903470a Merge: dbadfe75e b50494233 Author: Nick Mathewson Date: Fri Mar 13 16:45:17 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/master] Merge branch 'maint-0.4.2' into maint-0.4.3
commit 0e00d9369fa159bf0c44d0862e3d1f6b0c40ef50 Merge: de31c4757 ff5220536 Author: teor Date: Wed Feb 12 14:13:15 2020 +1000 Merge branch 'maint-0.4.2' into maint-0.4.3 "ours" merge, because simiar BridgeDistribution fixes have already been merged to maint-0.4.3. (See 32753.) The stem changes in 33075 have already been merged to maint-0.4.3, so this "ours" merge does not affect them. ___ 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.2' into maint-0.4.3
commit de31c4757b6a58a3b5255298918c6d28e100b506 Merge: 409e1ca3d 00fe21472 Author: Nick Mathewson Date: Tue Feb 11 08:53:41 2020 -0500 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/master] Merge branch 'maint-0.4.2'
commit d9144700af5602cc267c0d147145c100567fdbb3 Merge: dab0b1c3a 0c90fc37e Author: Nick Mathewson Date: Mon Feb 10 14:17:10 2020 -0500 Merge branch 'maint-0.4.2' changes/ticket33212 | 4 src/rust/protover/protover.rs | 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/master] Merge branch 'maint-0.4.2'
commit ee929eedbb4ca50fef3fbca9066908e8bc6e56fa Merge: 342ea3155 c5e610af0 Author: Nick Mathewson Date: Thu Jan 30 11:19:41 2020 -0500 Merge branch 'maint-0.4.2' Using "ours" strategy 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.2'
commit 39c5e1b84994c2f226a8530b930f215cc5ffb877 Merge: c1d4399c8 f470b863a Author: Nick Mathewson Date: Wed Jan 29 19:44:34 2020 -0500 Merge branch 'maint-0.4.2' Use "-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.2'
commit c1d4399c82d7a04e6c89487d76e07f2304fe55d2 Merge: 99671c0da 7b6be02a9 Author: teor Date: Thu Jan 30 07:55:20 2020 +1000 Merge branch 'maint-0.4.2' ___ 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.2'
commit 4025cbada6ab01247275faec8dd32ae857ef0fd5 Merge: f3cbc26bd 48187248d Author: teor Date: Thu Jan 16 10:00:55 2020 +1000 Merge branch 'maint-0.4.2' ___ 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.2'
commit 8095c785f1929b379ab3341b42cbdb05c7598950 Merge: 8b46372f2 7e111d0ea Author: teor Date: Tue Jan 14 17:41:44 2020 +1000 Merge branch 'maint-0.4.2' changes/ticket32705_disable | 7 +++ scripts/maint/practracker/practracker.py | 2 ++ scripts/maint/practracker/test_practracker.sh | 1 + 3 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.2'
commit 48f734178362d3a8b490a23ceff202a2027a27fc Merge: 13216f848 6da989cfe Author: Nick Mathewson Date: Mon Jan 6 13:24:01 2020 -0500 Merge branch 'maint-0.4.2' changes/bug32771| 4 changes/ticket32765 | 4 src/lib/confmgt/structvar.c | 4 ++-- src/lib/log/util_bug.h | 6 -- 4 files changed, 14 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.2'
commit 13216f848a120760fa372b9ae8f6d0840f4a83ba Merge: b062e0f0a 2d8d6d1eb Author: Nick Mathewson Date: Mon Jan 6 08:08:59 2020 -0500 Merge branch 'maint-0.4.2' changes/bug32841 | 4 src/lib/sandbox/sandbox.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.2'
commit da1f76f1261a4238269ca93f5d338ac402c11e14 Merge: 7e17c2438 5dbb607e9 Author: teor Date: Fri Dec 20 10:12:59 2019 +1000 Merge branch 'maint-0.4.2' ___ 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.2'
commit 5082eeba38b36fbd87fea821a1f29a85b5cdd994 Merge: 648399d6c bd11fb109 Author: teor Date: Mon Dec 16 08:16:28 2019 +1000 Merge branch 'maint-0.4.2' .travis.yml | 9 + changes/ticket32629 | 4 2 files changed, 9 insertions(+), 4 deletions(-) diff --cc .travis.yml index eabc495aa,80c8611a4..1fee931e2 --- a/.travis.yml +++ b/.travis.yml @@@ -66,12 -66,12 +66,14 @@@ matrix - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true ## We check asciidoc with distcheck, to make sure we remove doc products - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" +## We check disable module relay +- env: MODULES_OPTIONS="--disable-module-relay" ## We check disable module dirauth - env: MODULES_OPTIONS="--disable-module-dirauth" + ## macOS builds are very slow, and we have a limited number of + ## concurrent macOS jobs. We're not actively developing Rust, so it is + ## the lowest priority. ## We run rust on macOS, because we have seen macOS rust failures before - # Disabled due to slow Travis macOS builds, see #32177 #- env: RUST_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" # compiler: clang # os: osx ___ 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.2'
commit 944bdde50edbc6030dfc954ff501c92cd9e73fb0 Merge: 5d4005abf b7d18f861 Author: Nick Mathewson Date: Mon Dec 9 16:04:09 2019 -0500 Merge branch 'maint-0.4.2' "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.2'
commit 089466eff356454b0e0eb4e1d432057504a9a4d6 Merge: 39bb283fc 3248630fc Author: Nick Mathewson Date: Fri Dec 6 16:02:08 2019 -0500 Merge branch 'maint-0.4.2' changes/geoip-2019-12-03 | 4 + src/config/geoip | 13933 ++--- src/config/geoip6| 4621 --- 3 files changed, 10717 insertions(+), 7841 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.2'
commit 39bb283fca95648aeb58d9e8927de6e1530c6015 Merge: 37d1ee554 0a33522b6 Author: Nick Mathewson Date: Thu Dec 5 13:32:40 2019 -0500 Merge branch 'maint-0.4.2' "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.2'
commit 8d616a1a49a0f5433966a16b17a20121fc2845fd Merge: 64d691423 bb786797a Author: teor Date: Thu Dec 5 10:14:16 2019 +1000 Merge branch 'maint-0.4.2' ___ 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.2'
commit a4c22164c022aee8db962a08039bc6f1c3905585 Merge: f63cf2158 3207a8e5c Author: teor Date: Tue Dec 3 12:47:05 2019 +1000 Merge branch 'maint-0.4.2' .travis.yml | 14 +- changes/ticket32500 | 5 + 2 files changed, 14 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.2'
commit 68b6d852489157d94b14dcdc9ca729f5a7134c76 Merge: 03867b3dd eb8170408 Author: teor Date: Mon Nov 25 12:52:10 2019 +1000 Merge branch 'maint-0.4.2' Merge tor_free() notes with whitespace fixes. doc/HACKING/CodingStandards.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --cc doc/HACKING/CodingStandards.md index 87ebbd2be,2c273910d..799972416 --- a/doc/HACKING/CodingStandards.md +++ b/doc/HACKING/CodingStandards.md @@@ -498,10 -457,6 +497,9 @@@ to use it as a function callback), defi abc_free_(obj); } +When deallocating, don't say e.g. `if (x) tor_free(x)`. The convention is to +have deallocators do nothing when NULL pointer is passed. + - Doxygen comment conventions --- ___ 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.2'
commit 03867b3dd71f765e5adb620095692cb41798c273 Merge: e6ceded7d 3d6545250 Author: teor Date: Mon Nov 25 12:37:26 2019 +1000 Merge branch 'maint-0.4.2' doc/HACKING/CodingStandards.md | 29 ++--- 1 file changed, 18 insertions(+), 11 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.2'
commit 00cdb17a5427c22b5abc7362ca8b0b5daaf7a09c Merge: 825f52784 6d81ca845 Author: Nick Mathewson Date: Fri Nov 15 08:06:36 2019 -0500 Merge branch 'maint-0.4.2' "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.2'
commit cd4ae97448ea503111d6f235624a4594f7ff3470 Merge: fc1316b55 70755eca0 Author: Nick Mathewson Date: Tue Nov 12 16:39:44 2019 -0500 Merge branch 'maint-0.4.2' "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.2'
commit 233ccef6d878253ee4f0cfa4610577101b68e6c6 Merge: 3d6ec40e6 9be51e8a8 Author: teor Date: Tue Nov 12 10:10:01 2019 +1000 Merge branch 'maint-0.4.2' src/test/conf_examples/obsolete_1/expected | 0 src/test/conf_examples/obsolete_1/torrc| 68 ++ src/test/conf_examples/obsolete_2/expected | 0 src/test/conf_examples/obsolete_2/torrc| 2 + 4 files changed, 70 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.2'
commit 3d6ec40e6a0ad2658a49a1b02bbf93f1a731fe73 Merge: 3d1a7d7dd 2ee04fc30 Author: teor Date: Tue Nov 12 10:07:46 2019 +1000 Merge branch 'maint-0.4.2' "git merge --strategy ours", because: * 32295 is a quick fix for 0.4.2 only * 32404 has a better implementation for master ___ 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.2'
commit eb8ea92cf9d93dc2d86d1e62e26110fbca7fdf59 Merge: 834477622 a920597f6 Author: Nick Mathewson Date: Mon Nov 11 10:14:04 2019 -0500 Merge branch 'maint-0.4.2' changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++-- src/config/geoip6| 3078 ++--- 3 files changed, 11485 insertions(+), 7348 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.2'
commit 8af8ed72b2796dcb68a9e3fb7648a1d93b0cc68d Merge: f6c9ca3a1 8b1f99c29 Author: teor Date: Mon Nov 11 14:20:03 2019 +1000 Merge branch 'maint-0.4.2' .appveyor.yml| 2 +- changes/bug32449 | 5 + 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.2'
commit e466c84ed33a77aeddbc5f56f42e953bd5b49503 Merge: 10982d599 1f3bf10d3 Author: teor Date: Thu Nov 7 10:51:48 2019 +1000 Merge branch 'maint-0.4.2' changes/ticket32407 | 4 src/core/mainloop/mainloop.c | 4 src/lib/evloop/compat_libevent.c | 10 ++ src/lib/evloop/compat_libevent.h | 3 +++ 4 files changed, 21 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.2'
commit 059a5795d32cae9f5801cdc980a7abbd22996ba3 Merge: 22482fd45 8f6dc54e3 Author: Nick Mathewson Date: Wed Nov 6 08:57:21 2019 -0500 Merge branch 'maint-0.4.2' changes/ticket32191 | 3 +++ configure.ac| 5 + 2 files 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/master] Merge branch 'maint-0.4.2'
commit 85e566a6a0541b141b694152ac99912d3a349dca Merge: 89f52f36e c3a1e15a5 Author: teor Date: Wed Nov 6 21:30:44 2019 +1000 Merge branch 'maint-0.4.2' ___ 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.2'
commit 23ff60c1509b005ad1fca758a8fa0745008ba22d Merge: bf5b17d8b 10ef7a31c Author: teor Date: Wed Nov 6 17:04:52 2019 +1000 Merge branch 'maint-0.4.2' Makefile.am | 2 +- changes/bug31335 | 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.2'
commit 9ca25f3a68374ca4787b4eaa8bf4fb3365061d26 Merge: 884056ae5 76fd872db Author: teor Date: Wed Nov 6 11:20:02 2019 +1000 Merge branch 'maint-0.4.2' ___ 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.2'
commit b448f6044d37959f2b9bea3c5c2bc5f98c4d9170 Merge: bf16efeb0 2395800d3 Author: teor Date: Tue Oct 29 08:27:02 2019 +1000 Merge branch 'maint-0.4.2' .travis.yml | 7 --- changes/ticket32241 | 2 ++ 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/master] Merge branch 'maint-0.4.2'
commit aff286618c1c0f76796f10004e0834896470aa61 Merge: a91f52a44 d7c40beea Author: teor Date: Fri Oct 25 10:56:21 2019 +1000 Merge branch 'maint-0.4.2' .travis.yml| 12 ++-- changes/ticket31919_bionic | 5 + 2 files changed, 15 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.2'
commit a91f52a443e605a5b8efd4fe0d4032512c23b6cd Merge: b3d035d5c c8aa3cc17 Author: teor Date: Fri Oct 25 10:38:22 2019 +1000 Merge branch 'maint-0.4.2' changes/ticket31958 | 5 + src/feature/dircache/dircache.c | 10 -- src/feature/dircommon/directory.c | 23 +++ 3 files changed, 32 insertions(+), 6 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.2'
commit c00602cc34548655a6f89ee10f23329a0131805d Merge: 68e1ced60 acd27f4b4 Author: teor Date: Fri Oct 25 09:42:14 2019 +1000 Merge branch 'maint-0.4.2' changes/ticket28970| 6 ++ src/feature/hs/hs_client.c | 8 ++-- 2 files changed, 12 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.2'
commit 68e1ced607eaed3105b4b3967e2f6af5070da0e4 Merge: d0c97bf3b 570d1367e Author: Nick Mathewson Date: Thu Oct 24 15:55:38 2019 -0400 Merge branch 'maint-0.4.2' "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.2'
commit a03c0394a3f6885cd10f1c1d7e93834b39ab8fde Merge: 20606b8a1 76939cf29 Author: Nick Mathewson Date: Wed Oct 23 20:26:15 2019 -0400 Merge branch 'maint-0.4.2' "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.2'
commit 8a56819d2375337027f11073947090224f15993b Merge: 9db1602ec 65545e134 Author: teor Date: Wed Oct 23 10:00:49 2019 +1000 Merge branch 'maint-0.4.2' ___ 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.2'
commit 9db1602ec53aa74332c6faff40354a2b1c7f074d Merge: 339c18d6c b45048fea Author: teor Date: Wed Oct 23 08:47:30 2019 +1000 Merge branch 'maint-0.4.2' changes/bug32106 | 5 + doc/tor.1.txt| 21 + 2 files changed, 18 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/master] Merge branch 'maint-0.4.2'
commit 1cdc030c3d3afbe16461271a1147397f87ba5693 Merge: 91413e04b 2ed194c9a Author: Nick Mathewson Date: Tue Oct 22 14:47:28 2019 -0400 Merge branch 'maint-0.4.2' changes/bug32108 | 8 src/core/mainloop/mainloop.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/master] Merge branch 'maint-0.4.2'
commit 7c88fcf4e2ed04af07fed9438b59764f1b4adab0 Merge: 7d75e1dbd 5ddc04f49 Author: Nick Mathewson Date: Tue Oct 22 12:53:12 2019 -0400 Merge branch 'maint-0.4.2' ___ 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.2'
commit de24a7f99242c9c2e04ff54120cb9507fe41a1ec Merge: 7c88fcf4e edc3f7063 Author: Nick Mathewson Date: Tue Oct 22 12:54:44 2019 -0400 Merge branch 'maint-0.4.2' ___ 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.2'
commit 3989dd16161d4719689b37ccf37a69975b86191c Merge: 4d43e1bf4 730f0e3da Author: Nick Mathewson Date: Tue Oct 22 12:51:33 2019 -0400 Merge branch 'maint-0.4.2' ___ 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.2'
commit 4d43e1bf4f75cac55a2a6a6fdc827c94b20c7f3b Merge: f58439ee5 9537966a0 Author: Nick Mathewson Date: Tue Oct 22 12:15:14 2019 -0400 Merge branch 'maint-0.4.2' ___ 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.2'
commit da59dee5d4d791ad46d3b3d69bcd880c1a5335bb Merge: 8d7015eb8 e5b9eefb0 Author: Nick Mathewson Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.4.2' ___ 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.2'
commit f58439ee55512d8deb29272b0beadad43036c7fe Merge: 3939bb82f c55c75bc9 Author: Nick Mathewson Date: Tue Oct 22 12:13:56 2019 -0400 Merge branch 'maint-0.4.2' ___ 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.2'
commit 3939bb82f0f222550385dd583355f57e7ec6f9ea Merge: da59dee5d 34f3d8d40 Author: Nick Mathewson Date: Tue Oct 22 12:11:59 2019 -0400 Merge branch 'maint-0.4.2' ___ 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.2'
commit 8d7015eb8b9087006fb627d31071caa21a654d49 Merge: 2d013bbe5 cbc67241d Author: Nick Mathewson Date: Tue Oct 22 12:08:53 2019 -0400 Merge branch 'maint-0.4.2' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
