[tor-commits] [tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6

commit debede5e501667bc20666e3c2f5d62d7bc888c8b Merge: fbd47a5078 97b61e21a9 Author: Nick Mathewson Date: Mon May 17 09:09:49 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/bug40317| 5 + src/app/config/config.c | 17 + src/app/config/config.h

[tor-commits] [tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6

commit fbd47a50783c79a553510091df09dce7632e02f6 Merge: 8851861ff0 5f009a59da Author: Nick Mathewson Date: Mon May 17 09:04:22 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/ticket40370| 4 src/core/mainloop/connection.c | 1 + 2 files changed, 5 insertions

[tor-commits] [tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6

commit 0db0c5c739dc06e1e4ec1b93f7e62922a1bacfc7 Merge: e4f2b52deb ce8d6d143c Author: Nick Mathewson Date: Mon May 10 10:53:10 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 "ours" to avoid version bump. ___ tor-commits mailing

[tor-commits] [tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6

commit e4f2b52debc727fc35806adc889227d8aaf975a8 Merge: 5acf18bfaa d85ef0d5e0 Author: Nick Mathewson Date: Fri May 7 13:08:25 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/ticket40382 | 6 ++ src/lib/sandbox/sandbox.c | 22 ++ 2 files changed

[tor-commits] [tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6

commit 5acf18bfaa562cb1bba72caa196c195dff8e162e Merge: 0397a9cb49 7c86f34340 Author: Nick Mathewson Date: Fri May 7 10:41:34 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+), 4

[tor-commits] [tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6

commit 0397a9cb49a34d56cd85c2b6b16f8fbd72cd2e3d Merge: 8142b368e7 7fe819c951 Author: Nick Mathewson Date: Fri May 7 09:53:58 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227 --

[tor-commits] [tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6

commit 3483d6aab5fc8c4c090ffce8cc88586b650ed57b Merge: a42e58a284 ec0b4bdafd Author: Nick Mathewson Date: Fri May 7 09:39:45 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 "ours" to avoid version bump. ___ tor-commits mailing

[tor-commits] [tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6

commit b1b4c05fb32b1f5a5306a16e9b61b7a4912c9209 Merge: cf6e72b702 80c404c4b7 Author: David Goulet Date: Fri May 7 09:03:39 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 ___ tor-commits mailing list tor-commits@lists.torproject.org htt

[tor-commits] [tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6

commit f0260c4cea6da784369e8d47f0b4bf01863c5af5 Merge: 38bfb3cdfe 8c29729916 Author: George Kadianakis Date: Fri Apr 23 13:00:23 2021 +0300 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/ticket40356 | 3 +++ src/feature/hs/hs_cache.c | 61 --

[tor-commits] [tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6

commit 38bfb3cdfee3e62c94b9d2bb41f745ac643002ae Merge: 0ceacb5482 a4a3721690 Author: Nick Mathewson Date: Wed Apr 21 10:34:28 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6

commit d162b98548934f575123ca9bff45b85a9eb2bdf5 Merge: 461a3c732b cd75eac743 Author: Nick Mathewson Date: Mon Apr 19 11:30:00 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/ticket40369| 4 scripts/build/combine_libs | 2 +- 2 files changed, 5 insertions(+), 1

[tor-commits] [tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6

commit 461a3c732b70fb8525dfa660dcab1605f11d7517 Merge: e6d9dd9157 925ec0e0ea Author: George Kadianakis Date: Mon Apr 19 17:33:46 2021 +0300 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/autoconf-2.70 | 3 +++ configure.ac | 6 +- 2 files changed, 8 insertions(+), 1 dele

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 91569c4dad91029a70b0d8e89c1fb901a371b012 Merge: 2815721243 30fa80c0fc Author: David Goulet Date: Wed Apr 14 08:39:17 2021 -0400 Merge branch 'maint-0.4.5' src/app/config/fallback_dirs.inc | 2 -- 1 file changed, 2 deletions(-) ___ tor-co

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 281572124399acd4ddf1d467cca330a904272dbe Merge: 705ea32c6e 59bc377dce Author: Nick Mathewson Date: Tue Apr 13 17:00:56 2021 -0400 Merge branch 'maint-0.4.5' changes/ticket40265 |3 + src/app/config/fallback_dirs.inc | 1042 -- 2

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 1b48a28a7476d8c29cb505ad53daa3c4fe275500 Merge: 0d63b19afa 1f21b6e6a7 Author: Nick Mathewson Date: Tue Apr 13 10:36:01 2021 -0400 Merge branch 'maint-0.4.5' changes/geoip-2021-04-13 | 3 + src/config/geoip | 10953 + src/confi

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 0d63b19afaecbba9ba66afb7d3aad0329c670cf9 Merge: ba2ee8ae3b 218f9f90fb Author: Nick Mathewson Date: Tue Apr 13 09:41:13 2021 -0400 Merge branch 'maint-0.4.5' changes/ticket40360 | 5 + src/feature/client/entrynodes.c | 3 --- 2 files changed, 5 insertions(+), 3 delet

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit e0b8a79b2e62c69d45cce792f14b127e926082e2 Merge: b07ed22cbb 36768b5756 Author: George Kadianakis Date: Thu Apr 8 14:29:08 2021 +0300 Merge branch 'maint-0.4.5' changes/bug40318 | 4 src/lib/fs/path.c | 22 +++--- 2 files changed, 23 insertions(+), 3 deletions(

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit f6af8e2021179498d3e964ea068f9b0aa8b8f8e4 Merge: 37b16d7e19 c359c3056b Author: Nick Mathewson Date: Wed Mar 24 12:25:05 2021 -0400 Merge branch 'maint-0.4.5' changes/ticket40345 | 5 + src/core/or/channel.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) _

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 0ac03390e482a7ff1008f0051ac647114ce00c09 Merge: 36b54fc6aa 59bbf8cde9 Author: George Kadianakis Date: Wed Mar 17 13:43:48 2021 +0200 Merge branch 'maint-0.4.5' changes/bug40285_045 | 4 src/core/or/circuitbuild.c| 18 +- src/core/or/circui

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 36b54fc6aa5f6ac0a765e9e3355ec5310a23233d Merge: 57d969de1a d66178c7b7 Author: Nick Mathewson Date: Tue Mar 16 09:18:40 2021 -0400 Merge branch 'maint-0.4.5' "ours" to avoid version bump. ___ tor-commits mailing list tor-commits@li

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit c306b0f5113ae8e3a0435a45448bf53cc094907b Merge: 2022d974af 7c00afe0fb Author: Nick Mathewson Date: Mon Mar 15 09:41:38 2021 -0400 Merge branch 'maint-0.4.5' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.tor

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 3268403ba1fac9366575f4511b9f46d2b7738039 Merge: cfeb063f24 61731e3550 Author: Nick Mathewson Date: Mon Mar 15 09:01:59 2021 -0400 Merge branch 'maint-0.4.5' changes/bug40316 | 5 + src/feature/dirauth/dirvote.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit efb174df242adf964e383381d31b891c5f535f1f Merge: 8e4965aa36 7c5a67ccd9 Author: Nick Mathewson Date: Mon Mar 15 08:52:53 2021 -0400 Merge branch 'maint-0.4.5' changes/ticket40286_minimal| 5 + src/feature/dirparse/unparseable.c | 6 ++ 2 files changed, 11 insertions(+

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit dbf485c1f85cc4eae495ab3758ab474bc9647576 Merge: 444233c15e be17a5a3cf Author: Nick Mathewson Date: Mon Mar 15 07:42:03 2021 -0400 Merge branch 'maint-0.4.5' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.tor

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit cfeb063f2462ef374a77d38c39a14b88255dc8a5 Merge: efb174df24 a6533af9e8 Author: Nick Mathewson Date: Mon Mar 15 08:54:00 2021 -0400 Merge branch 'maint-0.4.5' changes/ticket40286_minimal| 7 --- src/feature/dirparse/unparseable.c | 7 +-- 2 files changed, 9 insertions

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 6cc561340456eb8d981e9b197a46c38a41a8e762 Merge: 0b4a0c1a26 433f526af6 Author: Nick Mathewson Date: Fri Mar 12 11:36:34 2021 -0500 Merge branch 'maint-0.4.5' LICENSE | 43 ++- changes/geoip-2021-03-12 | 2 +- 2 files changed,

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 0b4a0c1a26f7976401809e29331ca252ce576a0f Merge: 9131fe7eb2 b014866f6a Author: Nick Mathewson Date: Fri Mar 12 11:30:22 2021 -0500 Merge branch 'maint-0.4.5' changes/geoip-2021-03-12 | 9 + src/config/geoip | 144354 ++-- src/conf

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit f98dbdb0693afa7dcbf1f395fa7e97116b59199e Merge: 19e8844622 e8d224dfb1 Author: Nick Mathewson Date: Wed Mar 10 15:28:14 2021 -0500 Merge branch 'maint-0.4.5' changes/ticket40334 | 3 +++ src/feature/hs/hs_metrics.c | 8 +--- src/feature/hs/hs_service.c | 4 +++- 3 files

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 19e8844622c91c76a06b5f11e4f9e7290671a3c9 Merge: 6fce18916f d382f26914 Author: David Goulet Date: Wed Mar 10 10:06:49 2021 -0500 Merge branch 'maint-0.4.5' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproje

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit fc080b4113c769bd75b81ef4ba571c8df96f5a7b Merge: 05564a8521 690c7be253 Author: David Goulet Date: Wed Mar 10 10:04:26 2021 -0500 Merge branch 'maint-0.4.5' changes/bug40315 | 5 + src/lib/meminfo/.may_include | 1 + src/lib/meminfo/meminfo.c| 3 ++- 3 files chang

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 997bf3f840e250db6e805b9878495c7669478ec8 Merge: 6b7a145409 49ce31b2b6 Author: David Goulet Date: Mon Mar 1 08:33:47 2021 -0500 Merge branch 'maint-0.4.5' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torpro

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit f75baf5ea53025dfd371f392ccfb685e9964b11e Merge: 830b0f8c62 6ea7eb58c6 Author: David Goulet Date: Wed Feb 24 13:55:30 2021 -0500 Merge branch 'maint-0.4.5' changes/ticket40300 | 5 - src/feature/dirclient/dirclient_modes.c | 8 src/feature/relay/re

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 6edb648aa0f23a507e7557a07fd291d6c3ad7747 Merge: bc799a1eaf 97e51dd01b Author: David Goulet Date: Tue Feb 23 12:28:04 2021 -0500 Merge branch 'maint-0.4.5' changes/ticket40309 | 3 +++ configure.ac | 1 - src/app/main/main.c | 1 - src/lib/meminfo/meminfo

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 6e3a7c410f2c0cfd2f705862cc4d32acd0a88096 Merge: a4df1e8ea4 bc21ed3290 Author: Nick Mathewson Date: Mon Feb 22 15:37:39 2021 -0500 Merge branch 'maint-0.4.5' changes/ticket40300 | 5 + src/feature/relay/relay_find_addr.c | 25 + 2 files c

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit a4df1e8ea47842a76e4fc3ebc750e68b728f222e Merge: c0589d06be 26c2e843f9 Author: Alexander Færøy Date: Mon Feb 22 19:13:12 2021 + Merge branch 'maint-0.4.5' changes/bug40287 | 4 src/feature/relay/selftest.c | 4 2 files changed, 8 insertions(+) __

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 67938e019844d8143d683321faf45d7623a3a9ae Merge: cf1f03fe1d 03c686563b Author: George Kadianakis Date: Fri Feb 19 13:26:52 2021 +0200 Merge branch 'maint-0.4.5' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.tor

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 67fdb1cd5574a974c05e48dede802eff71f8d80b Merge: 2ae3148304 336c45f1a5 Author: Nick Mathewson Date: Mon Feb 15 13:00:20 2021 -0500 Merge branch 'maint-0.4.5' "ours" to avoid version bump. ___ tor-commits mailing list tor-commits@li

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 2ae314830428e6b5f14c1e2f747632496b65 Merge: e74fc69448 18db584caf Author: Nick Mathewson Date: Mon Feb 15 09:55:17 2021 -0500 Merge branch 'maint-0.4.5' "ours" to avoid version bump. ___ tor-commits mailing list tor-commits@

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 71e9c56578e83e95e4ce622d0733b6f9bba3e11c Merge: c1b5e7fa1b 5887c1f1f3 Author: David Goulet Date: Fri Feb 12 13:13:57 2021 -0500 Merge branch 'maint-0.4.5' changes/ticket40289 | 6 src/app/config/config.c | 1 + src/feature/relay/relay_config.c | 69

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit c1b5e7fa1bfb7a64c148f098c86b08f4f3167213 Merge: e6caf7d8c7 bdca475518 Author: David Goulet Date: Fri Feb 12 12:57:18 2021 -0500 Merge branch 'maint-0.4.5' changes/ticket40208 | 6 ++ src/app/config/resolve_addr.c | 14 +- src/feature/relay/router.c|

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit e6caf7d8c76660dbbaf68ee56c7ebf31a2ac9605 Merge: 9b6b1aedcd d24a6b2f75 Author: Alexander Færøy Date: Fri Feb 12 15:23:34 2021 + Merge branch 'maint-0.4.5' src/feature/relay/router.c | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) _

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 9b6b1aedcdd1f8b76379fb9796020a04416e6b16 Merge: 9fbedc74c3 088a74aaab Author: George Kadianakis Date: Fri Feb 12 13:54:18 2021 +0200 Merge branch 'maint-0.4.5' changes/ticket40221_045 | 6 ++ src/core/or/protover.c| 2 +- src/rust/protover/protover.rs | 4 ++-- sr

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 9fbedc74c3f3b26efdec7300e1cc41e7e2c23f49 Merge: b64fe4bf55 58b5300f44 Author: George Kadianakis Date: Fri Feb 12 13:50:36 2021 +0200 Merge branch 'maint-0.4.5' changes/bug40281 | 6 ++ src/feature/nodelist/networkstatus.c | 9 - 2 files changed, 14 i

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 14e1c2fe0a5b94cfc2db9be0185a3b09fd119e3c Merge: d6b82d79dc 758000aa98 Author: Nick Mathewson Date: Mon Feb 8 14:31:13 2021 -0500 Merge branch 'maint-0.4.5' changes/ticket40279| 4 src/feature/relay/router.c | 33 +++-- 2 files changed, 23 i

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit d6b82d79dca8affbd78e1e95a7efb6be68bc3fab Merge: 0efc1e6372 01c4abc2d4 Author: Nick Mathewson Date: Mon Feb 8 14:28:19 2021 -0500 Merge branch 'maint-0.4.5' changes/ticket40257| 3 +++ src/core/mainloop/connection.c | 2 ++ src/feature/metrics/metrics.c | 21 +

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 60823d261c9639975e4f4b029909cb37639c91c4 Merge: db207329c7 f420eacf18 Author: Alexander Færøy Date: Fri Feb 5 19:19:34 2021 + Merge branch 'maint-0.4.5' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torp

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit db207329c789a16fb0a4bad661fa00505f80169a Merge: 07ca2a8ee9 4f4728a004 Author: Alexander Færøy Date: Fri Feb 5 17:40:25 2021 + Merge branch 'maint-0.4.5' scripts/maint/practracker/exceptions.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) _

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 07ca2a8ee9aa5a011e90ff85f5bb80b72d4fbbaa Merge: 7a152997fe 3496804827 Author: Alexander Færøy Date: Fri Feb 5 17:17:05 2021 + Merge branch 'maint-0.4.5' scripts/maint/practracker/exceptions.txt | 1 + src/test/test_switch_id.c| 4 ++-- 2 files changed, 3 inser

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 7a152997fe2d55acdc9b743242dabff0ec823d6e Merge: d103466282 0a40892e8c Author: Alexander Færøy Date: Fri Feb 5 16:05:57 2021 + Merge branch 'maint-0.4.5' src/test/test_switch_id.c | 60 --- 1 file changed, 57 insertions(+), 3 deletio

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit d06dfc08457ad1d65072ae79fe6208ce4f3a7021 Merge: 14c89e4863 ff1b24fb73 Author: Nick Mathewson Date: Wed Feb 3 13:39:55 2021 -0500 Merge branch 'maint-0.4.5' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproj

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 22941c52998c2a0ccb5b16d745019eaeca3f0f16 Merge: 970d49f11b 44b4aa82aa Author: David Goulet Date: Wed Feb 3 09:35:50 2021 -0500 Merge branch 'maint-0.4.5' src/feature/nodelist/dirlist.c | 2 -- 1 file changed, 2 deletions(-) ___ tor-commi

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 970d49f11b4b560cf23ed52318aa820669e56597 Merge: 1b298e1863 9e91bb31cc Author: David Goulet Date: Wed Feb 3 09:11:15 2021 -0500 Merge branch 'maint-0.4.5' src/core/or/address_set.c | 74 --- src/core/or/address_set.h | 15 -- 2 fil

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 1b298e1863fd1cbc4241f3ffcba2e4786c982ba3 Merge: 0ba0d738a8 a0b3e9116d Author: David Goulet Date: Wed Feb 3 08:58:17 2021 -0500 Merge branch 'maint-0.4.5' src/core/or/address_set.c | 74 ++ src/core/or/address_set.h | 15 + s

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit a81581e6be5bc524429ebe513941006d00766e38 Merge: 732bbff29c 40eeb63b5e Author: Nick Mathewson Date: Mon Feb 1 16:15:16 2021 -0500 Merge branch 'maint-0.4.5' "ours" to avoid version bump. ___ tor-commits mailing list tor-commits@lis

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 6bde42b4de3fd1a3d7c8385a66f8e40b954e60f8 Merge: 385fda038f ed373eaa8d Author: David Goulet Date: Mon Feb 1 14:10:06 2021 -0500 Merge branch 'maint-0.4.5' src/core/or/address_set.c | 75 - src/core/or/address_set.h | 15 -

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 385fda038fdf53694926729d4b6f078a4b259410 Merge: 1eec42dee4 838e07be9d Author: David Goulet Date: Mon Feb 1 09:24:38 2021 -0500 Merge branch 'maint-0.4.5' src/core/or/connection_edge.c | 12 src/feature/nodelist/nodelist.c | 8 ++-- 2 files changed, 18 insertions

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit ec9575944ac780d67bd36c0e6e64ddcebcdadeb3 Merge: e50469299b 46efbcb116 Author: David Goulet Date: Fri Jan 29 14:40:56 2021 -0500 Merge branch 'maint-0.4.5' changes/ticket2667 | 4 +++ src/core/or/address_set.c | 74 ++ src/core

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit e50469299b36c6fd84881c8095144ca98ff4ada2 Merge: efba228823 0ec507171d Author: David Goulet Date: Thu Jan 28 12:46:31 2021 -0500 Merge branch 'maint-0.4.5' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproje

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit efba228823a19af11f85335334b395e6fdc62bcb Merge: 8549b66ba6 545fee6e4f Author: David Goulet Date: Thu Jan 28 12:42:32 2021 -0500 Merge branch 'maint-0.4.5' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproje

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 8549b66ba69ef5e1b43f26d5a45d872e44fb3068 Merge: 8cd696ca04 50ac9f9229 Author: David Goulet Date: Thu Jan 28 12:36:43 2021 -0500 Merge branch 'maint-0.4.5' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproje

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 8cd696ca048d534861f7ec616922bace6b1b5416 Merge: ba82b685a5 c652740515 Author: David Goulet Date: Thu Jan 28 12:14:10 2021 -0500 Merge branch 'maint-0.4.5' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproje

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit ba82b685a5e1afc56aa6a1475ed04c79cf617ab4 Merge: f715b5c0d8 09901aeb07 Author: David Goulet Date: Thu Jan 28 12:08:21 2021 -0500 Merge branch 'maint-0.4.5' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproje

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit f715b5c0d8f7e3a628482edfbbf5b164ad4dbb1e Merge: e4e6418023 aade1e8108 Author: David Goulet Date: Thu Jan 28 12:04:42 2021 -0500 Merge branch 'maint-0.4.5' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproje

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit e4e6418023dc2af7f3cb5480dbadbb6893bf82db Merge: b019c83853 26a07287a4 Author: Nick Mathewson Date: Thu Jan 28 11:20:08 2021 -0500 Merge branch 'maint-0.4.5' "ours" to avoid version bump(s) ___ tor-commits mailing list tor-commits@

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit b019c8385348e94b2f5d898191af41abc978078b Merge: 05a7624266 3c0d398847 Author: Nick Mathewson Date: Wed Jan 27 09:36:39 2021 -0500 Merge branch 'maint-0.4.5' changes/ticket40254 | 4 src/feature/relay/relay_find_addr.c | 24 +++ src/feature/

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 768d54ea58ff6c44aa5ee4fa7b07ba6455daaf70 Merge: 6fff643a83 af5250b1df Author: Nick Mathewson Date: Fri Jan 22 11:55:25 2021 -0500 Merge branch 'maint-0.4.5' "ours" to avoid version bump. ___ tor-commits mailing list tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 6fff643a83a3899f676c4a3479ac898dd5790133 Merge: 74cfe3611f 5eef63aa71 Author: Nick Mathewson Date: Fri Jan 22 09:49:24 2021 -0500 Merge branch 'maint-0.4.5' "-s ours" to avoid version bump. ___ tor-commits mailing list tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 74cfe3611f7b54f7c68bb8ea932a5ab224b95154 Merge: ceefdf984c 4cbd22f1a7 Author: George Kadianakis Date: Fri Jan 22 00:21:21 2021 +0200 Merge branch 'maint-0.4.5' changes/bug40238 | 3 +++ src/feature/dirparse/routerparse.c | 11 +++ 2 files changed, 14 inse

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit ceefdf984c1b9aa13d8e43399328e6ee29b0d3ff Merge: 8d881b5222 68d1e02c3a Author: David Goulet Date: Thu Jan 21 16:18:43 2021 -0500 Merge branch 'maint-0.4.5' .gitignore | 1 + 1 file changed, 1 insertion(+) ___ tor-commits mailing list tor-

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 7e8d970ce3efb5c39e985b2d3df3005c92b5b95c Merge: 9be33755ef e06a0e904c Author: David Goulet Date: Thu Jan 21 16:07:46 2021 -0500 Merge branch 'maint-0.4.5' .gitignore | 2 ++ 1 file changed, 2 insertions(+) ___ tor-commits mailing list

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 9be33755ef9b413a665be03e0bd5f57881bc144c Merge: b2536c97f9 c54f4b81da Author: David Goulet Date: Thu Jan 21 14:58:39 2021 -0500 Merge branch 'maint-0.4.5' changes/ticket40245 | 4 src/feature/dirauth/dirvote.c | 30 +- src/fea

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit b2536c97f941ad2e4e068c43f8ce18469c63585c Merge: 2243fc3ad1 08c0ef61d8 Author: Nick Mathewson Date: Thu Jan 21 13:40:46 2021 -0500 Merge branch 'maint-0.4.5' changes/bug24857 | 6 ++ src/feature/dircache/consdiffmgr.c | 12 +++- 2 files changed, 17 ins

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 2243fc3ad1bb33ca5f4a37952bb474d8314d5325 Merge: 8a27860720 71fd30b75a Author: Nick Mathewson Date: Thu Jan 21 13:19:49 2021 -0500 Merge branch 'maint-0.4.5' changes/ticket40106 | 9 + src/app/config/config.c | 17 - src/feature/client/br

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 8a2786072008f18ccd5bace4f014057d06345af0 Merge: 2c4355fcec 7b102d53e3 Author: David Goulet Date: Thu Jan 21 12:27:34 2021 -0500 Merge branch 'maint-0.4.5' changes/bug32666 | 3 +++ src/core/or/circuitbuild.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 9a0a91dc23ac465d8e834c0c200eea46db3cdf02 Merge: b0af4ddc7c 18654b629f Author: Nick Mathewson Date: Tue Jan 19 15:21:07 2021 -0500 Merge branch 'maint-0.4.5' src/app/config/config.c | 16 ++-- src/feature/relay/relay_config.c | 25 --- src/feature/relay/relay_co

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit b0af4ddc7c2fe80a79e41e31b7050d949561e044 Merge: deb445e94b 27ee12836d Author: Nick Mathewson Date: Tue Jan 19 13:20:43 2021 -0500 Merge branch 'maint-0.4.5' changes/ticket40243 | 4 src/feature/dirauth/dirvote.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit deb445e94b5004ef4bcabe2e2368d082572a0e9c Merge: 5f53e013cd e3a5482681 Author: Nick Mathewson Date: Tue Jan 19 12:53:52 2021 -0500 Merge branch 'maint-0.4.5' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torpro

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 5f53e013cd33f1f707a1b06653290e03bc2db095 Merge: 4961645254 6c1bc570cf Author: Nick Mathewson Date: Tue Jan 19 12:49:31 2021 -0500 Merge branch 'maint-0.4.5' changes/40241_v2| 4 src/core/or/channeltls.c| 4 +--- src/core/or/circuitlist.c | 4 +-

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 4961645254a7cb1bc0a64947995a3ec2d77bffb0 Merge: 85c4087de9 f79a31f6d5 Author: Nick Mathewson Date: Tue Jan 19 12:02:28 2021 -0500 Merge branch 'maint-0.4.5' changes/ticket40231 | 4 src/feature/relay/relay_find_addr.c | 10 +++--- src/feature/relay/relay_p

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 85c4087de9b80c2174e47359a5a97f5fac5c0c10 Merge: aa0c4fd86d f8cf2546ea Author: Nick Mathewson Date: Tue Jan 19 12:00:06 2021 -0500 Merge branch 'maint-0.4.5' acinclude.m4| 4 ++-- changes/ticket33624 | 5 + configure.ac| 10 +- 3 files changed, 16 inser

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit b178a8adeef7d655a90e7b613b4b9387d04dfb74 Merge: cd1468d56b e5a0c739d4 Author: David Goulet Date: Wed Jan 13 10:38:23 2021 -0500 Merge branch 'maint-0.4.5' Signed-off-by: David Goulet .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --cc .gitignore index 06575f635

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit cd1468d56b7b40c57e20d45af6498d118c2deee5 Merge: cc30c09f7c c931eae981 Author: George Kadianakis Date: Wed Jan 13 16:01:41 2021 +0200 Merge branch 'maint-0.4.5' src/feature/nodelist/microdesc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) _

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 4c049ca5d78274d5fb6706c0e55dfc401b3c4711 Merge: 42e95c8d85 01be7cc535 Author: Nick Mathewson Date: Tue Jan 12 16:09:48 2021 -0500 Merge branch 'maint-0.4.5' "ours" to avoid version bump. ___ tor-commits mailing list tor-commits@li

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 42e95c8d852615a3e0470a5d81215fc11d9ebcec Merge: 9c268b66ba 9b59ede8d3 Author: George Kadianakis Date: Tue Jan 12 18:05:32 2021 +0200 Merge branch 'maint-0.4.5' changes/ticket40237 | 5 +++ src/core/mainloop/mainloop.c | 3 +- src/feature/h

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 9c268b66ba72203aa2fc7e5c58b35cc883712886 Merge: d31beeef9f d1f4741606 Author: Nick Mathewson Date: Mon Jan 11 14:46:13 2021 -0500 Merge branch 'maint-0.4.5' changes/40241 | 4 src/core/or/channeltls.c| 3 ++- src/core/or/circuitlist.c | 2 ++ sr

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit d31beeef9f5ce1e00079a106c60fc22b0451f5b9 Merge: ee0a27293e edc9fda4f5 Author: Nick Mathewson Date: Mon Jan 11 12:48:11 2021 -0500 Merge branch 'maint-0.4.5' "ours" to avoid version bump. ___ tor-commits mailing list tor-commits@li

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit e7da6810346c0e141d67e67db8ff4a1bdaedf67f Merge: 43b3880578 aae9a05a01 Author: David Goulet Date: Mon Dec 21 14:55:44 2020 -0500 Merge branch 'maint-0.4.5' changes/ticket40201 | 3 +++ src/app/config/resolve_addr.c | 12 ++-- 2 files changed, 13 insertions(+), 2 d

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 43b388057884801fc20d869ee6d4f2e314907d02 Merge: cce7d1edaf ad00da663e Author: Nick Mathewson Date: Mon Dec 21 13:26:01 2020 -0500 Merge branch 'maint-0.4.5' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torpro

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 5527aef56f0d9a443d94f51d2a7f50ddc50c61cc Merge: 0bd4cd8101 d45354d5ea Author: David Goulet Date: Thu Dec 17 08:25:29 2020 -0500 Merge branch 'maint-0.4.5' changes/bug40210 | 5 + src/ext/keccak-tiny/keccak-tiny.h | 2 +- 2 files changed, 6 insertions(+), 1 dele

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 66597b9291eb95203c0d84fb38f9a9561b4c8d85 Merge: 66b1a9a5c1 5a2d01ae57 Author: Alexander Færøy Date: Wed Dec 16 20:39:01 2020 + Merge branch 'maint-0.4.5' changes/ticket40106 | 5 + src/app/config/config.c | 3 ++- src/feature/client/transports.c | 22

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 66b1a9a5c101d071c88a4f6786dbed9ad4e94982 Merge: 2d68fdc94c b83777f7b2 Author: Alexander Færøy Date: Wed Dec 16 20:31:46 2020 + Merge branch 'maint-0.4.5' configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___ tor-co

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 2d68fdc94c78906c393f51661429575033362701 Merge: 8b2d32435d 7998ea2f18 Author: Alexander Færøy Date: Wed Dec 16 20:29:19 2020 + Merge branch 'maint-0.4.5' changes/ticket40188 | 4 doc/man/tor.1.txt | 8 +--- 2 files changed, 9 insertions(+), 3 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 1430d5ff632f0900545047479a94dbe3417c2e76 Merge: 93f2de8523 4a77aa6e82 Author: David Goulet Date: Tue Dec 15 11:58:22 2020 -0500 Merge branch 'maint-0.4.5' changes/bug40190 | 4 src/core/proto/proto_socks.c | 7 ++- 2 files changed, 10 insertions(+), 1 deletion(

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 93f2de85237dce9abb8ec66ad5a4eecad5848734 Merge: c05ae61f26 c731a4efec Author: George Kadianakis Date: Tue Dec 15 16:29:01 2020 +0200 Merge branch 'maint-0.4.5' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.tor

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 6e83a520776e503974e4020a9ff011eb6bef9d39 Merge: f280c171e2 e74f168bb4 Author: David Goulet Date: Tue Dec 8 14:51:43 2020 -0500 Merge branch 'maint-0.4.5' changes/ticket40205 | 5 + src/feature/relay/selftest.c | 7 ++- 2 files changed, 11 insertions(+), 1 deletion(

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 2d0a7f2e8922fd47e0fe613ea08dcf1ce3840e73 Merge: a09eb66cc7 c618c4f279 Author: David Goulet Date: Tue Dec 8 09:15:06 2020 -0500 Merge branch 'maint-0.4.5' changes/ticket40111 | 7 +++ configure.ac| 5 +++-- src/app/include.am | 6 -- 3 files changed, 14 insertions(+

[tor-commits] [tor/master] Merge branch 'maint-0.4.5' into master

commit ff2b7ae1f3f6066c501b1c4099e3d20dd0533acb Merge: bff3c6f48d 2f87b2ab75 Author: Nick Mathewson Date: Mon Nov 23 14:04:05 2020 -0500 Merge branch 'maint-0.4.5' into master "ours" to avoid version bump. ___ tor-commits mailing list to

[tor-commits] [tor/master] Merge branch 'maint-0.4.5' into master

commit bff3c6f48db0144e8b2c5646daba867300c08ad3 Merge: 9bc0306b8c 73fb44dcba Author: Nick Mathewson Date: Sat Nov 21 15:09:18 2020 -0500 Merge branch 'maint-0.4.5' into master ___ tor-commits mailing list tor-commits@lists.torproject.org https://

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 9bc0306b8c8675472a6335e9dc1c0a90438444f8 Merge: 6ce2550468 b274e46309 Author: Alexander Færøy Date: Thu Nov 19 17:44:00 2020 + Merge branch 'maint-0.4.5' changes/bug40179_part2 | 4 src/test/test_config.c | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-)

[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

commit 6ce2550468b3ffdbe1c3bbbdaff39d8382622336 Merge: ad4a68bf35 ea52705e4b Author: Alexander Færøy Date: Thu Nov 19 17:41:05 2020 + Merge branch 'maint-0.4.5' changes/ticket25528 | 6 ++ src/app/config/config.c | 16 src/feature/client/bridges.c

  1   2   >