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

2021-02-03 Thread nickm
commit 1c5dd021a7666806284b851ecb1879704df8020e Merge: 5232091616 8a17999da3 Author: Nick Mathewson Date: Wed Feb 3 13:39:54 2021 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2021-02-03 Thread dgoulet
commit e51724f857aca81c5c89f70369f280c1a785cf1c Merge: f7f7304c9b 890a9e89ba Author: David Goulet Date: Wed Feb 3 09:11:14 2021 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 src/core/or/address_set.c | 75 --- src/core/or/address_set.h |

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

2021-02-03 Thread dgoulet
commit d9e648f0d961699c1eb89fd49dfdcfce80e598a9 Merge: 62cecfdc5f e50648582b Author: David Goulet Date: Wed Feb 3 08:54:40 2021 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 src/core/or/connection_edge.c | 2 +- src/feature/nodelist/nodelist.c | 63

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

2021-02-03 Thread dgoulet
commit f7f7304c9bb810ad711cc95b5b97f7e55fd4f64f Merge: d9e648f0d9 cc5d5a5d1e Author: David Goulet Date: Wed Feb 3 08:56:38 2021 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 src/core/or/connection_edge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

2021-02-03 Thread dgoulet
commit 62cecfdc5f998afee580b7338325db803c69b827 Merge: 0968c40e36 0f8195406e Author: David Goulet Date: Wed Feb 3 08:51:37 2021 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 src/core/or/connection_edge.c | 12 src/feature/nodelist/nodelist.c | 8 ++-- 2 files

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

2021-02-03 Thread dgoulet
commit 0968c40e36f7cb73ceb7d5761c329ac37692429e Merge: c51ce99da6 705fd37875 Author: David Goulet Date: Wed Feb 3 08:44:19 2021 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket2667 | 4 ++ src/core/or/address_set.c | 74

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

2021-01-28 Thread dgoulet
commit 7ce2f490ad6709b37d0afe053d1ac877a2344362 Merge: e44f01f5a8 79cb47cfc2 Author: David Goulet Date: Thu Jan 28 12:46:31 2021 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug33781 | 7 +++ src/lib/fs/files.c | 8 +--- src/test/test_util.c | 49

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

2021-01-28 Thread dgoulet
commit e44f01f5a8db70a676512043b25eb4ccca8dac44 Merge: e5ea02a662 f058db1f3d Author: David Goulet Date: Thu Jan 28 12:42:31 2021 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug40190 | 4 src/core/proto/proto_socks.c | 7 ++- 2 files changed, 10

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

2021-01-28 Thread dgoulet
commit e5ea02a662450ded7fcfcf31e8cd0ec0ec421ed5 Merge: c36c6b5057 f3da5f88d7 Author: David Goulet Date: Thu Jan 28 12:36:42 2021 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug40210 | 5 + src/ext/keccak-tiny/keccak-tiny.h | 2 +- 2 files changed, 6

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

2021-01-28 Thread dgoulet
commit c36c6b50575cc0db94e6e770f5b4d437c851ff59 Merge: 0b49cacd63 dd5fbc1bd9 Author: David Goulet Date: Thu Jan 28 12:14:10 2021 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket40237 | 5 +++ src/core/mainloop/mainloop.c | 3 +-

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

2021-01-28 Thread dgoulet
commit 0b49cacd6354063b94338058ff6b1ab52b03f3f1 Merge: d2b7f4c1a2 6186288eb6 Author: David Goulet Date: Thu Jan 28 12:08:21 2021 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2021-01-28 Thread dgoulet
commit d2b7f4c1a2f9a9deca26b1f2f8cdb0559b0dca89 Merge: ee14fae8a7 a17be1b5b6 Author: David Goulet Date: Thu Jan 28 12:04:42 2021 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2021-01-28 Thread dgoulet
commit ee14fae8a7ce9e3f4199ad97f90a1cff6f71e4fc Merge: 7d4049fa9e ab58dd1577 Author: David Goulet Date: Thu Jan 28 12:02:43 2021 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug40117 | 5 + src/feature/rend/rendmid.c | 6 -- 2 files changed, 9

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

2021-01-28 Thread dgoulet
commit 7d4049fa9ed77d0e90e8adb8670e1e7ef585a658 Merge: ac005aacf5 7ae74203e1 Author: David Goulet Date: Thu Jan 28 12:00:17 2021 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket40165| 5 + changes/ticket40170| 3 +++

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

2021-01-28 Thread nickm
commit ac005aacf588d599abfb95b9c2a54bcffd87dded Merge: c3987a66c9 c3ed4b2e56 Author: Nick Mathewson Date: Thu Jan 28 11:20:20 2021 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2021-01-21 Thread dgoulet
commit c3987a66c9926f82d9432981587fafd0cfb558cf Merge: ab75eef8dd 641dce2d6b Author: David Goulet Date: Thu Jan 21 16:18:43 2021 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 .gitignore | 1 + 1 file changed, 1 insertion(+) ___

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

2021-01-21 Thread dgoulet
commit ab75eef8dda56523ac2ada0602395e2635b51b61 Merge: 1cd6baad7e c09f8da8a9 Author: David Goulet Date: Thu Jan 21 16:06:54 2021 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 .gitignore | 3 +++ Makefile.am| 14 ++

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

2021-01-19 Thread nickm
commit 1cd6baad7ef543ec264790d4db3a3ff1d114d54e Merge: 742d18e047 9b390a556e Author: Nick Mathewson Date: Tue Jan 19 12:53:52 2021 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug40113 | 3 +++ src/test/test_connection.c | 13 +++-- 2 files changed, 10

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

2021-01-19 Thread nickm
commit 742d18e047678d6aca026b24be016bf24fd0e4c6 Merge: 558dce9cef a22bfe04bc Author: Nick Mathewson Date: Tue Jan 19 12:45:07 2021 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 changes/40241_v2| 4 src/core/or/channeltls.c| 4 +---

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

2021-01-13 Thread dgoulet
commit 558dce9cefd0e57a5ef4dbccd87791a7281670ed Merge: 33f14fc6d3 17eb635532 Author: David Goulet Date: Wed Jan 13 10:38:05 2021 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 .gitignore | 3 +++ 1 file changed, 3 insertions(+) ___

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

2021-01-11 Thread nickm
commit 33f14fc6d35710a8dc69fb2401191bf10d360f30 Merge: 9b654b95ec 4b39f46a61 Author: Nick Mathewson Date: Mon Jan 11 14:37:29 2021 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 changes/40241 | 4 src/core/or/channeltls.c| 3 ++-

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

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

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

2020-11-16 Thread nickm
commit a211f547491abf2c517e77dfa3cfc4b2205d1a4d Merge: be356d80fe 7c0778ef7e Author: Nick Mathewson Date: Mon Nov 16 22:42:22 2020 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug40179_part1 | 4 src/test/hs_ntor_ref.py | 6 -- 2 files changed, 8 insertions(+), 2

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

2020-11-12 Thread nickm
commit ded1695a66a868e9878e091ff1d0c47d18a7f636 Merge: 26465179fa fd22fa183b Author: Nick Mathewson Date: Thu Nov 12 08:13:37 2020 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2020-11-09 Thread nickm
commit c142045be26a527059112d34e06a12796ba6b204 Merge: 328078c3a0 3d3dc08ed8 Author: Nick Mathewson Date: Mon Nov 9 17:14:58 2020 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2020-11-09 Thread nickm
commit 4234a9d81910812f57796087d4d12bf357219666 Merge: 2ec66e346b 0b2c64effd Author: Nick Mathewson Date: Mon Nov 9 16:13:43 2020 -0500 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug40080 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/channel.h |

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

2020-10-28 Thread ahf
commit 2ec66e346b9e78d03c2dfcaa557d3df3cb21656f Merge: 497033b05f 4876409c2a Author: Alexander Færøy Date: Wed Oct 28 15:39:37 2020 + Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket40133 | 5 ++ src/core/or/protover.c | 4 +-

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

2020-10-07 Thread nickm
commit 497033b05f10fc2d9fd1bb9249074f550c812e62 Merge: ddd3e7d094 8e7778ec8a Author: Nick Mathewson Date: Wed Oct 7 09:29:17 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-10-07 Thread nickm
commit ddd3e7d094f5a2c5d3bc45efa3ce5e2026184c6a Merge: df3e5e1cb0 40f0db75bd Author: Nick Mathewson Date: Wed Oct 7 08:38:30 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket40003| 3 +++ src/feature/rend/rendservice.c | 19 +++ 2 files

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

2020-10-07 Thread nickm
commit df3e5e1cb087aca9d323e783345c4932d587455b Merge: bfa8f3f93a 884cad3edf Author: Nick Mathewson Date: Wed Oct 7 08:35:18 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug34400 | 5 + src/feature/control/control_cmd.c | 2 +- 2 files changed, 6

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

2020-10-07 Thread nickm
commit bfa8f3f93a71a4c547be5a4e92fa28bb6cd68c47 Merge: bef4760055 3e9fa5a029 Author: Nick Mathewson Date: Wed Oct 7 08:29:31 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket33880 | 6 ++ src/core/or/channel.c | 32 +--- 2 files

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

2020-10-07 Thread nickm
commit bef47600552c78ee0ad849cb8b4a98039234ae63 Merge: 225d255fdc 701a1936fa Author: Nick Mathewson Date: Wed Oct 7 08:26:04 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket33747| 7 +++ src/core/mainloop/connection.c | 7 ++-

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

2020-10-07 Thread nickm
commit 225d255fdc1b8edf96b1c8fb72c5479c220d4112 Merge: 02f8852386 a49373844c Author: Nick Mathewson Date: Wed Oct 7 08:16:19 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-10-07 Thread nickm
commit 02f88523864960f8ef968a824e4f7863b5ad Merge: e60d62e50d 9587512578 Author: Nick Mathewson Date: Wed Oct 7 08:10:08 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket40035 | 5 + src/lib/tls/tortls_nss.c | 10 ++ 2 files changed, 15

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

2020-10-07 Thread nickm
commit e60d62e50d347c4db7356429835f52f502e5fa01 Merge: 6b828ced0f 902982 Author: Nick Mathewson Date: Wed Oct 7 08:08:02 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket40073| 3 +++ src/core/mainloop/connection.c | 9 - 2 files changed, 11

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

2020-10-07 Thread nickm
commit 6b828ced0f6dbff3f3dcbcfbe57959467f548a58 Merge: 8ac1f8663b 8a561fc5bf Author: Nick Mathewson Date: Wed Oct 7 08:05:40 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket40081| 6 ++ src/core/or/channel.c | 44

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

2020-10-07 Thread nickm
commit 8ac1f8663b1f3fd734cf9a54f48ae04a75e48ebf Merge: c374d49381 b5a88e8d47 Author: Nick Mathewson Date: Wed Oct 7 08:03:52 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/parallel_unit_test | 4 src/test/include.am| 23 ---

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

2020-09-22 Thread dgoulet
commit c374d49381aefdcacca7d3dc23cd09cedf25d3ba Merge: 2b6faed7ba beffad8529 Author: David Goulet Date: Tue Sep 22 13:47:08 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket40135 | 3 +++ src/feature/hs_common/shared_random_client.c | 4

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

2020-09-21 Thread nickm
commit 2b6faed7ba1f6a5da58ebf8f064b73ce4b088d6d Merge: 075beab2fb 0d78fbb718 Author: Nick Mathewson Date: Mon Sep 21 12:59:03 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 .gitlab-ci.yml | 46 ++ scripts/ci/ci-driver.sh | 20

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

2020-09-18 Thread nickm
commit 075beab2fb5a5cf3e016ddde94fed8c415b93dd4 Merge: 3028e85b11 b643ced022 Author: Nick Mathewson Date: Fri Sep 18 19:06:16 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 .gitlab-ci.yml | 27 ++- scripts/ci/ci-driver.sh | 5 + 2 files

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

2020-09-18 Thread dgoulet
commit 3028e85b1192ad2712cb0e5e2347cb9bfb0bb88d Merge: 023728cb84 2ddbfc64af Author: David Goulet Date: Fri Sep 18 09:45:25 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket40126 | 4 src/test/test_rendcache.c | 1 + 2 files changed, 5 insertions(+)

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

2020-09-17 Thread nickm
commit 023728cb843daeff1d87e79f6a4cdf68c137efee Merge: e78ce52aff 078194ecaf Author: Nick Mathewson Date: Thu Sep 17 13:56:40 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket40125 | 4 src/test/test_rendcache.c | 2 ++ 2 files changed, 6 insertions(+)

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

2020-08-13 Thread nickm
commit e78ce52aff553c71ec8092de9fea8f3078abba72 Merge: 146e4cfa95 7915b651d9 Author: Nick Mathewson Date: Thu Aug 13 14:20:39 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug40099 | 4 src/test/test_rendcache.c | 1 + 2 files changed, 5 insertions(+)

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

2020-08-12 Thread nickm
commit 146e4cfa95c3d0cd26f0804e186b2d445a3f771c Merge: f94ad3d32a 34919368ce Author: Nick Mathewson Date: Wed Aug 12 20:21:04 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 .gitlab-ci.yml | 34 +- scripts/ci/ci-driver.sh | 34

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

2020-08-12 Thread nickm
commit f94ad3d32a92f3709df37ae06b57ca47616a552f Merge: cff2c3d5fa 309eafbc3c Author: Nick Mathewson Date: Wed Aug 12 12:29:17 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 .gitlab-ci.yml | 36 --- Makefile.am | 2 ++

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

2020-08-12 Thread nickm
commit cff2c3d5fa49b733537fb4070db57538c6bab97a Merge: c87a5d7af5 489d33e190 Author: Nick Mathewson Date: Wed Aug 12 08:39:41 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 .appveyor.yml | 8 1 file changed, 8 deletions(-)

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

2020-08-11 Thread nickm
commit c87a5d7af524058826e8469f7d9dae8dab034f29 Merge: 4ccf99b549 0ec2d1528c Author: Nick Mathewson Date: Tue Aug 11 12:37:08 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 .gitlab-ci.yml | 5 +++-- scripts/ci/ci-driver.sh | 27 ++- 2 files

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

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

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

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

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

2020-08-10 Thread nickm
commit ffe240951e44faafd21c3811c34cfeae4792488e Merge: 44546aeb3f f3fcc89d05 Author: Nick Mathewson Date: Mon Aug 10 19:33:07 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 .gitlab-ci.yml| 120 ++-- scripts/ci/ci-driver.sh | 424

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

2020-08-06 Thread nickm
commit 44546aeb3ff6de273033c6d160a11973df85e01b Merge: f67d5b39a4 39d5e7c764 Author: Nick Mathewson Date: Thu Aug 6 13:24:12 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) ___

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

2020-07-30 Thread ahf
commit f67d5b39a4d325ac8b3a72134957e121027b199d Merge: 97b8a25162 e78a7450a2 Author: Alexander Færøy Date: Fri Jul 31 02:03:35 2020 + Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug40076| 5 src/lib/buf/buffers.c | 2 ++ src/test/test_buffers.c | 64

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

2020-07-29 Thread nickm
commit 97b8a25162cedccdc259cd793b20b06350ae5f46 Merge: 8b5b0c2bda 3b8bf743ae Author: Nick Mathewson Date: Wed Jul 29 12:37:07 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug31036| 3 +++ src/lib/fdio/fdio.c | 6 +++--- 2 files changed, 6 insertions(+), 3

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

2020-07-27 Thread nickm
commit 8b5b0c2bda0ee7255a9e0e83b3816c70d8ad Merge: f7dbae4e89 97d0cb83ed Author: Nick Mathewson Date: Mon Jul 27 12:56:19 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 src/app/config/fallback_dirs.inc | 15 --- 1 file changed, 15 deletions(-)

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

2020-07-23 Thread nickm
commit f7dbae4e894a048e3fe74d14c0d45bd4090cf99c Merge: 05af1e25a0 6354b70e49 Author: Nick Mathewson Date: Thu Jul 23 10:09:14 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket40061 | 5 + src/app/config/fallback_dirs.inc | 503

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

2020-07-13 Thread dgoulet
commit 05af1e25a0d61b2d840d7d48efcaf51d6b4ebbf7 Merge: af46b1d8cd 0acc3ae879 Author: David Goulet Date: Mon Jul 13 14:58:40 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 Makefile.am | 3 +-- changes/ticket40030 | 7 +++ 2 files changed, 8 insertions(+), 2

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

2020-07-09 Thread nickm
commit af46b1d8cd045ecc024719f42e50bd342a2aeca8 Merge: 30711296f 3517d2032 Author: Nick Mathewson Date: Thu Jul 9 13:15:59 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2020-07-09 Thread nickm
commit 30711296fd5b7f51ef6f4d7b3fbe20f12990c02c Merge: 412546c48 7ba849349 Author: Nick Mathewson Date: Thu Jul 9 10:32:39 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2020-07-09 Thread nickm
commit 18338f87718422bc76620649b385fbbc8ab027dc Merge: cee58b7f9 af08dad6d Author: Nick Mathewson Date: Thu Jul 9 09:28:53 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug33119 | 4 +++ src/lib/tls/tortls_nss.c | 47 +++

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

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

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

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

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

2020-07-02 Thread dgoulet
commit 9eedfefc3d7e28c32533e79ca16ecfeeb5c6ac90 Merge: be17fa169 5a5ff3d8c Author: David Goulet Date: Thu Jul 2 07:20:58 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug16016 | 4 src/feature/nodelist/routerlist.c | 6 +- 2 files changed, 9

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

2020-06-30 Thread ahf
commit be17fa169321d2c69618d4636ac5e1f1fc3a4cb8 Merge: ff4bd6699 322abd4fd Author: Alexander Færøy Date: Tue Jun 30 14:23:41 2020 + Merge branch 'maint-0.4.3' into release-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-30 Thread ahf
commit ff4bd6699887ea41c1397ec73fb0f9aea519ec76 Merge: 0a3093533 5a38c73f7 Author: Alexander Færøy Date: Tue Jun 30 14:19:44 2020 + Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug34130 | 4 src/lib/sandbox/sandbox.c | 14 ++ 2 files changed, 18

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

2020-06-30 Thread ahf
commit 0a3093533357d800389bf2d610bce3d3603ed544 Merge: 0c714b2c5 fb46d1bb3 Author: Alexander Færøy Date: Tue Jun 30 14:16:16 2020 + Merge branch 'maint-0.4.3' into release-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-30 Thread ahf
commit 0c714b2c55feaa9309ca52a4452e8c0b5b365835 Merge: 191a104af 38f3cf410 Author: Alexander Færøy Date: Tue Jun 30 14:03:04 2020 + Merge branch 'maint-0.4.3' into release-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-30 Thread ahf
commit 191a104afd4f565011d5181eb4dced6631fcc2ed Merge: b7f5113f7 2042ebe88 Author: Alexander Færøy Date: Tue Jun 30 13:48:49 2020 + Merge branch 'maint-0.4.3' into release-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-30 Thread ahf
commit b7f5113f72e5bdd075a7f5713094874544ac8510 Merge: fc4e1697f c57896a76 Author: Alexander Færøy Date: Tue Jun 30 13:37:20 2020 + Merge branch 'maint-0.4.3' into release-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-29 Thread nickm
commit fc4e1697fd44f0cf1db6d8a2ac2f4ad3159cffd3 Merge: 8a721e520 eef77227e Author: Nick Mathewson Date: Mon Jun 29 13:57:50 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-29 Thread nickm
commit 8a721e5208b1e6665e1add8f4e776d0ff749369e Merge: 6a98e5f0d d124cfc05 Author: Nick Mathewson Date: Mon Jun 29 13:56:16 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-29 Thread nickm
commit 6a98e5f0d1945ea9a8924fdcfa66bc63cb3c6768 Merge: 140057360 31bdfd492 Author: Nick Mathewson Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-29 Thread nickm
commit 1400573601a9aa0773d87da8b0913167a566a567 Merge: 388210ceb f862971d0 Author: Nick Mathewson Date: Mon Jun 29 12:58:50 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-29 Thread nickm
commit 388210ceb9f3ac236f6e35de17092c7c54f163fe Merge: eef815eb5 3008255ae Author: Nick Mathewson Date: Mon Jun 29 12:56:50 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug32588 | 4 ++ src/app/config/config.c| 5 +- src/app/config/config.h| 4

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

2020-06-29 Thread nickm
commit eef815eb5ebf4d38c555973ebde9d7dbba5e08a0 Merge: 50bd3f62f 183d0d30d Author: Nick Mathewson Date: Mon Jun 29 12:55:35 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 ___ tor-commits mailing list tor-commits@lists.torproject.org

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

2020-06-12 Thread dgoulet
commit 50bd3f62fe97edfdf87dc1435dc6230b8c0f4cb4 Merge: 854e4df58 272c17113 Author: David Goulet Date: Fri Jun 12 12:55:41 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 .travis.yml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-)

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

2020-06-05 Thread nickm
commit 854e4df581f68bc05e3e7f9589f9703e09130273 Merge: 7c7e2e2fe 754d4e9a1 Author: Nick Mathewson Date: Fri Jun 5 12:37:30 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 .appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) ___

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

2020-06-02 Thread asn
commit 7c7e2e2fea662577ecf129e5dce409125a9683fd Merge: bd61a36fd 6b05d447b Author: George Kadianakis Date: Tue Jun 2 14:05:42 2020 +0300 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug34303| 5 + src/core/or/circuitlist.c | 2 +-

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

2020-06-01 Thread nickm
commit bd61a36fde5b26a85f71d08521f1278c7fe9cfbd Merge: a93a9cfe2 688d1b3f0 Author: Nick Mathewson Date: Mon Jun 1 09:47:45 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug34299 | 3 +++ doc/tor.1.txt| 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

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

2020-05-28 Thread asn
commit a93a9cfe2390bcb28c5b2d7a68d6e6c7e2b74ec4 Merge: 2d331e30c 6891d1bbc Author: George Kadianakis Date: Thu May 28 12:52:48 2020 +0300 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket33458 | 4 +++ src/feature/hs/hs_cache.c | 64

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

2020-05-19 Thread nickm
commit 2d331e30c6a34f168ae6c6df498218d1cda5c902 Merge: 577655d6b bdb3be011 Author: Nick Mathewson Date: Tue May 19 09:39:12 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket34255_043| 3 +++ src/lib/conf/confdecl.h| 6 +++---

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

2020-05-15 Thread nickm
commit 577655d6b8344c2d9534825e7ecedec79d3556a0 Merge: fb3777041 6f2b6ede1 Author: Nick Mathewson Date: Fri May 15 10:28:36 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug34233 | 4 1 file changed, 4 insertions(+) ___

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

2020-05-15 Thread nickm
commit fb3777041d630f6334f3aa9589ae69cc70a3a00b Merge: cf1f5c68b bcaf480ae Author: Nick Mathewson Date: Fri May 15 10:25:27 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

2020-05-15 Thread nickm
commit cf1f5c68b94d567f3da4ab733299d07e36b3b8d3 Merge: 5ceb60e5c c0dd2a6e3 Author: Nick Mathewson Date: Fri May 15 09:02:49 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2020-05-14 Thread nickm
commit 5b8b9a97b4ae0eba050fe9d22dcac67c09996a87 Merge: 2a4c0ce21 75fc33f33 Author: Nick Mathewson Date: Thu May 14 10:39:00 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2020-05-14 Thread nickm
commit 701221add5b59b4195b2d3de31d0b03e195761bc Merge: a58dda96b ee6409ab6 Author: Nick Mathewson Date: Thu May 14 10:20:08 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 .travis.yml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-)

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

2020-05-06 Thread nickm
commit a58dda96b64761c1df54c1a0cb5d21e12a6a0e49 Merge: 275b9f1e4 b444096be Author: Nick Mathewson Date: Wed May 6 17:18:46 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug34131 | 4 src/core/or/connection_edge.c | 6 --

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

2020-05-06 Thread nickm
commit 275b9f1e416da918768e705b8e08ece9f02db8c7 Merge: 3b952e26e ae1ebb5f4 Author: Nick Mathewson Date: Wed May 6 16:58:12 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug34078 | 5 src/app/config/quiet_level.c | 2 +-

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

2020-05-06 Thread nickm
commit 79c125bd2d200ed38297d084e4a3fafa4d62b759 Merge: b762f168b fecc5fd38 Author: Nick Mathewson Date: Wed May 6 16:47:03 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 configure.ac | 16 src/core/proto/proto_socks.c | 5

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

2020-05-06 Thread nickm
commit 3b952e26eeac8ebbd8eb6d7f14f9d5816c7913e3 Merge: 79c125bd2 2cd1c0765 Author: Nick Mathewson Date: Wed May 6 16:50:21 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 src/feature/hs/hs_dos.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

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

2020-05-05 Thread nickm
commit b762f168bf811a15a0317246af609c8d3372dd5c Merge: a56d990fc e61867416 Author: Nick Mathewson Date: Mon May 4 10:25:52 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++-

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

2020-04-21 Thread nickm
commit a56d990fc45b0a32f7c9859f541b2f0d0e437ad8 Merge: 64e266b71 42507429c Author: Nick Mathewson Date: Tue Apr 21 12:22:37 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug33918 | 3 +++ src/core/or/channeltls.c | 3 ++- 2 files changed, 5 insertions(+), 1

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

2020-04-13 Thread nickm
commit 64e266b710217e140fed1b370420f17c05831c56 Merge: 251efd11e 2e80d7f19 Author: Nick Mathewson Date: Mon Apr 13 17:02:53 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2020-04-13 Thread nickm
commit 935fb0dca9191bd9368c5eadf662cf00f101a92d Merge: dd7838cd6 55cb6c3fc Author: Nick Mathewson Date: Mon Apr 13 14:15:25 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug33545 | 4 src/feature/control/control_hs.c | 9 -

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

2020-04-09 Thread nickm
commit b5e0abe18604e1f73ba9a709d505f15fbb9a5f90 Merge: 7aa1e9b61 bfea7a732 Author: Nick Mathewson Date: Thu Apr 9 08:39:16 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2020-04-09 Thread nickm
commit 7aa1e9b61b07324ff370ef0875d0d4a3bb821520 Merge: c502ce076 c4da0a509 Author: Nick Mathewson Date: Thu Apr 9 08:33:36 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug33087 | 7 ++ configure.ac | 1 + src/lib/err/torerr.c | 26

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

2020-04-09 Thread teor
commit c502ce0762e1680503f6e6dc64c82852ccd19738 Merge: 456337a8d 1ae0839ef Author: teor Date: Thu Apr 9 19:43:28 2020 +1000 Merge branch 'maint-0.4.3' into release-0.4.3 Makefile.am | 1 - 1 file changed, 1 deletion(-) ___ tor-commits mailing

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

2020-04-08 Thread teor
commit 456337a8dd52085c4a8647ceb2b74f40fde20934 Merge: 72e4ed863 f6efb3a18 Author: teor Date: Thu Apr 9 11:07:47 2020 +1000 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket33804 | 7 +++ doc/tor.1.txt | 7 +++ src/app/config/config.c | 4 ++--

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

2020-04-08 Thread teor
commit 72e4ed86347a9426788265379befe8dd7be6b0d6 Merge: a985f554c 2d6f00e45 Author: teor Date: Thu Apr 9 11:03:37 2020 +1000 Merge branch 'maint-0.4.3' into release-0.4.3 changes/ticket33491 | 6 ++ src/core/or/channel.c | 2 +- src/core/or/dos.c | 4 ++-- src/core/or/dos.h

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

2020-04-08 Thread dgoulet
commit a985f554c491638c56b802d93409e3bb56a24fd3 Merge: e8bbdc69d 34faee060 Author: David Goulet Date: Wed Apr 8 09:42:13 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 src/test/test_addr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

2020-04-05 Thread teor
commit e8bbdc69d1cb3260974d0e44aed06e9a6983daa6 Merge: 938502062 80a306c6e Author: teor Date: Sun Apr 5 17:17:47 2020 +1000 Merge branch 'maint-0.4.3' into release-0.4.3 doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

  1   2   >