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(+)
__
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 ++
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.
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(-)
__
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 change
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(-)
___
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(+)
_
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 ++
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
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
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(-
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(-)
__
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 ++-
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
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
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/t
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(-)
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(-)
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 inse
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
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
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
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
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
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
ht
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
ht
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
ht
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
ht
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
ht
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(-)
__
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-co
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(-)
___
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(-)
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(+)
__
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(+)
___
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.
__
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 -
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
htt
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 i
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
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 del
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/te
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 l
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(+)
__
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/
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 insert
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_
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(-)
___
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 l
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
ht
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
ht
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.)
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
53 matches
Mail list logo