May 2021 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6
by nickm＠torproject.org 07 May '21

07 May '21

commit 5acf18bfaa562cb1bba72caa196c195dff8e162e Merge: 0397a9cb49 7c86f34340 Author: Nick Mathewson <nickm(a)torproject.org> 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 deletions(-)

1 0

[tor/master] Reindent a few lines to fix a GCC warning.
by nickm＠torproject.org 07 May '21

07 May '21

commit e2c1ac214c0ae77282709b50fb9fbdde50dd7a1f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 7 10:39:20 2021 -0400 Reindent a few lines to fix a GCC warning. As of GCC 11.1.1, the compiler warns us about code like this: if (a) b; c; and that's a good thing: we wouldn't want to "goto fail". But we had an instance if this in circuituse.c, which was making our compilation sad. Fixes bug 40380; bugfix on 0.3.0.1-alpha. --- changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/changes/bug40380 b/changes/bug40380 new file mode 100644 index 0000000000..24d2876b7d --- /dev/null +++ b/changes/bug40380 @@ -0,0 +1,3 @@ + o Minor bugfixes (compiler warnings): + - Fix an indentation problem that led to a warning from GCC 11.1.1. + Fixes bug 40380; bugfix on 0.3.0.1-alpha. diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index 7273be3510..efd69fb4a3 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -1315,10 +1315,10 @@ circuit_predict_and_launch_new(void) if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL) flags |= CIRCLAUNCH_IS_INTERNAL; - log_info(LD_CIRC, - "Have %d clean circs need another buildtime test circ.", num); - circuit_launch(CIRCUIT_PURPOSE_C_GENERAL, flags); - return; + log_info(LD_CIRC, + "Have %d clean circs need another buildtime test circ.", num); + circuit_launch(CIRCUIT_PURPOSE_C_GENERAL, flags); + return; } }

1 0

[tor/master] Merge branch 'maint-0.4.4' into maint-0.4.5
by nickm＠torproject.org 07 May '21

07 May '21

commit 7c86f34340acf7d8cf35501e71b03f2feba1245e Merge: 7fe819c951 48dd87933d Author: Nick Mathewson <nickm(a)torproject.org> 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(-)

1 0

[tor/master] Merge branch 'maint-0.4.6'
by nickm＠torproject.org 07 May '21

07 May '21

commit a4c8591c351358e18897f038efbea27cfd295ce6 Merge: 1c9890bd31 5acf18bfaa Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 7 10:41:34 2021 -0400 Merge branch 'maint-0.4.6' changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.4
by nickm＠torproject.org 07 May '21

07 May '21

commit 48dd87933dd1c592937ef62d20aeac8998edc0fb Merge: f68aeda549 e2c1ac214c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 7 10:41:33 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/bug40380 | 3 +++ src/core/or/circuituse.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.4
by nickm＠torproject.org 07 May '21

07 May '21

commit f68aeda5496a217f389c92a28f83828e1170cbf0 Merge: 87d96f7162 621f8a304a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 7 09:53:57 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/geoip-2021-05-07 | 3 + src/config/geoip | 3227 ++++++++++++++++++++++++++++------------------ src/config/geoip6 | 1702 ++++++++++++++++-------- 3 files changed, 3098 insertions(+), 1834 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by nickm＠torproject.org 07 May '21

07 May '21

commit 0397a9cb49a34d56cd85c2b6b16f8fbd72cd2e3d Merge: 8142b368e7 7fe819c951 Author: Nick Mathewson <nickm(a)torproject.org> 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 ++++++++++++++++++++++++++++------------------ src/config/geoip6 | 1702 ++++++++++++++++-------- 3 files changed, 3098 insertions(+), 1834 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.4' into maint-0.4.5
by nickm＠torproject.org 07 May '21

07 May '21

commit 7fe819c9510bc0b738c55abf7339b64498265c05 Merge: ec0b4bdafd f68aeda549 Author: Nick Mathewson <nickm(a)torproject.org> 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(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by nickm＠torproject.org 07 May '21

07 May '21

commit e730629a2f79e08b537b488b6bbcf6f23aa1df3c Merge: c05059f736 0397a9cb49 Author: Nick Mathewson <nickm(a)torproject.org> 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 ++++++++++++++++++++++++++++------------------ src/config/geoip6 | 1702 ++++++++++++++++-------- 3 files changed, 3098 insertions(+), 1834 deletions(-)

1 0

[tor/release-0.4.6] Fold geoip changelog entry into 0.4.6.3-rc changelog
by nickm＠torproject.org 07 May '21

07 May '21

commit 8222f2f3ee6e0629fbe2fead76a6b20de7dc23f1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 7 09:55:17 2021 -0400 Fold geoip changelog entry into 0.4.6.3-rc changelog --- ChangeLog | 4 ++++ changes/geoip-2021-05-07 | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 617a39576d..cfc02f7883 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,10 @@ Changes in version 0.4.6.3-rc - 2021-05-10 - Make the autoconf script build correctly with autoconf versions 2.70 and later. Closes part of ticket 40335. + o Minor features (geoip data): + - Update the geoip files to match the IPFire Location Database, as + retrieved on 2021/05/07. + o Minor features (onion services): - Add a warning message when trying to connect to (no longer supported) v2 onion services. Closes ticket 40373. diff --git a/changes/geoip-2021-05-07 b/changes/geoip-2021-05-07 deleted file mode 100644 index 07bf12c4d8..0000000000 --- a/changes/geoip-2021-05-07 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features (geoip data): - - Update the geoip files to match the IPFire Location Database, - as retrieved on 2021/05/07.

1 0