[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 5ab97fa60371afa8faa9d6dbd8decbe7fbc42b6b Merge: 200e9a55e0 253b83b722 Author: Nick Mathewson Date: Mon Jun 14 11:47:29 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 200e9a55e0737294085080052fbbaba4340d6717 Merge: ae2254e490 0ae9fd62fd Author: Nick Mathewson Date: Thu Jun 10 12:30:29 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/bug40392 | 4 src/feature/hs/hs_descriptor.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit ae2254e490ebfed746bed7e5ec359737cbb14085 Merge: ec696a95e5 014345ed6a Author: Nick Mathewson Date: Thu Jun 10 09:55:55 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 src/core/or/relay.c | 24 +++- 1 file changed, 3 insertions(+), 21 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit ec696a95e58870862625a44f2c9152be2526414c Merge: 1da8621c0a 0f2d45328d Author: Nick Mathewson Date: Thu Jun 10 08:53:07 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/ticket40389 | 3 +++ src/core/or/relay.c | 39 +++ 2 files changed, 42 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 1da8621c0aef1f3fa694802b2bbea888a8d82d99 Merge: e2d01aac9e 31eaa81f59 Author: Nick Mathewson Date: Thu Jun 10 08:42:15 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/bug40391 | 9 + src/core/or/circuitmux.c | 7 --- 2 files changed, 13 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit d60f8fe98a59ce13809e65de67e53b3dcf6199f0 Merge: c80b98520b 57a41348ee Author: Nick Mathewson Date: Thu Jun 10 08:21:48 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/geoip-2021-06-10 |3 + src/config/geoip | 4764 +++--- src/config/geoip6| 2826 --- 3 files changed, 4536 insertions(+), 3057 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit e2d01aac9e2f45f2c8f0de057f3104d6cfcdaa80 Merge: d60f8fe98a 7c19a4d924 Author: Nick Mathewson Date: Thu Jun 10 08:37:34 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/ticket40390 | 8 src/lib/crypt_ops/crypto_rand.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit b3ca2faf46913fb6d1c334667e81de3570a7a177 Merge: 8b6e919086 1956f63d6b Author: Nick Mathewson Date: Mon Jun 7 13:30:36 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 "ours" to avoid version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 4a7379b80a3d0f61d258b26f82d894da9b8cd0f5 Merge: 97b61e21a9 11c7e65730 Author: Alexander Færøy Date: Tue May 25 13:25:23 2021 + Merge branch 'maint-0.4.4' into maint-0.4.5 changes/bug40399 | 5 + src/lib/tls/tortls.h | 1 - src/lib/tls/tortls_nss.c | 7 --- src/lib/tls/tortls_openssl.c | 13 - src/test/test_tortls_openssl.c | 20 5 files changed, 5 insertions(+), 41 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 7c86f34340acf7d8cf35501e71b03f2feba1245e Merge: 7fe819c951 48dd87933d Author: Nick Mathewson Date: Fri May 7 10:41:34 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 2 files changed, 7 insertions(+), 4 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 7fe819c9510bc0b738c55abf7339b64498265c05 Merge: ec0b4bdafd f68aeda549 Author: Nick Mathewson Date: Fri May 7 09:53:58 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/geoip-2021-05-07 |3 + src/config/geoip | 3227 -- src/config/geoip6| 1702 3 files changed, 3098 insertions(+), 1834 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit a4a3721690b52b4e101593b42eac5072082a77e8 Merge: cd75eac743 87d96f7162 Author: Nick Mathewson Date: Wed Apr 21 10:34:28 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 30fa80c0fc1a1996d72b4fb3dead58cf877395f9 Merge: 59bc377dce bba3393d20 Author: David Goulet Date: Wed Apr 14 08:39:16 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 src/app/config/fallback_dirs.inc | 2 -- 1 file changed, 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 59bc377dce760c3ef6a8b694d6c3a347c9e40d2b Merge: 1f21b6e6a7 59f6248e09 Author: Nick Mathewson Date: Tue Apr 13 16:59:16 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/ticket40265 |3 + src/app/config/fallback_dirs.inc | 1040 -- 2 files changed, 660 insertions(+), 383 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 1f21b6e6a70036c7a1c90594ac5becc23320db8e Merge: 218f9f90fb b323e6b8c2 Author: Nick Mathewson Date: Tue Apr 13 10:36:01 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/geoip-2021-04-13 | 3 + src/config/geoip | 10953 + src/config/geoip6| 2608 +++ 3 files changed, 6970 insertions(+), 6594 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit c359c3056b2dbf17987a8955af30884ee438108e Merge: 59bbf8cde9 9ca2394d6b Author: Nick Mathewson Date: Wed Mar 24 12:25:05 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/ticket40345 | 5 + src/core/or/channel.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit e2dd8f1532e0eb8ca6d6cbe9d588468482d14146 Merge: 7c00afe0fb 94fb308c5d Author: Nick Mathewson Date: Tue Mar 16 09:18:06 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 "ours" to avoid version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 5e771327afb49a202044a33741f54abf897fe402 Merge: 433f526af6 fb2c889a38 Author: Nick Mathewson Date: Mon Mar 15 07:40:56 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 "ours" to avoid version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit a6533af9e8d90fda13180064e98b49ac3c3cdf86 Merge: 7c5a67ccd9 2eb900f7e2 Author: Nick Mathewson Date: Mon Mar 15 08:54:00 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/ticket40286_minimal| 7 --- src/feature/dirparse/unparseable.c | 7 +-- 2 files changed, 9 insertions(+), 5 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 7c00afe0fbddd552f4e04e1ad37b1bdae6daf330 Merge: 61731e3550 f2cfd1ffad Author: Nick Mathewson Date: Mon Mar 15 09:41:38 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 61731e35507fea1c932f80f0849dcae924113df1 Merge: a6533af9e8 5ec579610a Author: Nick Mathewson Date: Mon Mar 15 09:01:59 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/bug40316 | 5 + src/feature/dirauth/dirvote.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 7c5a67ccd983bb028d21a5e8aa48b4cd9d6a8a1c Merge: be17a5a3cf b9f6539008 Author: Nick Mathewson Date: Mon Mar 15 08:52:29 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/ticket40286_minimal| 5 + src/feature/dirparse/unparseable.c | 6 ++ 2 files changed, 11 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 433f526af69b9f7de1ef51bb2c4a9188477233c6 Merge: b014866f6a 9f59b6f458 Author: Nick Mathewson Date: Fri Mar 12 11:36:34 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 LICENSE | 43 ++- changes/geoip-2021-03-12 | 2 +- 2 files changed, 11 insertions(+), 34 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit b014866f6a64ab5f2cf168bc961a899b2aafc4ec Merge: e8d224dfb1 41796158e6 Author: Nick Mathewson Date: Fri Mar 12 11:30:22 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/geoip-2021-03-12 | 9 + src/config/geoip | 144354 ++-- src/config/geoip6| 62679 +++ 3 files changed, 95249 insertions(+), 111793 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 49ce31b2b6c0cfbcccb605ee58b612f73e2a228a Merge: 6ea7eb58c6 eb1759633a Author: David Goulet Date: Mon Mar 1 08:33:47 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit f420eacf1858220f1cb284353f975e03464b15e4 Merge: 4f4728a004 49c61c1bb8 Author: Alexander Færøy Date: Fri Feb 5 19:18:47 2021 + Merge branch 'maint-0.4.4' into maint-0.4.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 4f4728a0049efcaffdda00274c070dc702aff51c Merge: 3496804827 aa1a053d55 Author: Alexander Færøy Date: Fri Feb 5 17:40:25 2021 + Merge branch 'maint-0.4.4' into maint-0.4.5 scripts/maint/practracker/exceptions.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 34968048273faf0cde4d0c69d466b4d8d7275ab7 Merge: 0a40892e8c 62b98716ff Author: Alexander Færøy Date: Fri Feb 5 17:17:05 2021 + Merge branch 'maint-0.4.4' into maint-0.4.5 scripts/maint/practracker/exceptions.txt | 1 + src/test/test_switch_id.c| 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 0a40892e8c376a3106cec1a4e9ba74f4dd146e68 Merge: ff1b24fb73 6578a3e865 Author: Alexander Færøy Date: Fri Feb 5 16:05:57 2021 + Merge branch 'maint-0.4.4' into maint-0.4.5 src/test/test_switch_id.c | 60 --- 1 file changed, 57 insertions(+), 3 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit ff1b24fb73cb8b32fdf4d4121ed958286ae1dab2 Merge: 44b4aa82aa 2933c37188 Author: Nick Mathewson Date: Wed Feb 3 13:39:41 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 "ours" to avoid version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 9e91bb31ccf7ed8c221eab47332cca6c88cea162 Merge: a0b3e9116d 61e38deb56 Author: David Goulet Date: Wed Feb 3 09:11:15 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 src/core/or/address_set.c | 74 --- src/core/or/address_set.h | 15 -- 2 files changed, 89 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit a0b3e9116d1eb0cfa6a73b17d275c54516291b9b Merge: 40eeb63b5e eda81ea27e Author: David Goulet Date: Wed Feb 3 08:58:02 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 src/core/or/address_set.c | 74 ++ src/core/or/address_set.h | 15 + src/feature/nodelist/dirlist.c | 2 ++ 3 files changed, 91 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 0ec507171dcdeccc52c7e26deb164b99fe5c73fa Merge: 545fee6e4f ea38016202 Author: David Goulet Date: Thu Jan 28 12:46:31 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 545fee6e4f6dc2785b425e08e76507a0b777b069 Merge: 50ac9f9229 be81ecba3a Author: David Goulet Date: Thu Jan 28 12:42:32 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 50ac9f9229adb91f2af15623c78cd1863061e00c Merge: c652740515 a3f2bc8f13 Author: David Goulet Date: Thu Jan 28 12:36:42 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit c652740515cdfad30d733b079a78154e85f3bb41 Merge: 09901aeb07 2c4a2a93d3 Author: David Goulet Date: Thu Jan 28 12:14:10 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 09901aeb07e67a90bc2fc72c91a0d9cb274e2f84 Merge: aade1e8108 ed0fcfd2b8 Author: David Goulet Date: Thu Jan 28 12:08:21 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit aade1e810894d66aa090c270c1c25b438da2401f Merge: 26a07287a4 737cd79c42 Author: David Goulet Date: Thu Jan 28 12:04:42 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 1fd9a81a2f7fce3401b85c48ff2a2aca09a57913 Merge: 4f21b9503f 07540e2a18 Author: David Goulet Date: Thu Jan 28 12:02:43 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 4f21b9503fc5ca2c505c0d561dbaf73a384e0435 Merge: 26a07287a4 bf29d3b4ae Author: David Goulet Date: Thu Jan 28 12:00:17 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit ceb5735652326f053d4e18c76549b1ce1770a0b7 Merge: 3c0d398847 f8fea8b979 Author: Nick Mathewson Date: Thu Jan 28 11:19:23 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 "ours" to avoid version bump. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 68d1e02c3a7594dc3f293edfe69ce49eb856d3ce Merge: e06a0e904c 09a1a34ad1 Author: David Goulet Date: Thu Jan 21 16:18:43 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 .gitignore | 1 + 1 file changed, 1 insertion(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit e06a0e904cdc80566147a3d718366abe7dd8929d Merge: c54f4b81da 2a3cf37450 Author: David Goulet Date: Thu Jan 21 16:07:16 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 .gitignore | 3 +++ Makefile.am| 14 ++ changes/ticket40227| 4 scripts/maint/gen_ccls_file.sh | 20 4 files changed, 41 insertions(+) diff --cc Makefile.am index 6e8ba37e3a,a723c167ef..3056b08446 --- a/Makefile.am +++ b/Makefile.am @@@ -721,7 -702,21 +721,21 @@@ show-distdir-core file $(distdir)/_build/core; fi show-libs: - @echo $(TOR_INTERNAL_LIBS) + @echo libtor.a show-testing-libs: - @echo $(TOR_INTERNAL_TESTING_LIBS) + @echo src/test/libtor-testing.a + + # Note here that we hardcode this -j2 because if the user would pass too many + # cores, bear actually chockes and dies :S. For this to work, a make clean + # needs to be done else bear will miss some compile flags. + lsp: + @if test -x "`which bear 2>&1;true`"; then \ + echo "Generating LSP compile_commands.json. Might take few minutes..."; \ + $(MAKE) clean 2>&1 >/dev/null; \ + bear >/dev/null 2>&1 -- $(MAKE) -j2 2>&1 >/dev/null; \ + echo "Generating .ccls file..."; \ + ./scripts/maint/gen_ccls_file.sh \ + else \ + echo "No bear command found. On debian, apt install bear"; \ + fi ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit e3a5482681f9c4625df1e418b42038cded3cb082 Merge: 6c1bc570cf d54cd853ad Author: Nick Mathewson Date: Tue Jan 19 12:53:52 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit 6c1bc570cf49c8e493d3278fefaf0c77e289f82c Merge: f79a31f6d5 4c82c2d1d4 Author: Nick Mathewson Date: Tue Jan 19 12:49:31 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/40241_v2| 4 src/core/or/channeltls.c| 4 +--- src/core/or/circuitlist.c | 4 +--- src/feature/client/entrynodes.c | 4 +--- src/feature/rend/rendclient.c | 4 +--- src/lib/log/util_bug.h | 11 +++ 6 files changed, 19 insertions(+), 12 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit e5a0c739d4865b300e904d45c413d5c8f0da304c Merge: c931eae981 61ee17eb1e Author: David Goulet Date: Wed Jan 13 10:38:05 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 .gitignore | 3 +++ 1 file changed, 3 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit d1f474160638e10478a2ab14fb93b1e8b6a720a2 Merge: edc9fda4f5 5a822b462a Author: Nick Mathewson Date: Mon Jan 11 14:37:29 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/40241 | 4 src/core/or/channeltls.c| 3 ++- src/core/or/circuitlist.c | 2 ++ src/feature/client/entrynodes.c | 2 ++ src/feature/rend/rendclient.c | 2 ++ 5 files changed, 12 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
commit b274e46309b4375f6014f3b698ea24b32d4935a5 Merge: ea52705e4b 77bb4b0838 Author: Alexander Færøy Date: Thu Nov 19 17:44:00 2020 + Merge branch 'maint-0.4.4' into maint-0.4.5 changes/bug40179_part2 | 4 src/test/test_config.c | 6 -- 2 files changed, 8 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
