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

[tor/maint-0.4.5] 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/maint-0.4.5] 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/maint-0.4.6] 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/maint-0.4.5] 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/maint-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 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 07 May '21

07 May '21

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

1 0

[tor/maint-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 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/release-0.4.4] 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/maint-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 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.4] 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