[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 8a17999da3626a5f9e8922277151624cd0526fba Merge: 0d14ac1e0e 21317c9229 Author: Nick Mathewson Date: Wed Feb 3 13:39:08 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 "ours" to avoid version bump. ___ tor-commits mailing

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit cc5d5a5d1ebf8d42d77713eab11d200770d869e8 Merge: e50648582b a3cef41fc3 Author: David Goulet Date: Wed Feb 3 08:56:38 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 src/core/or/connection_edge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 890a9e89bab8378a511470787253a4aee14fafd0 Merge: cc5d5a5d1e f322ea3fa8 Author: David Goulet Date: Wed Feb 3 09:11:14 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 src/core/or/address_set.c | 75 --- src/core/or/address_set.h | 15

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit e50648582b6e0bc7bb37edc08e7a4d67b50f2c53 Merge: 0f8195406e c2cee6c780 Author: David Goulet Date: Wed Feb 3 08:54:40 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 src/core/or/connection_edge.c | 2 +- src/feature/nodelist/nodelist.c | 63

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 0f8195406e0a2a97a3167d4bb40484f4bd091289 Merge: 705fd37875 98590621bb Author: David Goulet Date: Wed Feb 3 08:51:36 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 src/core/or/connection_edge.c | 12 src/feature/nodelist/nodelist.c | 8 ++-- 2 files

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 79cb47cfc2ed83911f78fa24ba4205bf69958105 Merge: f058db1f3d 9556276f07 Author: David Goulet Date: Thu Jan 28 12:46:31 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/bug33781 | 7 +++ src/lib/fs/files.c | 8 +--- src/test/test_util.c | 49

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit f058db1f3d6fee5bc6506ece88cfd100eb86729d Merge: f3da5f88d7 290007e3c4 Author: David Goulet Date: Thu Jan 28 12:42:31 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/bug40190 | 4 src/core/proto/proto_socks.c | 7 ++- 2 files changed, 10

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit f3da5f88d73f20ba1d28dde973c41e4ec45a02b6 Merge: dd5fbc1bd9 02bd135cb1 Author: David Goulet Date: Thu Jan 28 12:36:42 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/bug40210 | 5 + src/ext/keccak-tiny/keccak-tiny.h | 2 +- 2 files changed, 6

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit dd5fbc1bd9d54d191240ac4e15b5324fb83a903d Merge: 5c89197c9f 1bdccc03a9 Author: David Goulet Date: Thu Jan 28 12:14:10 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 6186288eb639e7600c9d7ab482135d44ed78fe21 Merge: a17be1b5b6 045db909c2 Author: David Goulet Date: Thu Jan 28 12:08:20 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/bug40117 | 5 + src/feature/rend/rendmid.c | 6 -- 2 files changed, 9

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit a17be1b5b619cd5e12a9973df9b9a0cffc40b0ff Merge: c3ed4b2e56 c6fb26695b Author: David Goulet Date: Thu Jan 28 12:04:42 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/ticket40165| 5 + changes/ticket40170| 3 +++

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 7ed0fbd88572b9f5519e7907f366c54b8ffb0f25 Merge: 641dce2d6b 3ebf75993f Author: Nick Mathewson Date: Thu Jan 28 11:17:43 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 "ours" to avoid version bump. ___ tor-commits

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 641dce2d6bfe382411d5897003b18167fdddfc2b Merge: c09f8da8a9 65087903d9 Author: David Goulet Date: Thu Jan 21 16:18:43 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 .gitignore | 1 + 1 file changed, 1 insertion(+) ___

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit c09f8da8a98d035082b207ebdaf1e6fe3110c8b7 Merge: 9b390a556e 8500700aa4 Author: David Goulet Date: Thu Jan 21 16:06:54 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 .gitignore | 3 +++ Makefile.am| 14 ++

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 9b390a556e5030d67c235806b2c027513fb1679f Merge: b7f886beb4 faf7b550e7 Author: Nick Mathewson Date: Tue Jan 19 12:53:52 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit a22bfe04bcb106b14e2416e39dc9f43dc82eeba0 Merge: 17eb635532 2d5b21598e Author: Nick Mathewson Date: Tue Jan 19 12:45:07 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/40241_v2| 4 src/core/or/channeltls.c| 4 +---

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 17eb6355320c414d83cbc3c1930ec54ae7cd1ea4 Merge: 4b39f46a61 7a82fbfdab Author: David Goulet Date: Wed Jan 13 10:38:05 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 .gitignore | 3 +++ 1 file changed, 3 insertions(+) ___

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 4b39f46a611ff48ceb7ea212dbcdb2e5b6d26d3b Merge: 2e7cbd7a9c 6c0f15500b Author: Nick Mathewson Date: Mon Jan 11 14:37:28 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/40241 | 4 src/core/or/channeltls.c| 3 ++-

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 7c0778ef7e05e859c62346a795952f127972b35e Merge: fd22fa183b fcae26adf7 Author: Nick Mathewson Date: Mon Nov 16 22:42:22 2020 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/bug40179_part1 | 4 src/test/hs_ntor_ref.py | 6 -- 2 files changed, 8 insertions(+), 2

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 1fa90a2077af46ba27c34cb45b962e5e48931284 Merge: 3d3dc08ed8 862c44e4ec Author: Nick Mathewson Date: Thu Nov 12 08:11:20 2020 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 "ours" to avoid version bump. ___ tor-commits

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 3d3dc08ed8782e88f1e87a9550b9f18751c5732a Merge: 6338c35e9d 665083be9f Author: Nick Mathewson Date: Mon Nov 9 17:13:25 2020 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 "-s ours" to avoid version bump. ___ tor-commits

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 0b2c64effd7b4c1238e3b4da34f09d670dafd52d Merge: 4876409c2a 52e439c13e Author: Nick Mathewson Date: Mon Nov 9 16:13:42 2020 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/bug40080 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/channel.h | 3

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 4876409c2aa7deecd5f57474ee6de6ea9e90a855 Merge: 8e7778ec8a dd63b97288 Author: Alexander Færøy Date: Wed Oct 28 15:39:37 2020 + Merge branch 'maint-0.3.5' into maint-0.4.3 changes/ticket40133 | 5 ++ src/core/or/protover.c | 4 +-

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 8e7778ec8acbfe081df1e28d43d870ed21442029 Merge: 40f0db75bd 741edf1b45 Author: Nick Mathewson Date: Wed Oct 7 09:29:17 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 40f0db75bd3617bc5c4fb76aa62adcf21cea9697 Merge: 884cad3edf b404f085ad Author: Nick Mathewson Date: Wed Oct 7 08:38:30 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/ticket40003| 3 +++ src/feature/rend/rendservice.c | 19 +++ 2 files

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 3e9fa5a029af55a0175b106199a5371fd87c8e4a Merge: 701a1936fa 5f5587ee50 Author: Nick Mathewson Date: Wed Oct 7 08:29:31 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/ticket33880 | 6 ++ src/core/or/channel.c | 32 +--- 2 files

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 701a1936fae48c6887cadd90dbe50ae84a00a29f Merge: a49373844c ad7ffa5240 Author: Nick Mathewson Date: Wed Oct 7 08:26:04 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/ticket33747| 7 +++ src/core/mainloop/connection.c | 7 ++-

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit a49373844cd3c7047759244a6a5c103304d88a7b Merge: 9587512578 98e14720b5 Author: Nick Mathewson Date: Wed Oct 7 08:16:19 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 9587512578e1c45d62e5e97dd9222fe891c835cd Merge: 902982 968b6c30c1 Author: Nick Mathewson Date: Wed Oct 7 08:10:08 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/ticket40035 | 5 + src/lib/tls/tortls_nss.c | 10 ++ 2 files changed, 15

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 90298206d359d3f799ecf8a504bdff493272 Merge: 8a561fc5bf e0e0ef713e Author: Nick Mathewson Date: Wed Oct 7 08:08:01 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/ticket40073| 3 +++ src/core/mainloop/connection.c | 9 - 2 files changed, 11

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 8a561fc5bfc48b3d849d62b266d323f98d509a50 Merge: b5a88e8d47 84a5bd48e2 Author: Nick Mathewson Date: Wed Oct 7 08:05:40 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/ticket40081| 6 ++ src/core/or/channel.c | 44

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit b5a88e8d478e553eb7c6bc022d47a084d6845e64 Merge: beffad8529 ed6a328297 Author: Nick Mathewson Date: Wed Oct 7 08:01:37 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/parallel_unit_test | 4 src/test/include.am| 23 ---

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit beffad8529c9b603bcf6b6e720747f6210c5c25c Merge: 0d78fbb718 faf89ec6c2 Author: David Goulet Date: Tue Sep 22 13:47:08 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/ticket40135 | 3 +++ src/feature/hs_common/shared_random_client.c | 4

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 0d78fbb718ae44aaf739ec644e7d5f3ae65771ea Merge: b643ced022 8458c8211e Author: Nick Mathewson Date: Mon Sep 21 12:59:03 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.3 .gitlab-ci.yml | 46 ++ scripts/ci/ci-driver.sh | 20

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit b643ced0224268dfe3d9c3617b3a77f8aec6205e Merge: 2ddbfc64af 0b77c706a1 Author: Nick Mathewson Date: Fri Sep 18 19:06:16 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.3 .gitlab-ci.yml | 27 ++- scripts/ci/ci-driver.sh | 5 + 2 files

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 2ddbfc64afe94b74a2b9856f2e85e3bd38323db2 Merge: 078194ecaf 7945e075a4 Author: David Goulet Date: Fri Sep 18 09:45:25 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/ticket40126 | 4 src/test/test_rendcache.c | 1 + 2 files changed, 5 insertions(+)

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3

commit 078194ecafebfff2f6aa37868539ccee15ebe73c Merge: 7915b651d9 47f1d19f8e Author: Nick Mathewson Date: Thu Sep 17 13:56:40 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/ticket40125 | 4 src/test/test_rendcache.c | 2 ++ 2 files changed, 6 insertions(+)