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

2021-03-16 Thread nickm
commit 2b1c08567d7ced8c188d5e195598158a214fcc99 Merge: 72a0cdb1cd efca9ce41c Author: Nick Mathewson Date: Mon Mar 15 08:54:00 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket40286_minimal| 7 --- src/feature/dirparse/unparseable.c | 7 +-- 2 files

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

2021-03-16 Thread nickm
commit 9dc1838693bec6842ce0d8ee0a6acc3573ae46d0 Merge: c9b4d4aa75 1a0b5fd569 Author: Nick Mathewson Date: Mon Mar 15 07:42:55 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

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

2021-03-16 Thread nickm
commit 72a0cdb1cdda3e596cbf24a543e10de43c9211a5 Merge: 9dc1838693 f46f4562cf Author: Nick Mathewson Date: Mon Mar 15 08:52:28 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket40286_minimal| 5 + src/feature/dirparse/unparseable.c | 6 ++ 2 files

[tor-commits] [tor/release-0.3.5] Disable the dump_desc() function.

2021-03-16 Thread nickm
commit ede88c374cd61e1e362422718625707a770c Author: Nick Mathewson Date: Fri Feb 19 12:31:19 2021 -0500 Disable the dump_desc() function. It can be called with strings that should have been length-delimited, but which in fact are not. This can cause a CPU-DoS bug or,

[tor-commits] [tor/release-0.3.5] Clarify new intended strategy with TROVE-2021-001

2021-03-16 Thread nickm
commit efca9ce41c96bb0044f504ced36a2734b1689ee2 Author: Nick Mathewson Date: Mon Mar 15 08:53:36 2021 -0400 Clarify new intended strategy with TROVE-2021-001 We're going to disable this feature in all versions for now. --- changes/ticket40286_minimal| 7 ---

[tor-commits] [tor/maint-0.4.5] Disable the dump_desc() function.

2021-03-16 Thread nickm
commit ede88c374cd61e1e362422718625707a770c Author: Nick Mathewson Date: Fri Feb 19 12:31:19 2021 -0500 Disable the dump_desc() function. It can be called with strings that should have been length-delimited, but which in fact are not. This can cause a CPU-DoS bug or,

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

2021-03-16 Thread nickm
commit f078aab71ef56e1942caec5f27e0f336f2a7c7d1 Merge: efca9ce41c 890ae4fb1a Author: Nick Mathewson Date: Mon Mar 15 08:58:54 2021 -0400 Merge branch 'bug40316_035_v2' into maint-0.3.5 changes/bug40316 | 5 + src/feature/dirauth/dirvote.c | 2 +- 2 files changed, 6

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

2021-03-16 Thread nickm
commit 5ec579610ace4d3e4f0a6432b26e1e968beccf36 Merge: 2eb900f7e2 f078aab71e Author: Nick Mathewson Date: Mon Mar 15 09:01:59 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/bug40316 | 5 + src/feature/dirauth/dirvote.c | 2 +- 2 files changed, 6

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

2021-03-16 Thread nickm
commit f46f4562cf6f47fe6c00752f61b04dc18a454253 Merge: 1a0b5fd569 ede88c374c Author: Nick Mathewson Date: Mon Mar 15 08:41:03 2021 -0400 Merge branch 'bug40286_disable_min_035' into maint-0.3.5 changes/ticket40286_minimal| 5 + src/feature/dirparse/unparseable.c | 6 ++ 2

[tor-commits] [tor/master] Copy forward ReleaseNotes and ChangeLogs for today's releases

2021-03-16 Thread nickm
commit 57d969de1ae167815da6616814792c0c38eb Author: Nick Mathewson Date: Tue Mar 16 08:31:22 2021 -0400 Copy forward ReleaseNotes and ChangeLogs for today's releases --- ChangeLog| 181 +++ ReleaseNotes | 180

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

2021-03-16 Thread nickm
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

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

2021-03-16 Thread nickm
commit f46f4562cf6f47fe6c00752f61b04dc18a454253 Merge: 1a0b5fd569 ede88c374c Author: Nick Mathewson Date: Mon Mar 15 08:41:03 2021 -0400 Merge branch 'bug40286_disable_min_035' into maint-0.3.5 changes/ticket40286_minimal| 5 + src/feature/dirparse/unparseable.c | 6 ++ 2

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

2021-03-16 Thread nickm
commit 5ec579610ace4d3e4f0a6432b26e1e968beccf36 Merge: 2eb900f7e2 f078aab71e Author: Nick Mathewson Date: Mon Mar 15 09:01:59 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/bug40316 | 5 + src/feature/dirauth/dirvote.c | 2 +- 2 files changed, 6

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

2021-03-16 Thread nickm
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

[tor-commits] [tor/master] Remove changes files that will appear in 0.4.5.7

2021-03-16 Thread nickm
commit fcd42982b2b8471e68d220504a3de5a30f3b9110 Author: Nick Mathewson Date: Mon Mar 15 09:03:37 2021 -0400 Remove changes files that will appear in 0.4.5.7 (0.4.6.1-alpha will come out after the stable releases.) --- changes/bug40316| 5 -

[tor-commits] [tor/master] Remove check-best-practices from check-local in 0.4.4

2021-03-16 Thread nickm
commit f2cfd1ffad439350e907483255c150360ea37108 Author: Nick Mathewson Date: Mon Mar 15 09:41:19 2021 -0400 Remove check-best-practices from check-local in 0.4.4 --- Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index a723c167ef..a212ae19c6

[tor-commits] [tor/master] Fold ticket40314 into ChangeLog.

2021-03-16 Thread nickm
commit 2022d974af6201c64dd5cc2e054bead5735e9531 Author: Nick Mathewson Date: Mon Mar 15 09:35:40 2021 -0400 Fold ticket40314 into ChangeLog. --- ChangeLog | 10 +- changes/ticket40314 | 4 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog

[tor-commits] [tor/master] Fix detection of point to insert signatures on a pending consensus.

2021-03-16 Thread nickm
commit 890ae4fb1adfa13e37aaf5261e089e8c195a75cf Author: Nick Mathewson Date: Wed Mar 3 15:14:31 2021 -0500 Fix detection of point to insert signatures on a pending consensus. We were looking for the first instance of "directory-signature " when instead the correct behavior is

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

2021-03-16 Thread nickm
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

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

2021-03-16 Thread nickm
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

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

2021-03-16 Thread nickm
commit f078aab71ef56e1942caec5f27e0f336f2a7c7d1 Merge: efca9ce41c 890ae4fb1a Author: Nick Mathewson Date: Mon Mar 15 08:58:54 2021 -0400 Merge branch 'bug40316_035_v2' into maint-0.3.5 changes/bug40316 | 5 + src/feature/dirauth/dirvote.c | 2 +- 2 files changed, 6

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

2021-03-16 Thread nickm
commit 2eb900f7e2ca64e6ce16fc86410cafd935e7cd1e Merge: b9f6539008 efca9ce41c Author: Nick Mathewson Date: Mon Mar 15 08:54:00 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/ticket40286_minimal| 7 --- src/feature/dirparse/unparseable.c | 7 +-- 2 files

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

2021-03-16 Thread nickm
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

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

2021-03-16 Thread nickm
commit b9f65390089817a74bf20d93e93a15b41a970f79 Merge: fb2c889a38 f46f4562cf Author: Nick Mathewson Date: Mon Mar 15 08:52:28 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/ticket40286_minimal| 5 + src/feature/dirparse/unparseable.c | 6 ++ 2 files

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

2021-03-16 Thread nickm
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

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

2021-03-16 Thread nickm
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

[tor-commits] [tor/master] Bump to 0.4.4.8

2021-03-16 Thread nickm
commit fb2c889a388e85ca808e30106fd8a8194ed72f07 Author: Nick Mathewson Date: Mon Mar 15 07:40:48 2021 -0400 Bump to 0.4.4.8 --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

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

2021-03-16 Thread nickm
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

[tor-commits] [tor/master] Clarify new intended strategy with TROVE-2021-001

2021-03-16 Thread nickm
commit efca9ce41c96bb0044f504ced36a2734b1689ee2 Author: Nick Mathewson Date: Mon Mar 15 08:53:36 2021 -0400 Clarify new intended strategy with TROVE-2021-001 We're going to disable this feature in all versions for now. --- changes/ticket40286_minimal| 7 ---

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

2021-03-16 Thread nickm
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

[tor-commits] [tor/master] Bump to 0.3.5.14

2021-03-16 Thread nickm
commit 1a0b5fd569684fc2d75436f7b3befcc5652c87e1 Author: Nick Mathewson Date: Mon Mar 15 07:39:45 2021 -0400 Bump to 0.3.5.14 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

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

2021-03-16 Thread nickm
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

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

2021-03-16 Thread nickm
commit 8ada4263a95b2a5bc6ef6022664aadca14039d97 Merge: 9f59b6f458 1a0b5fd569 Author: Nick Mathewson Date: Mon Mar 15 07:40:06 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 "ours" to avoid version bump. ___ tor-commits

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

2021-03-16 Thread nickm
commit f46f4562cf6f47fe6c00752f61b04dc18a454253 Merge: 1a0b5fd569 ede88c374c Author: Nick Mathewson Date: Mon Mar 15 08:41:03 2021 -0400 Merge branch 'bug40286_disable_min_035' into maint-0.3.5 changes/ticket40286_minimal| 5 + src/feature/dirparse/unparseable.c | 6 ++ 2

[tor-commits] [tor/master] Bump to 0.4.6.1-alpha

2021-03-16 Thread nickm
commit 8e4965aa36d77aabb47b55eed69d7b9e23bef5d1 Author: Nick Mathewson Date: Mon Mar 15 07:42:47 2021 -0400 Bump to 0.4.6.1-alpha --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

[tor-commits] [tor/master] Bump to 0.4.5.7

2021-03-16 Thread nickm
commit be17a5a3cffa72ee51bfd854d4e82a90c64c51d6 Author: Nick Mathewson Date: Mon Mar 15 07:41:54 2021 -0400 Bump to 0.4.5.7 --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

[tor-commits] [tor/master] Disable the dump_desc() function.

2021-03-16 Thread nickm
commit ede88c374cd61e1e362422718625707a770c Author: Nick Mathewson Date: Fri Feb 19 12:31:19 2021 -0500 Disable the dump_desc() function. It can be called with strings that should have been length-delimited, but which in fact are not. This can cause a CPU-DoS bug or,

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

2021-03-16 Thread nickm
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

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

2021-03-16 Thread nickm
commit f078aab71ef56e1942caec5f27e0f336f2a7c7d1 Merge: efca9ce41c 890ae4fb1a Author: Nick Mathewson Date: Mon Mar 15 08:58:54 2021 -0400 Merge branch 'bug40316_035_v2' into maint-0.3.5 changes/bug40316 | 5 + src/feature/dirauth/dirvote.c | 2 +- 2 files changed, 6

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

2021-03-16 Thread nickm
commit 2eb900f7e2ca64e6ce16fc86410cafd935e7cd1e Merge: b9f6539008 efca9ce41c Author: Nick Mathewson Date: Mon Mar 15 08:54:00 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/ticket40286_minimal| 7 --- src/feature/dirparse/unparseable.c | 7 +-- 2 files

[tor-commits] [tor/maint-0.4.5] Remove check-best-practices from check-local in 0.4.4

2021-03-16 Thread nickm
commit f2cfd1ffad439350e907483255c150360ea37108 Author: Nick Mathewson Date: Mon Mar 15 09:41:19 2021 -0400 Remove check-best-practices from check-local in 0.4.4 --- Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index a723c167ef..a212ae19c6

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

2021-03-16 Thread nickm
commit 5ec579610ace4d3e4f0a6432b26e1e968beccf36 Merge: 2eb900f7e2 f078aab71e Author: Nick Mathewson Date: Mon Mar 15 09:01:59 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/bug40316 | 5 + src/feature/dirauth/dirvote.c | 2 +- 2 files changed, 6

[tor-commits] [tor/maint-0.4.5] Bump to 0.4.5.7

2021-03-16 Thread nickm
commit be17a5a3cffa72ee51bfd854d4e82a90c64c51d6 Author: Nick Mathewson Date: Mon Mar 15 07:41:54 2021 -0400 Bump to 0.4.5.7 --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

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

2021-03-16 Thread nickm
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

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

2021-03-16 Thread nickm
commit b9f65390089817a74bf20d93e93a15b41a970f79 Merge: fb2c889a38 f46f4562cf Author: Nick Mathewson Date: Mon Mar 15 08:52:28 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/ticket40286_minimal| 5 + src/feature/dirparse/unparseable.c | 6 ++ 2 files

[tor-commits] [tor/maint-0.4.5] Clarify new intended strategy with TROVE-2021-001

2021-03-16 Thread nickm
commit efca9ce41c96bb0044f504ced36a2734b1689ee2 Author: Nick Mathewson Date: Mon Mar 15 08:53:36 2021 -0400 Clarify new intended strategy with TROVE-2021-001 We're going to disable this feature in all versions for now. --- changes/ticket40286_minimal| 7 ---

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

2021-03-16 Thread nickm
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

[tor-commits] [tor/maint-0.4.4] Remove check-best-practices from check-local in 0.4.4

2021-03-16 Thread nickm
commit f2cfd1ffad439350e907483255c150360ea37108 Author: Nick Mathewson Date: Mon Mar 15 09:41:19 2021 -0400 Remove check-best-practices from check-local in 0.4.4 --- Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index a723c167ef..a212ae19c6

[tor-commits] [tor/maint-0.4.5] Fix detection of point to insert signatures on a pending consensus.

2021-03-16 Thread nickm
commit 890ae4fb1adfa13e37aaf5261e089e8c195a75cf Author: Nick Mathewson Date: Wed Mar 3 15:14:31 2021 -0500 Fix detection of point to insert signatures on a pending consensus. We were looking for the first instance of "directory-signature " when instead the correct behavior is

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

2021-03-16 Thread nickm
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

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

2021-03-16 Thread nickm
commit f46f4562cf6f47fe6c00752f61b04dc18a454253 Merge: 1a0b5fd569 ede88c374c Author: Nick Mathewson Date: Mon Mar 15 08:41:03 2021 -0400 Merge branch 'bug40286_disable_min_035' into maint-0.3.5 changes/ticket40286_minimal| 5 + src/feature/dirparse/unparseable.c | 6 ++ 2

[tor-commits] [tor/maint-0.4.5] Bump to 0.4.4.8

2021-03-16 Thread nickm
commit fb2c889a388e85ca808e30106fd8a8194ed72f07 Author: Nick Mathewson Date: Mon Mar 15 07:40:48 2021 -0400 Bump to 0.4.4.8 --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

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

2021-03-16 Thread nickm
commit 8ada4263a95b2a5bc6ef6022664aadca14039d97 Merge: 9f59b6f458 1a0b5fd569 Author: Nick Mathewson Date: Mon Mar 15 07:40:06 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 "ours" to avoid version bump. ___ tor-commits

[tor-commits] [tor/maint-0.4.5] Bump to 0.3.5.14

2021-03-16 Thread nickm
commit 1a0b5fd569684fc2d75436f7b3befcc5652c87e1 Author: Nick Mathewson Date: Mon Mar 15 07:39:45 2021 -0400 Bump to 0.3.5.14 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/maint-0.4.4] Fix detection of point to insert signatures on a pending consensus.

2021-03-16 Thread nickm
commit 890ae4fb1adfa13e37aaf5261e089e8c195a75cf Author: Nick Mathewson Date: Wed Mar 3 15:14:31 2021 -0500 Fix detection of point to insert signatures on a pending consensus. We were looking for the first instance of "directory-signature " when instead the correct behavior is

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

2021-03-16 Thread nickm
commit b9f65390089817a74bf20d93e93a15b41a970f79 Merge: fb2c889a38 f46f4562cf Author: Nick Mathewson Date: Mon Mar 15 08:52:28 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/ticket40286_minimal| 5 + src/feature/dirparse/unparseable.c | 6 ++ 2 files

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

2021-03-16 Thread nickm
commit 2eb900f7e2ca64e6ce16fc86410cafd935e7cd1e Merge: b9f6539008 efca9ce41c Author: Nick Mathewson Date: Mon Mar 15 08:54:00 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/ticket40286_minimal| 7 --- src/feature/dirparse/unparseable.c | 7 +-- 2 files

[tor-commits] [tor/maint-0.4.4] Bump to 0.3.5.14

2021-03-16 Thread nickm
commit 1a0b5fd569684fc2d75436f7b3befcc5652c87e1 Author: Nick Mathewson Date: Mon Mar 15 07:39:45 2021 -0400 Bump to 0.3.5.14 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/maint-0.4.4] Clarify new intended strategy with TROVE-2021-001

2021-03-16 Thread nickm
commit efca9ce41c96bb0044f504ced36a2734b1689ee2 Author: Nick Mathewson Date: Mon Mar 15 08:53:36 2021 -0400 Clarify new intended strategy with TROVE-2021-001 We're going to disable this feature in all versions for now. --- changes/ticket40286_minimal| 7 ---

[tor-commits] [tor/maint-0.3.5] Merge branch 'bug40316_035_v2' into maint-0.3.5

2021-03-16 Thread nickm
commit f078aab71ef56e1942caec5f27e0f336f2a7c7d1 Merge: efca9ce41c 890ae4fb1a Author: Nick Mathewson Date: Mon Mar 15 08:58:54 2021 -0400 Merge branch 'bug40316_035_v2' into maint-0.3.5 changes/bug40316 | 5 + src/feature/dirauth/dirvote.c | 2 +- 2 files changed, 6

[tor-commits] [tor/maint-0.4.4] Disable the dump_desc() function.

2021-03-16 Thread nickm
commit ede88c374cd61e1e362422718625707a770c Author: Nick Mathewson Date: Fri Feb 19 12:31:19 2021 -0500 Disable the dump_desc() function. It can be called with strings that should have been length-delimited, but which in fact are not. This can cause a CPU-DoS bug or,

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

2021-03-16 Thread nickm
commit 8ada4263a95b2a5bc6ef6022664aadca14039d97 Merge: 9f59b6f458 1a0b5fd569 Author: Nick Mathewson Date: Mon Mar 15 07:40:06 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 "ours" to avoid version bump. ___ tor-commits

[tor-commits] [tor/maint-0.4.4] Bump to 0.4.4.8

2021-03-16 Thread nickm
commit fb2c889a388e85ca808e30106fd8a8194ed72f07 Author: Nick Mathewson Date: Mon Mar 15 07:40:48 2021 -0400 Bump to 0.4.4.8 --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

[tor-commits] [tor/maint-0.3.5] Disable the dump_desc() function.

2021-03-16 Thread nickm
commit ede88c374cd61e1e362422718625707a770c Author: Nick Mathewson Date: Fri Feb 19 12:31:19 2021 -0500 Disable the dump_desc() function. It can be called with strings that should have been length-delimited, but which in fact are not. This can cause a CPU-DoS bug or,

[tor-commits] [tor/maint-0.3.5] Fix detection of point to insert signatures on a pending consensus.

2021-03-16 Thread nickm
commit 890ae4fb1adfa13e37aaf5261e089e8c195a75cf Author: Nick Mathewson Date: Wed Mar 3 15:14:31 2021 -0500 Fix detection of point to insert signatures on a pending consensus. We were looking for the first instance of "directory-signature " when instead the correct behavior is

[tor-commits] [tor/maint-0.3.5] Merge branch 'bug40286_disable_min_035' into maint-0.3.5

2021-03-16 Thread nickm
commit f46f4562cf6f47fe6c00752f61b04dc18a454253 Merge: 1a0b5fd569 ede88c374c Author: Nick Mathewson Date: Mon Mar 15 08:41:03 2021 -0400 Merge branch 'bug40286_disable_min_035' into maint-0.3.5 changes/ticket40286_minimal| 5 + src/feature/dirparse/unparseable.c | 6 ++ 2

[tor-commits] [tor/maint-0.3.5] Bump to 0.3.5.14

2021-03-16 Thread nickm
commit 1a0b5fd569684fc2d75436f7b3befcc5652c87e1 Author: Nick Mathewson Date: Mon Mar 15 07:39:45 2021 -0400 Bump to 0.3.5.14 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/maint-0.3.5] Clarify new intended strategy with TROVE-2021-001

2021-03-16 Thread nickm
commit efca9ce41c96bb0044f504ced36a2734b1689ee2 Author: Nick Mathewson Date: Mon Mar 15 08:53:36 2021 -0400 Clarify new intended strategy with TROVE-2021-001 We're going to disable this feature in all versions for now. --- changes/ticket40286_minimal| 7 ---

[tor-commits] [tor/master] Run "make autostyle" in advance of new series.

2021-03-14 Thread nickm
commit 444233c15ec34b78bba0b03547f0ae70b8e2b918 Author: Nick Mathewson Date: Fri Mar 12 11:40:48 2021 -0500 Run "make autostyle" in advance of new series. --- src/app/config/config.c| 4 ++-- src/app/config/resolve_addr.c | 2 +- src/app/config/resolve_addr.h

[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.4

2021-03-12 Thread nickm
commit 9f59b6f458f2322df0bbfa48789c79f6657b4857 Merge: 41796158e6 02230575c4 Author: Nick Mathewson Date: Fri Mar 12 11:36:34 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.4 LICENSE | 43 ++- changes/geoip-2021-03-12 | 2 +-

[tor-commits] [tor/release-0.3.5] Remove maxmind license; add ipfire location database license (cc by-sa 4.0)

2021-03-12 Thread nickm
commit 02230575c4da6cd6342516e6682f95dad3e3e29e Author: Nick Mathewson Date: Fri Mar 12 11:36:28 2021 -0500 Remove maxmind license; add ipfire location database license (cc by-sa 4.0) --- LICENSE | 43 ++- 1 file changed, 10 insertions(+), 33

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

2021-03-12 Thread nickm
commit 61c6049fa825c0d59872e65defa9c4e0ba63eef2 Merge: b5c565728e 433f526af6 Author: Nick Mathewson Date: Fri Mar 12 11:36:34 2021 -0500 Merge branch 'maint-0.4.5' into release-0.4.5 LICENSE | 43 ++- changes/geoip-2021-03-12 | 2

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

2021-03-12 Thread nickm
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 +-

[tor-commits] [tor/release-0.4.4] Use the right ticket number.

2021-03-12 Thread nickm
commit c1ce126c74405dc84343ca5652397ecebdc8c7a9 Author: Nick Mathewson Date: Fri Mar 12 11:31:36 2021 -0500 Use the right ticket number. --- changes/geoip-2021-03-12 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/geoip-2021-03-12 b/changes/geoip-2021-03-12

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

2021-03-12 Thread nickm
commit 1a407612bca7412f20d06bfe3353708faa2adefb Merge: 877f7bbb47 9f59b6f458 Author: Nick Mathewson Date: Fri Mar 12 11:36:34 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 LICENSE | 43 ++- changes/geoip-2021-03-12 | 2

[tor-commits] [tor/release-0.4.5] Remove maxmind license; add ipfire location database license (cc by-sa 4.0)

2021-03-12 Thread nickm
commit 02230575c4da6cd6342516e6682f95dad3e3e29e Author: Nick Mathewson Date: Fri Mar 12 11:36:28 2021 -0500 Remove maxmind license; add ipfire location database license (cc by-sa 4.0) --- LICENSE | 43 ++- 1 file changed, 10 insertions(+), 33

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

2021-03-12 Thread nickm
commit c9b4d4aa754c35b4785a4ddc56ea301c65c65914 Merge: 9bcd9523be 02230575c4 Author: Nick Mathewson Date: Fri Mar 12 11:36:34 2021 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 LICENSE | 43 ++- changes/geoip-2021-03-12 | 2

[tor-commits] [tor/master] Remove MMDB conversion tool.

2021-03-12 Thread nickm
commit d7e827a75430b294197daf8628ca8834befa806c Author: Nick Mathewson Date: Fri Mar 12 11:37:03 2021 -0500 Remove MMDB conversion tool. It was made to convert Maxmind's "mmdb" files into the older format that we used. But now thanks to IPFire Location, we don't have to

[tor-commits] [tor/release-0.3.5] Use the right ticket number.

2021-03-12 Thread nickm
commit c1ce126c74405dc84343ca5652397ecebdc8c7a9 Author: Nick Mathewson Date: Fri Mar 12 11:31:36 2021 -0500 Use the right ticket number. --- changes/geoip-2021-03-12 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/geoip-2021-03-12 b/changes/geoip-2021-03-12

[tor-commits] [tor/release-0.4.4] Remove maxmind license; add ipfire location database license (cc by-sa 4.0)

2021-03-12 Thread nickm
commit 02230575c4da6cd6342516e6682f95dad3e3e29e Author: Nick Mathewson Date: Fri Mar 12 11:36:28 2021 -0500 Remove maxmind license; add ipfire location database license (cc by-sa 4.0) --- LICENSE | 43 ++- 1 file changed, 10 insertions(+), 33

[tor-commits] [tor/release-0.4.5] Use the right ticket number.

2021-03-12 Thread nickm
commit c1ce126c74405dc84343ca5652397ecebdc8c7a9 Author: Nick Mathewson Date: Fri Mar 12 11:31:36 2021 -0500 Use the right ticket number. --- changes/geoip-2021-03-12 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/geoip-2021-03-12 b/changes/geoip-2021-03-12

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

2021-03-12 Thread nickm
commit 9f59b6f458f2322df0bbfa48789c79f6657b4857 Merge: 41796158e6 02230575c4 Author: Nick Mathewson Date: Fri Mar 12 11:36:34 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.4 LICENSE | 43 ++- changes/geoip-2021-03-12 | 2 +-

[tor-commits] [tor/master] Remove maxmind license; add ipfire location database license (cc by-sa 4.0)

2021-03-12 Thread nickm
commit 02230575c4da6cd6342516e6682f95dad3e3e29e Author: Nick Mathewson Date: Fri Mar 12 11:36:28 2021 -0500 Remove maxmind license; add ipfire location database license (cc by-sa 4.0) --- LICENSE | 43 ++- 1 file changed, 10 insertions(+), 33

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

2021-03-12 Thread nickm
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 +-

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

2021-03-12 Thread nickm
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

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

2021-03-12 Thread nickm
commit 9f59b6f458f2322df0bbfa48789c79f6657b4857 Merge: 41796158e6 02230575c4 Author: Nick Mathewson Date: Fri Mar 12 11:36:34 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.4 LICENSE | 43 ++- changes/geoip-2021-03-12 | 2 +-

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

2021-03-12 Thread nickm
commit 9f59b6f458f2322df0bbfa48789c79f6657b4857 Merge: 41796158e6 02230575c4 Author: Nick Mathewson Date: Fri Mar 12 11:36:34 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.4 LICENSE | 43 ++- changes/geoip-2021-03-12 | 2 +-

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

2021-03-12 Thread nickm
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 +-

[tor-commits] [tor/maint-0.4.5] Use the right ticket number.

2021-03-12 Thread nickm
commit c1ce126c74405dc84343ca5652397ecebdc8c7a9 Author: Nick Mathewson Date: Fri Mar 12 11:31:36 2021 -0500 Use the right ticket number. --- changes/geoip-2021-03-12 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/geoip-2021-03-12 b/changes/geoip-2021-03-12

[tor-commits] [tor/master] Use the right ticket number.

2021-03-12 Thread nickm
commit c1ce126c74405dc84343ca5652397ecebdc8c7a9 Author: Nick Mathewson Date: Fri Mar 12 11:31:36 2021 -0500 Use the right ticket number. --- changes/geoip-2021-03-12 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/geoip-2021-03-12 b/changes/geoip-2021-03-12

[tor-commits] [tor/maint-0.4.5] Remove maxmind license; add ipfire location database license (cc by-sa 4.0)

2021-03-12 Thread nickm
commit 02230575c4da6cd6342516e6682f95dad3e3e29e Author: Nick Mathewson Date: Fri Mar 12 11:36:28 2021 -0500 Remove maxmind license; add ipfire location database license (cc by-sa 4.0) --- LICENSE | 43 ++- 1 file changed, 10 insertions(+), 33

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

2021-03-12 Thread nickm
commit 9f59b6f458f2322df0bbfa48789c79f6657b4857 Merge: 41796158e6 02230575c4 Author: Nick Mathewson Date: Fri Mar 12 11:36:34 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.4 LICENSE | 43 ++- changes/geoip-2021-03-12 | 2 +-

[tor-commits] [tor/maint-0.4.4] Remove maxmind license; add ipfire location database license (cc by-sa 4.0)

2021-03-12 Thread nickm
commit 02230575c4da6cd6342516e6682f95dad3e3e29e Author: Nick Mathewson Date: Fri Mar 12 11:36:28 2021 -0500 Remove maxmind license; add ipfire location database license (cc by-sa 4.0) --- LICENSE | 43 ++- 1 file changed, 10 insertions(+), 33

[tor-commits] [tor/maint-0.4.4] Use the right ticket number.

2021-03-12 Thread nickm
commit c1ce126c74405dc84343ca5652397ecebdc8c7a9 Author: Nick Mathewson Date: Fri Mar 12 11:31:36 2021 -0500 Use the right ticket number. --- changes/geoip-2021-03-12 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/geoip-2021-03-12 b/changes/geoip-2021-03-12

[tor-commits] [tor/maint-0.3.5] Use the right ticket number.

2021-03-12 Thread nickm
commit c1ce126c74405dc84343ca5652397ecebdc8c7a9 Author: Nick Mathewson Date: Fri Mar 12 11:31:36 2021 -0500 Use the right ticket number. --- changes/geoip-2021-03-12 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/geoip-2021-03-12 b/changes/geoip-2021-03-12

[tor-commits] [tor/maint-0.3.5] Remove maxmind license; add ipfire location database license (cc by-sa 4.0)

2021-03-12 Thread nickm
commit 02230575c4da6cd6342516e6682f95dad3e3e29e Author: Nick Mathewson Date: Fri Mar 12 11:36:28 2021 -0500 Remove maxmind license; add ipfire location database license (cc by-sa 4.0) --- LICENSE | 43 ++- 1 file changed, 10 insertions(+), 33

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

2021-03-12 Thread nickm
commit b5c565728eaf732bd6621fe582a3abe654258e47 Merge: 35cba3ae33 b014866f6a Author: Nick Mathewson Date: Fri Mar 12 11:30:22 2021 -0500 Merge branch 'maint-0.4.5' into release-0.4.5 changes/geoip-2021-03-12 | 9 + src/config/geoip | 144354

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

2021-03-12 Thread nickm
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

[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.4

2021-03-12 Thread nickm
commit 41796158e633524fa3222c66dbd619e32bba5c95 Merge: eb1759633a aa6c7741e8 Author: Nick Mathewson Date: Fri Mar 12 11:30:21 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/geoip-2021-03-12 | 9 + src/config/geoip | 144354

[tor-commits] [tor/release-0.4.5] update geoip-2021-03-12 to mention provider transition.

2021-03-12 Thread nickm
commit aa6c7741e836b3222a3751b8128afcb1155ded2b Author: Nick Mathewson Date: Fri Mar 12 11:29:09 2021 -0500 update geoip-2021-03-12 to mention provider transition. --- changes/geoip-2021-03-12 | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git

<    5   6   7   8   9   10   11   12   13   14   >