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

commit 2933c371887d07704fd6101b82302a8b952d638c Merge: f3ba71bbee 8a17999da3 Author: Nick Mathewson Date: Wed Feb 3 13:39:28 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 "ours" to avoid version bump. ___ tor-commits mailing

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

commit eda81ea27ee72682d5533ee072cdf1061becfdc9 Merge: 903bfc4eca cc5d5a5d1e Author: David Goulet Date: Wed Feb 3 08:56:38 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 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.4.3' into maint-0.4.4

commit 903bfc4eca6a02c56db66c708f3f102129a470df Merge: 36b51a1c71 e50648582b Author: David Goulet Date: Wed Feb 3 08:54:40 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 src/core/or/connection_edge.c | 2 +- src/feature/nodelist/nodelist.c | 63

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

commit 36b51a1c716200c65f5bb9f233c461208a8d924c Merge: b2434d30d2 0f8195406e Author: David Goulet Date: Wed Feb 3 08:51:37 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 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.4.3' into maint-0.4.4

commit 61e38deb56bc36b28efb0c552e63d031675a8334 Merge: eda81ea27e 890a9e89ba Author: David Goulet Date: Wed Feb 3 09:11:14 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 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.4.3' into maint-0.4.4

commit ea380162025d392803a96d331c8dc64bef56f2e7 Merge: be81ecba3a 79cb47cfc2 Author: David Goulet Date: Thu Jan 28 12:46:31 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 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.4.3' into maint-0.4.4

commit be81ecba3a770690d949aa0b71a8e88c90752199 Merge: a3f2bc8f13 f058db1f3d Author: David Goulet Date: Thu Jan 28 12:42:31 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 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.4.3' into maint-0.4.4

commit a3f2bc8f13eaa0868192b80186710c0765f26c59 Merge: 2c4a2a93d3 f3da5f88d7 Author: David Goulet Date: Thu Jan 28 12:36:42 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 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.4.3' into maint-0.4.4

commit 2c4a2a93d34087afa833b25562341ba02276009c Merge: 1887231afb dd5fbc1bd9 Author: David Goulet Date: Thu Jan 28 12:14:10 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit ed0fcfd2b8804e639fc859b7e63e57d7e52747f5 Merge: 737cd79c42 6186288eb6 Author: David Goulet Date: Thu Jan 28 12:08:21 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 737cd79c42576ce47db89e2f2b7bc2f95ba363a2 Merge: f8fea8b979 a17be1b5b6 Author: David Goulet Date: Thu Jan 28 12:04:42 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/ticket40165| 5 + changes/ticket40170| 3 +++

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

commit bcb8afe38e7a79cc3d9bffb3ffdcf772202aba43 Merge: 09a1a34ad1 c3ed4b2e56 Author: Nick Mathewson Date: Thu Jan 28 11:18:30 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 "ours" to avoid version bump. ___ tor-commits

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

commit 09a1a34ad1167fd0c9c97b323fa4e227394bd41f Merge: 2a3cf37450 641dce2d6b Author: David Goulet Date: Thu Jan 21 16:18:43 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitignore | 1 + 1 file changed, 1 insertion(+) ___ tor-commits

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

commit 2a3cf374508f48adc45b6cc6825dd341a71f5a0b Merge: d54cd853ad c09f8da8a9 Author: David Goulet Date: Thu Jan 21 16:06:54 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitignore | 3 +++ Makefile.am| 14 ++

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

commit d54cd853ad22ae02b3b41a10b3f19455f8ae Merge: 4c82c2d1d4 9b390a556e Author: Nick Mathewson Date: Tue Jan 19 12:53:52 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 4c82c2d1d4a9800f82bcc47c227a8e6a2a0d168d Merge: 61ee17eb1e a22bfe04bc Author: Nick Mathewson Date: Tue Jan 19 12:49:22 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/40241_v2| 4 src/core/or/channeltls.c| 4 +---

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

commit 61ee17eb1e3b0c7b92bfa80f3f0f7cbb986db71b Merge: 5a822b462a 17eb635532 Author: David Goulet Date: Wed Jan 13 10:38:05 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitignore | 3 +++ 1 file changed, 3 insertions(+) ___

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

commit 5a822b462aaa8cf3cd749c253bb1e9e5f4f37fa2 Merge: 77bb4b0838 4b39f46a61 Author: Nick Mathewson Date: Mon Jan 11 14:37:29 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/40241 | 4 src/core/or/channeltls.c| 3 ++-

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

commit 77bb4b0838da1d1c1cb7d2d47b02954abeb00a21 Merge: 9001732394 2e7cbd7a9c Author: Alexander Færøy Date: Thu Nov 19 17:43:59 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug40179_part2 | 4 src/test/test_config.c | 6 -- 2 files changed, 8 insertions(+), 2

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

commit 90017323942dc56b23d98c34894542e30856aeac Merge: 3f1544bbd9 7c0778ef7e Author: Nick Mathewson Date: Mon Nov 16 22:42:22 2020 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 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.4.3' into maint-0.4.4

commit 09b4c73fe499c185bcdddb40e949185a51003d40 Merge: 494ced690d fd22fa183b Author: Nick Mathewson Date: Thu Nov 12 08:12:20 2020 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 "ours" to avoid version bump. ___ tor-commits

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

commit 494ced690d4db09b5660472df490f9c8512c2684 Merge: 210a94b231 3d3dc08ed8 Author: Nick Mathewson Date: Mon Nov 9 17:13:41 2020 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 "-s ours" to avoid version bump. ___ tor-commits mailing

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

commit ec0f000445fdc3fd7809032c763b67880a6391c4 Merge: b0e6ec627c 0b2c64effd Author: Nick Mathewson Date: Mon Nov 9 16:17:42 2020 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 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.4.3' into maint-0.4.4

commit b0e6ec627cb76478507a746090b64c0458723460 Merge: 26cfac1880 4876409c2a Author: Alexander Færøy Date: Wed Oct 28 15:39:37 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 changes/ticket40133 | 5 ++ src/core/or/protover.c | 4 +-

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

commit ef70f5f42a875c8d1d1280c6ef6f86d01983b6ef Merge: 96b69152ce 8e7778ec8a Author: Nick Mathewson Date: Wed Oct 7 09:29:17 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 96b69152ce72bce001fd711958b72c75a486eafa Merge: 0e2e517019 40f0db75bd Author: Nick Mathewson Date: Wed Oct 7 08:38:30 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 0e2e517019bf3c8779c9a3f81e453277a372c9f3 Merge: faac186075 884cad3edf Author: Nick Mathewson Date: Wed Oct 7 08:35:18 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug34400 | 5 + src/feature/control/control_cmd.c | 2 +- 2 files changed, 6

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

commit faac18607521380ff330a6e0b207e7b1d3d35384 Merge: ad62cf2ac9 3e9fa5a029 Author: Nick Mathewson Date: Wed Oct 7 08:29:32 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit ad62cf2ac9100c66dcd51f0adbb22ff4bc64faa4 Merge: a44bcc309d 701a1936fa Author: Nick Mathewson Date: Wed Oct 7 08:26:04 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit a44bcc309d3dea5f61306b6f2b2c55f85ce4382b Merge: c65f4eaf06 a49373844c Author: Nick Mathewson Date: Wed Oct 7 08:16:19 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit c65f4eaf06c8bc1317a5fb588a81ee3c3844fcdb Merge: 8505dd5e37 9587512578 Author: Nick Mathewson Date: Wed Oct 7 08:10:08 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 8505dd5e372a055014b9305171a5b4b707746120 Merge: 30c6b42d34 902982 Author: Nick Mathewson Date: Wed Oct 7 08:08:02 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/ticket40073| 3 +++ src/core/mainloop/connection.c | 9 - 2 files changed, 11

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

commit 30c6b42d3447bb8c00eba7fc1c53cb5b2c5ecbc5 Merge: 7097d1bab9 8a561fc5bf Author: Nick Mathewson Date: Wed Oct 7 08:05:40 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 7097d1bab91cc2a9fe0e7b450cd5171d494e8d19 Merge: a914ac5d7c b5a88e8d47 Author: Nick Mathewson Date: Wed Oct 7 08:02:18 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit b6429430c65211b045ac227b412161318ff35d0d Merge: 1cce0588e1 beffad8529 Author: David Goulet Date: Tue Sep 22 13:47:08 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/ticket40135 | 3 +++ src/feature/hs_common/shared_random_client.c | 4

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

commit 1cce0588e10b952d6acff8e55365011bdabbefdb Merge: 09813fe31e 0d78fbb718 Author: Nick Mathewson Date: Mon Sep 21 12:59:03 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitlab-ci.yml | 46 ++ scripts/ci/ci-driver.sh | 20

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

commit 09813fe31e506daf16fe29d830aef848f16ac18f Merge: 2e3603d96d b643ced022 Author: Nick Mathewson Date: Fri Sep 18 19:06:16 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitlab-ci.yml | 27 ++- scripts/ci/ci-driver.sh | 5 + 2 files

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

commit 2e3603d96d156348b2c591a28b8861babfd53ddd Merge: 54cd2578ef 2ddbfc64af Author: David Goulet Date: Fri Sep 18 09:45:25 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 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.4.3' into maint-0.4.4

commit 54cd2578efa9137bac3220230345c6f4121be20b Merge: bf5bf33661 078194ecaf Author: Nick Mathewson Date: Thu Sep 17 13:56:40 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/ticket40125 | 4 src/test/test_rendcache.c | 2 ++ 2 files changed, 6 insertions(+)

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

commit ef18fb56c95c7761017eb8bb36a97415d7bb82ce Merge: 26b257757b 7915b651d9 Author: Nick Mathewson Date: Thu Aug 13 14:20:39 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug40099 | 4 src/test/test_rendcache.c | 1 + 2 files changed, 5 insertions(+)

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

commit 9d77ed7be2da18bef3ab1258f277c527347a94a7 Merge: f98b1988ec 34919368ce Author: Nick Mathewson Date: Wed Aug 12 20:21:04 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitlab-ci.yml | 34 +- scripts/ci/ci-driver.sh | 34

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

commit f98b1988ec5ca1eb3d2923faf43c1df7541efafb Merge: 670f5632a5 309eafbc3c Author: Nick Mathewson Date: Wed Aug 12 12:29:17 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitlab-ci.yml | 36 --- Makefile.am | 2 ++

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

commit 670f5632a54e5ae119e9d92eaebc583aab3fe0d1 Merge: 537be1da33 489d33e190 Author: Nick Mathewson Date: Wed Aug 12 08:40:10 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 "ours" merge to avoid MR 122 -- we already merged MR 123.

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

commit 2b968446d9c0634a6fb3305a10879b4f29684877 Merge: 673d02bdb0 0ec2d1528c Author: Nick Mathewson Date: Tue Aug 11 12:37:08 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitlab-ci.yml | 5 +++-- scripts/ci/ci-driver.sh | 27 ++- 2 files

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

commit 673d02bdb0517cc9867d0f67aec887f71e6d1ce5 Merge: 2a7e71c956 6bee9bd481 Author: Nick Mathewson Date: Tue Aug 11 11:03:24 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 scripts/ci/ci-driver.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

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

commit d83703317d8dc9ca9118c161cf4e383b3d121084 Merge: ab9c35f043 262ddfee7a Author: Nick Mathewson Date: Tue Aug 11 10:44:40 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitlab-ci.yml | 5 + scripts/ci/ci-driver.sh | 5 + 2 files changed, 10 insertions(+)

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

commit 7d80bf80fe9017e04fff4b588f49d0393332ebee Merge: c1b440f760 f3fcc89d05 Author: Nick Mathewson Date: Mon Aug 10 19:33:07 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitlab-ci.yml| 120 ++-- scripts/ci/ci-driver.sh | 424

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

commit c1b440f7606303225b20e7a7a893afe6ecbc504e Merge: 18d2c7c5d7 39d5e7c764 Author: Nick Mathewson Date: Thu Aug 6 13:24:12 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) ___

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

commit 4c22050de14244418b1b3dbce124544e7fb40e4a Merge: b4400e2093 e78a7450a2 Author: Alexander Færøy Date: Fri Jul 31 02:03:35 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 0c8c295963b5389684d3b41e9260f7fbba4dfe2a Merge: c7502b6503 3b8bf743ae Author: Nick Mathewson Date: Wed Jul 29 12:37:08 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 31eba7f009367cd51e5bf5189a3a4f4ca7b404ac Merge: 95914ceb57 97d0cb83ed Author: Nick Mathewson Date: Mon Jul 27 12:56:19 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-)

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

commit 07934664c56f3b5b9f500d2906b0cd7c7b39ec31 Merge: 1ee164afc2 6354b70e49 Author: Nick Mathewson Date: Thu Jul 23 10:09:14 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/ticket40061 | 5 + src/app/config/fallback_dirs.inc | 503

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

commit 515d4f1e93bcf9160c8b41d5a90b3144388f706f Merge: eb427f309c 0acc3ae879 Author: David Goulet Date: Mon Jul 13 15:03:34 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 Makefile.am | 3 +-- changes/ticket40030 | 7 +++ 2 files changed, 8 insertions(+), 2

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

commit eb6fc9f9bd89a02088af1cfa6fb4e39fe15ea9fc Merge: 3efd60474 3517d2032 Author: Nick Mathewson Date: Thu Jul 9 13:15:23 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 `-s ours` to avoid version bump. ___ tor-commits

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

commit f9f4c4ab1d37920eb76b024a1057a0b26ddb8377 Merge: e500ea2ea 7ba849349 Author: Nick Mathewson Date: Thu Jul 9 10:31:16 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 `-s ours` to avoid version bump. ___ tor-commits

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

commit 0f39cc10f65df9fa52123eb607f5f1474c10e58b Merge: 1af7f40da af08dad6d Author: Nick Mathewson Date: Thu Jul 9 09:28:53 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug33119 | 4 +++ src/lib/tls/tortls_nss.c | 47 +++

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

commit 9603d8af0b36dc8faf297c2a300becebfc2f721b Merge: d4c79cae7 c364e0e83 Author: Alexander Færøy Date: Wed Jul 8 00:36:48 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug40028 | 3 +++ src/lib/tls/x509.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

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

commit d4c79cae76536673184ffd4f6116bcd07fd0b1f5 Merge: 05ca50c9a a213d2793 Author: Alexander Færøy Date: Tue Jul 7 14:48:36 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 .appveyor.yml | 2 +- changes/ticket40026 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

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

commit 8da10e8237df074194594823e6102f7bc6e811ae Merge: 0d02c053f 5a5ff3d8c Author: David Goulet Date: Thu Jul 2 07:20:58 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug16016 | 4 src/feature/nodelist/routerlist.c | 6 +- 2 files changed, 9

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

commit 0d02c053f84cbbca6c373ccea5b2174e6c62e3c4 Merge: 9638c6d7a 1932a84ef Author: George Kadianakis Date: Wed Jul 1 12:55:03 2020 +0300 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/ticket33346 | 3 +++ src/lib/sandbox/sandbox.c | 3 +++ 2 files changed, 6 insertions(+)

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

commit 9638c6d7a7c9de5336eab16eb013f97a62c75022 Merge: 0d5152fc5 322abd4fd Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 0d5152fc532a6a6738023d01b9a5b89db6ac7757 Merge: bb5745d65 5a38c73f7 Author: Alexander Færøy Date: Tue Jun 30 14:19:44 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit bb5745d6568ffcaebbe0c69d8e6865ba5eb163ca Merge: 572cf774b fb46d1bb3 Author: Alexander Færøy Date: Tue Jun 30 14:16:16 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 572cf774b974edc83631e8f59dfe18e39f093571 Merge: aced9be22 38f3cf410 Author: Alexander Færøy Date: Tue Jun 30 14:03:04 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit aced9be2243e823be3b3d771ae2dc59514fb5eba Merge: 21cf91ee2 2042ebe88 Author: Alexander Færøy Date: Tue Jun 30 13:48:49 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 21cf91ee2c3bb664253cc096c1aaa45fd491594e Merge: feddba6f8 c57896a76 Author: Alexander Færøy Date: Tue Jun 30 13:37:20 2020 + Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit feddba6f8b5af92cc7618d09c99b3290d7372174 Merge: b2ce815bd eef77227e Author: Nick Mathewson Date: Mon Jun 29 13:57:50 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit b2ce815bd8ddcde2ea49b0020b3feda83d88444f Merge: 9e85515f8 d124cfc05 Author: Nick Mathewson Date: Mon Jun 29 13:56:16 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 9e85515f8335428242f0f1751de1e03077fb0133 Merge: 6fb31bb34 31bdfd492 Author: Nick Mathewson Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 6fb31bb34a92d35d1c74af976a46bace4fcccf35 Merge: 41a424390 f862971d0 Author: Nick Mathewson Date: Mon Jun 29 12:58:50 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 41a424390107f62a754f7344f23ffe9958e00c6d Merge: 2c61f22e4 3008255ae Author: Nick Mathewson Date: Mon Jun 29 12:56:50 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 2c61f22e438d5ba13ace278af5c9c1005dde58f1 Merge: 68d848e24 183d0d30d Author: Nick Mathewson Date: Mon Jun 29 12:55:35 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 75734f48aabb955ed39c42dfd37849a7fa3df423 Merge: 52edea121 272c17113 Author: David Goulet Date: Fri Jun 12 12:55:41 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 .travis.yml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-)