commit 4c58953fc21108fc7cc6ebce1ee4f21d535e95fa
Merge: 22fd351cf5 5afdc851b2
Author: David Goulet
Date: Fri Feb 4 12:36:45 2022 -0500
Merge branch 'maint-0.4.6' into release-0.4.6
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 2bd52e2adc36a678ebd4b04ebbb7e5f00484348b
Merge: 8390aa1c44 81a4f92b64
Author: David Goulet
Date: Fri Feb 4 11:10:07 2022 -0500
Merge branch 'maint-0.4.6' into release-0.4.6
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 8390aa1c448a89ad38b5c86f43e726295b53fdc4
Merge: df2c354d17 728191fc2e
Author: David Goulet
Date: Fri Feb 4 11:07:34 2022 -0500
Merge branch 'maint-0.4.6' into release-0.4.6
changes/fallbackdirs-2022-02-04 |2 +
changes/geoip-2022-02-04 |3 +
commit df2c354d172ab8957d111f6ed7e3ccd678d0e085
Merge: 415e270651 1c0f56bc3f
Author: David Goulet
Date: Fri Feb 4 10:56:33 2022 -0500
Merge branch 'maint-0.4.6' into release-0.4.6
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 415e27065176c88a49d0157e85782e32b8b28243
Merge: 6be7023e1c d69a994d46
Author: David Goulet
Date: Fri Feb 4 10:18:25 2022 -0500
Merge branch 'maint-0.4.6' into release-0.4.6
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 6be7023e1c5c755e8de9d6d8ec94d19cf7d4f55f
Merge: 608f109597 a08b12568e
Author: David Goulet
Date: Thu Feb 3 08:30:40 2022 -0500
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40552 | 3 +++
src/feature/hs/hs_metrics.c | 6 +-
src/test/test_metrics.c | 4
commit 608f10959785e55d3823e86ffdfd7b8507128f1e
Merge: 0f79d0b757 bc500804fd
Author: David Goulet
Date: Mon Jan 24 10:49:41 2022 -0500
Merge branch 'maint-0.4.6' into release-0.4.6
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 0f79d0b7572a0d0fed683fa86b08013674c9bd90
Merge: 9b423b07b7 0f9967c945
Author: David Goulet
Date: Wed Jan 19 13:56:43 2022 -0500
Merge branch 'maint-0.4.6' into release-0.4.6
src/test/test_protover.c | 9 -
1 file changed, 9 deletions(-)
commit 9b423b07b72be15360ec439a1b84d879ace896b8
Merge: b92a44db0f 4d60ab8fb7
Author: David Goulet
Date: Tue Jan 18 13:15:38 2022 -0500
Merge branch 'maint-0.4.6' into release-0.4.6
src/feature/relay/router.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 5b18f824666571c2a84f1e4e19718fb9ad782d74
Merge: 10cd73761d 7d9d769123
Author: David Goulet
Date: Tue Jan 18 13:12:35 2022 -0500
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40509 | 4
src/core/or/protover.c | 4 ++--
src/test/test_protover.c | 2 +-
3
commit b92a44db0f22fcdc2c3c255f97e67fa603f3b9f9
Merge: 5b18f82466 ec5611e876
Author: David Goulet
Date: Tue Jan 18 13:15:29 2022 -0500
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40544 | 3 +++
src/app/main/main.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
commit 10cd73761d7d8a49ba64ddad5a8f31b5a95cb3a7
Merge: 88a3edb1c8 413e0c7575
Author: David Goulet
Date: Thu Dec 16 13:03:30 2021 -0500
Merge branch 'maint-0.4.6' into release-0.4.6
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 88a3edb1c8161683d170029ab9f6e8ce9e2607e2
Merge: c4efc42b5c 00d7337002
Author: David Goulet
Date: Thu Dec 16 12:22:27 2021 -0500
Merge branch 'maint-0.4.6' into release-0.4.6
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 30e55e1699b9590d61242b0f3d2ba2908b22cee3
Merge: 41f995a720 ea2ada6d14
Author: David Goulet
Date: Thu Dec 16 09:53:30 2021 -0500
Merge branch 'maint-0.4.6' into release-0.4.6
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit e7fc833753c31e7815151d9fda60166ee10f0fd3
Merge: a89ebdbc37 9a4366b3e3
Author: David Goulet
Date: Thu Dec 16 09:28:17 2021 -0500
Merge branch 'maint-0.4.6' into release-0.4.6
changes/fallbackdirs-2021-12-15 | 2 +
changes/geoip-2021-12-15| 3 +
configure.ac
commit a89ebdbc37003f1b0f611618e083a91b2fd36276
Merge: d06bcf7672 cda7acb35d
Author: Alexander Færøy
Date: Wed Dec 15 12:43:48 2021 +
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40527 | 5 +++
src/feature/stats/rephist.c | 12 ---
src/test/test_stats.c
commit d06bcf7672d20b0d655a8de7c176630f870cf595
Merge: 66ddef94a9 a78dafbf7c
Author: Alexander Færøy
Date: Mon Nov 8 14:16:19 2021 +
Merge branch 'maint-0.4.6' into release-0.4.6
changes/bug40429| 5 +
changes/ticket40511 | 6 ++
configure.ac| 14
commit 66ddef94a91a0543aee2b92c51eac6d9f4779470
Merge: b5d136088c 77b265f96e
Author: David Goulet
Date: Fri Nov 5 10:44:10 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
src/core/or/protover.c| 105 +-
src/core/or/protover.h
commit b5d136088cc6f13a27dcba0a66278f33a0c8e517
Merge: ef08058927 fb6bba1e42
Author: Alexander Færøy
Date: Fri Nov 5 03:10:29 2021 +
Merge branch 'maint-0.4.6' into release-0.4.6
.gitlab-ci.yml | 8
1 file changed, 8 insertions(+)
commit 6c1487c1be0a84ff0683f35043c2ea8621d54f1f
Merge: f7c71dc53d 83f8fe05e8
Author: David Goulet
Date: Wed Nov 3 09:53:35 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40494 | 5 +
doc/man/tor.1.txt| 3 ++-
commit ef08058927502aa6a31d9b7be20dca5f874a218b
Merge: 6c1487c1be 33fb0f1d8f
Author: David Goulet
Date: Wed Nov 3 09:54:14 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
scripts/ci/ci-driver.sh | 2 --
1 file changed, 2 deletions(-)
commit f7c71dc53d7fc350c2107d0348ce4be772693126
Merge: 94e4a6b4f6 621f8ac418
Author: David Goulet
Date: Wed Nov 3 09:47:44 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
doc/asciidoc-helper.sh | 5 +++--
scripts/ci/ci-driver.sh | 2 +-
2 files changed, 4 insertions(+), 3
commit 94e4a6b4f6a96b5272c755fcec849bfe6b74e4ee
Merge: 4d075e9994 9922116388
Author: Alexander Færøy
Date: Tue Nov 2 15:27:08 2021 +
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40504 | 3 +++
doc/man/tor.1.txt | 20
2 files changed, 23
commit 4d075e9994dd1560e752ffb74e2770f2d51e02b9
Merge: 9da81112ae 57f296b396
Author: Alexander Færøy
Date: Fri Oct 29 16:56:33 2021 +
Merge branch 'maint-0.4.6' into release-0.4.6
___
tor-commits mailing list
tor-commits
commit 9da81112aea69302b670451c7963e5ac1c7e4203
Merge: 74599cdb31 77c47417f2
Author: David Goulet
Date: Fri Oct 29 09:20:21 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
Makefile.am| 4
changes/ticket26299| 3 +++
doc/asciidoc-helper.sh | 4 +++-
commit 74599cdb318c3fd845d115caffb96e1b903e5850
Merge: 676381940e 5363d9b118
Author: David Goulet
Date: Thu Oct 28 14:27:09 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 676381940e340f284488efc43c8c3e63e006ea37
Merge: d4f68f1c69 89073bda5f
Author: David Goulet
Date: Thu Oct 28 10:38:20 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit d4f68f1c69cf53d3be71a6111c8a13049dae2a36
Merge: c8872ca88a fa405ca27f
Author: David Goulet
Date: Thu Oct 28 09:42:43 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 549e5cf90cf777d32975c9049f93bb8c5cc3acb2
Merge: ccdf9a3e35 61aed5200c
Author: David Goulet
Date: Tue Oct 26 14:33:49 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
scripts/ci/ci-driver.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ccdf9a3e35c68fff24728e6a5f6d140c91564710
Merge: d5efc2c986 90a74a2ea8
Author: David Goulet
Date: Tue Oct 26 11:31:45 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit d5efc2c98619568e0af2790a30c462a26fd8bae7
Merge: 2ae7a71f43 fadb57e853
Author: David Goulet
Date: Tue Oct 26 09:18:08 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 9e44116fe660b9f189c43dee389fe9db9a4f03ec
Merge: 81b37dacb5 0c5128eeb2
Author: Alexander Færøy
Date: Mon Oct 25 21:03:14 2021 +
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40500 | 3 +++
scripts/ci/ci-driver.sh | 7 +++
2 files changed, 6
commit 2fdeeaa64d79c156b4bf68eadff4aedd5500a515
Merge: 5be41d420f d496a75026
Author: David Goulet
Date: Thu Oct 21 10:01:38 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40493 | 2 +
src/app/config/fallback_dirs.inc | 951
commit 5be41d420f6b68c4a5eb1206fefdb33bd616b66d
Merge: da02708be1 bd1c14f015
Author: Alexander Færøy
Date: Thu Oct 21 12:35:36 2021 +
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40337| 16
doc/man/tor.1.txt | 5 +
commit da02708be17546d591c6499f5e69d22ed38800df
Merge: 6edc9bcc13 1e08efdb58
Author: Alexander Færøy
Date: Wed Oct 20 21:47:26 2021 +
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket30477 | 4
1 file changed, 4 insertions(+)
commit 6edc9bcc1376b7a9f31fc54239e9df7fdfa9d044
Merge: 07989171e3 16cbbf04c4
Author: Alexander Færøy
Date: Wed Oct 20 17:36:07 2021 +
Merge branch 'maint-0.4.6' into release-0.4.6
changes/bug40371| 6 ++
src/feature/relay/dns.c | 9 -
2 files changed, 6
commit 07989171e3fead146911e63f24c2dfcabe39c660
Merge: 5112b6cd4f caa305a5ad
Author: David Goulet
Date: Wed Oct 20 09:17:06 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40476 | 11 +--
changes/ticket40491 | 7 ++
commit 5112b6cd4f10a72952ce8a23dcdda93654c10ef2
Merge: 5153d9d9dd 326f954f10
Author: David Goulet
Date: Tue Oct 19 10:35:40 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40476 | 8
src/core/or/connection_edge.c | 28
commit 5153d9d9ddeef4dd576b9e9e34f5417715e6dd6d
Merge: 6e83db69a9 ce5b240c19
Author: David Goulet
Date: Wed Oct 6 15:45:19 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 6e83db69a9d7e6c3d940b1eb7584587045961e52
Merge: 53b08a1158 a160a9ec30
Author: David Goulet
Date: Wed Oct 6 15:41:17 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 53b08a1158b2f4a9c69c2ea908c7c2b73afb737c
Merge: fd640bbeae 474c85a98d
Author: David Goulet
Date: Wed Oct 6 15:35:43 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40434 | 6 ++
src/feature/dirclient/dirclient.c | 17 -
commit fd640bbeae9cd36b3b202f3d64474e68c9fd38cf
Merge: fb7c832597 82b7939d19
Author: David Goulet
Date: Wed Oct 6 13:25:08 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40474 | 5 +
src/core/or/connection_edge.c | 13 +
2 files changed,
commit fb7c8325973d704ca84546a04c24244e50d46b6f
Merge: 7456f6d777 f728e09ebe
Author: David Goulet
Date: Mon Sep 13 13:34:48 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
.gitlab-ci.yml | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
commit 7456f6d777e53c372d7d324f0589a50bfdd5c1d2
Merge: 31728f4ad3 2be49cdbe5
Author: David Goulet
Date: Mon Aug 16 16:34:52 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 1f76b3cce7c8aaaf08ae1a35799b5b366c7dfaf4
Merge: dafed93ccd 46ad2240de
Author: Alexander Færøy
Date: Mon Aug 16 15:28:22 2021 +
Merge branch 'maint-0.4.6' into release-0.4.6
src/test/test_util.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit dafed93ccd0a0eaaa42afcb1fd055aad03c85fd2
Merge: 078782e0d1 d1c781e67e
Author: Alexander Færøy
Date: Mon Aug 16 13:58:32 2021 +
Merge branch 'maint-0.4.6' into release-0.4.6
.gitlab-ci.yml | 16
1 file changed, 8 insertions(+), 8 deletions(-)
commit 078782e0d11e73775c7954671d573ac8eddf3015
Merge: 8f6513d54f 6a01c34bb8
Author: Nick Mathewson
Date: Mon Aug 16 09:51:27 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
src/test/test_util.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
commit c4531dc02ee9578409925f60b09f0003f2e385ce
Merge: 2a5430a4dd fd38609ae2
Author: Nick Mathewson
Date: Mon Aug 16 08:21:28 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 2a5430a4ddd7092690fb8f9fb1c3f2a3c8ddaa69
Merge: 04b0f78f43 70e249123a
Author: David Goulet
Date: Fri Aug 13 09:48:51 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 0233b06f28fc4d600bbae98da893e85578ca776b
Merge: 053c4578de 4c3c40e70c
Author: David Goulet
Date: Thu Aug 12 12:13:26 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/geoip-2021-08-12 | 3 +
src/config/geoip | 11954
commit 053c4578dec4b8cb1d325ed524cfd9a4b87973de
Merge: a6de7341dd b8660e384f
Author: Alexander Færøy
Date: Wed Aug 11 13:15:59 2021 +
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40447 | 2 +
src/app/config/fallback_dirs.inc | 948
commit a6de7341ddb977208836d6e13ab802a63ad5b128
Merge: 61f342380d e3c2179f25
Author: Alexander Færøy
Date: Wed Aug 11 13:14:26 2021 +
Merge branch 'maint-0.4.6' into release-0.4.6
changes/bug40078 | 3 +++
src/lib/crypt_ops/crypto_ed25519.c | 2 +-
2 files
commit 61f342380d7e0767df34253cbd90f9dd2903db2c
Merge: dcc41e15eb a3a5e26212
Author: Alexander Færøy
Date: Wed Aug 11 13:07:46 2021 +
Merge branch 'maint-0.4.6' into release-0.4.6
___
tor-commits mailing list
tor-commits
commit dcc41e15ebc752a242fc3581513f5de1865ceebf
Merge: cb9e346618 3d0b4c7c45
Author: Alexander Færøy
Date: Wed Aug 11 12:48:04 2021 +
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40301 | 4
1 file changed, 4 insertions(+)
commit cb9e3466188aae17e08844ac5a193a35b07edba3
Merge: d89bffb8c7 8b026b4eee
Author: George Kadianakis
Date: Wed Jul 7 13:04:39 2021 +0300
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40421 | 3 +++
src/core/or/connection_edge.c | 4
2 files changed, 7
commit d89bffb8c75c6e58d698c17fec2d0462efd77e61
Merge: 7f34440063 a522aabd3b
Author: George Kadianakis
Date: Tue Jul 6 13:52:16 2021 +0300
Merge branch 'maint-0.4.6' into release-0.4.6
src/test/test_dir.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 7f34440063013ba57f19e32fa5678ff5d37bbc8c
Merge: 1cc6cccdff 167f3bc4ec
Author: George Kadianakis
Date: Tue Jul 6 13:42:53 2021 +0300
Merge branch 'maint-0.4.6' into release-0.4.6
changes/bug40383| 7 +++
configure.ac| 1 +
commit 1cc6cccdff39599da592d14c97806305b6d5588a
Merge: 60d1fb3d37 2758ae30b3
Author: Nick Mathewson
Date: Wed Jun 30 12:02:34 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 01fd3ace03f587efa550322aef78681d25c7c214
Merge: bd3ed77191 2fff1fc835
Author: Nick Mathewson
Date: Wed Jun 30 08:18:42 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit bd3ed77191f27205bb6f7feab5c0601de7d51d4c
Merge: 2630e4eea1 4302c0b4a1
Author: Nick Mathewson
Date: Wed Jun 30 08:15:41 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/bug40409 | 3 +++
1 file changed, 3 insertions(+)
commit 2630e4eea10212e248ea78f118840db0b06834fb
Merge: 8edd19ca72 f2647295c0
Author: David Goulet
Date: Tue Jun 29 10:41:36 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
src/lib/crypt_ops/crypto_dh_nss.c | 2 ++
src/lib/crypt_ops/crypto_rand.c| 2 ++
commit 8edd19ca728523bf6b4b4d0ef6e507eef740b604
Merge: 3abb9180cb 45c8d69cbb
Author: Nick Mathewson
Date: Sat Jun 26 10:04:38 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40419 | 3 +++
src/test/test_address_set.c | 13 +
2 files changed, 16
commit 3abb9180cb3ff91153b34cb7c5db80421b2b9751
Merge: e18bf39e66 2c00ad36cd
Author: David Goulet
Date: Fri Jun 18 14:29:15 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40410 | 4
src/feature/dirclient/dirclient.c | 3 +--
2 files changed, 5
commit e18bf39e66eef181be5fa054d6a1bf806242fde6
Merge: 62a500dd1d 91aec8dbc1
Author: Nick Mathewson
Date: Mon Jun 14 11:49:01 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 58ad0302ea9acea48308f35dce4afa986919a151
Merge: 5481412cd7 8e590992c4
Author: Nick Mathewson
Date: Thu Jun 10 12:30:29 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/bug40392 | 4
src/feature/hs/hs_descriptor.c | 3 ++-
2 files changed, 6
commit 5481412cd7e1ffadc20a31ddf93dc110e7df
Merge: a2b0d7ead4 7be37a26ac
Author: Nick Mathewson
Date: Thu Jun 10 09:55:55 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
src/core/or/relay.c | 24 +++-
1 file changed, 3 insertions(+), 21 deletions(-)
commit f6ebe8b92081f6618c5c033c29b40df8db34b953
Merge: c58c2d4e37 69bd4a8a2d
Author: Nick Mathewson
Date: Thu Jun 10 08:42:15 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/bug40391 | 9 +
src/core/or/circuitmux.c | 7 ---
2 files changed, 13
commit a2b0d7ead432907944d78648ab95a7e2682c69db
Merge: f6ebe8b920 3260d323a6
Author: Nick Mathewson
Date: Thu Jun 10 08:53:07 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40389 | 3 +++
src/core/or/relay.c | 39 +++
2 files
commit c58c2d4e372a166c3b3437774ed728de12dacf04
Merge: 9e5e584cb6 1d11675adb
Author: Nick Mathewson
Date: Thu Jun 10 08:37:34 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40390 | 8
src/lib/crypt_ops/crypto_rand.c | 4 ++--
2 files changed,
commit 9e5e584cb62021e347f2dc106f239906d2aa3ad2
Merge: 009b5778b2 cb38219664
Author: Nick Mathewson
Date: Thu Jun 10 08:21:48 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/geoip-2021-06-10 |3 +
src/config/geoip | 4764
commit 0d402eefa55716086db2c871e05d42e5667643ab
Merge: 9a37cf4883 b3fe9d5162
Author: Nick Mathewson
Date: Mon Jun 7 13:32:36 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 9a37cf4883c52761e2f630eb24e60b51e2d450a3
Merge: ae154215cb f832b4bcee
Author: Nick Mathewson
Date: Tue Jun 1 12:16:42 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/bug40175 | 5 +
1 file changed, 5 insertions(+)
commit ae154215cb63c0ac85bbe19e5fbd17d743519027
Merge: bcff7f9df9 83009f8003
Author: David Goulet
Date: Tue Jun 1 08:48:04 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
src/feature/dirclient/dirclient.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit bcff7f9df9a76d9a2d2b0c68b922f7a174af7d1b
Merge: 55b501a865 6ccb858058
Author: Nick Mathewson
Date: Fri May 28 12:21:27 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit cae7051a8e4f8e1ac875362a66fe9e80dcdddf77
Merge: 2af341b2ea aaf062119e
Author: Nick Mathewson
Date: Fri May 28 08:05:14 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 2af341b2eaf8f9d25fc2ba35a1e6b02e5dcac112
Merge: a3c2dea3f6 e1f0b9fb1e
Author: Nick Mathewson
Date: Fri May 28 08:03:43 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
scripts/git/git-resquash.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit e778f7065fd65c51f1ad4bb46c596c2b9d2cf1e4
Merge: 8efb9c29e9 fd3678fa60
Author: David Goulet
Date: Thu May 27 10:01:49 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/bug40375 | 5 +
src/feature/control/control_getinfo.c | 32
commit 8efb9c29e9cf85570d6d08820578cabf50bf337a
Merge: 6db1160f54 bab2b29f89
Author: Alexander Færøy
Date: Tue May 25 13:25:23 2021 +
Merge branch 'maint-0.4.6' into release-0.4.6
changes/bug40399 | 5 +
src/lib/tls/tortls.h | 1 -
commit 6db1160f54bfae707b63875fcb84b36921a5ad6d
Merge: 3630649b79 debede5e50
Author: Nick Mathewson
Date: Mon May 17 09:09:49 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/bug40317| 5 +
src/app/config/config.c | 17 +
commit 3630649b7900c8b98c12b6b147b99b5b33ba58ec
Merge: 086f01e224 fbd47a5078
Author: Nick Mathewson
Date: Mon May 17 09:04:22 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40370| 4
src/core/mainloop/connection.c | 1 +
2 files changed, 5
commit 086f01e224a3118d83d8b5a14d5dc27d9af41d0a
Merge: 9b9fa62f26 8851861ff0
Author: Nick Mathewson
Date: Mon May 10 14:30:09 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40374| 4
src/feature/dirparse/parsecommon.c | 27
commit 9b9fa62f267a8a53f35da453cb9a1e9b8abbc350
Merge: a980597a67 af6da4a36b
Author: Nick Mathewson
Date: Mon May 10 10:55:16 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit dd8ed19e95974df5ebbf19bc2af389bf300525d8
Merge: 18acf43175 e4f2b52deb
Author: Nick Mathewson
Date: Fri May 7 13:08:25 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40382 | 6 ++
src/lib/sandbox/sandbox.c | 22 ++
2 files
commit 18acf43175e7eb9164c4e2baaee7304347fae491
Merge: 8222f2f3ee 5acf18bfaa
Author: Nick Mathewson
Date: Fri May 7 10:41:34 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/bug40380 | 3 +++
src/core/or/circuituse.c | 8
2 files changed, 7 insertions(+),
commit e730629a2f79e08b537b488b6bbcf6f23aa1df3c
Merge: c05059f736 0397a9cb49
Author: Nick Mathewson
Date: Fri May 7 09:53:58 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/geoip-2021-05-07 |3 +
src/config/geoip | 3227
commit 80ea44cbecb9e50b601ba407d59cf61db8c0a909
Merge: 993238aa2d 8142b368e7
Author: Nick Mathewson
Date: Fri May 7 09:44:05 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 993238aa2d6e8d038a0e0a101518cb57d42b87c4
Merge: 432695a61e a42e58a284
Author: David Goulet
Date: Fri May 7 09:05:21 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40373 | 3 +++
src/core/or/connection_edge.c | 43
commit 432695a61ea1c09adfcdb7e35702090f38a5be85
Merge: 0f03bd298b b1b4c05fb3
Author: David Goulet
Date: Fri May 7 09:04:53 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
___
tor-commits mailing list
tor-commits@lists.torproject.org
88 matches
Mail list logo
