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

[tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.3
by dgoulet＠torproject.org 13 Jan '21

13 Jan '21

commit 17eb6355320c414d83cbc3c1930ec54ae7cd1ea4 Merge: 4b39f46a61 7a82fbfdab Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jan 13 10:38:05 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 .gitignore | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by dgoulet＠torproject.org 13 Jan '21

13 Jan '21

commit d9f671e933fb9c218e188005feeaff37310dd3b0 Merge: e0caedee16 61ee17eb1e Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jan 13 10:38:05 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 .gitignore | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
by dgoulet＠torproject.org 13 Jan '21

13 Jan '21

commit 61ee17eb1e3b0c7b92bfa80f3f0f7cbb986db71b Merge: 5a822b462a 17eb635532 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jan 13 10:38:05 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitignore | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3
by dgoulet＠torproject.org 13 Jan '21

13 Jan '21

commit 17eb6355320c414d83cbc3c1930ec54ae7cd1ea4 Merge: 4b39f46a61 7a82fbfdab Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jan 13 10:38:05 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 .gitignore | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor/maint-0.3.5] gitignore: Add Linux core file patterns
by dgoulet＠torproject.org 13 Jan '21

13 Jan '21

commit 7a82fbfdaba39745cdb8f8a123b9844f3cb3df09 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jan 13 10:37:56 2021 -0500 gitignore: Add Linux core file patterns Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index f1ce903a11..b7f72617a8 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,9 @@ details-*.json uptime-*.json *.full_url *.last_modified +# Core files +core +core.* # / /Makefile

1 0

[tor/maint-0.4.5] Merge branch 'mr/252' into maint-0.4.5
by asn＠torproject.org 13 Jan '21

13 Jan '21

commit c931eae9811a3bba3720f22159f43af8ad3a1b1b Merge: 01be7cc535 4d6d3b3c05 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jan 13 16:01:11 2021 +0200 Merge branch 'mr/252' into maint-0.4.5 src/feature/nodelist/microdesc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.5] Remove BUG() when checking TOO_MANY_OUTDATED_DIRSERVERS.
by asn＠torproject.org 13 Jan '21

13 Jan '21

commit 4d6d3b3c056bd886226ba6c55ef00e06b9c86ae6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 11 15:02:23 2021 -0500 Remove BUG() when checking TOO_MANY_OUTDATED_DIRSERVERS. Fixes bug #40234; bugfix on 0.3.2.5-alpha. --- src/feature/nodelist/microdesc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/feature/nodelist/microdesc.c b/src/feature/nodelist/microdesc.c index dafaabb5e5..90eb938f6d 100644 --- a/src/feature/nodelist/microdesc.c +++ b/src/feature/nodelist/microdesc.c @@ -124,8 +124,9 @@ microdesc_note_outdated_dirserver(const char *relay_digest) tor_assert(outdated_dirserver_list); /* If the list grows too big, clean it up */ - if (BUG(smartlist_len(outdated_dirserver_list) > - TOO_MANY_OUTDATED_DIRSERVERS)) { + if (smartlist_len(outdated_dirserver_list) > TOO_MANY_OUTDATED_DIRSERVERS) { + log_info(LD_GENERAL,"Too many outdated directory servers (%d). Resetting.", + smartlist_len(outdated_dirserver_list)); microdesc_reset_outdated_dirservers_list(); }

1 0

[tor/master] Merge branch 'maint-0.4.5'
by asn＠torproject.org 13 Jan '21

13 Jan '21

commit cd1468d56b7b40c57e20d45af6498d118c2deee5 Merge: cc30c09f7c c931eae981 Author: George Kadianakis <desnacked(a)riseup.net> 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(-)

1 0

[tor/master] Remove BUG() when checking TOO_MANY_OUTDATED_DIRSERVERS.
by asn＠torproject.org 13 Jan '21

13 Jan '21

commit 4d6d3b3c056bd886226ba6c55ef00e06b9c86ae6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 11 15:02:23 2021 -0500 Remove BUG() when checking TOO_MANY_OUTDATED_DIRSERVERS. Fixes bug #40234; bugfix on 0.3.2.5-alpha. --- src/feature/nodelist/microdesc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/feature/nodelist/microdesc.c b/src/feature/nodelist/microdesc.c index dafaabb5e5..90eb938f6d 100644 --- a/src/feature/nodelist/microdesc.c +++ b/src/feature/nodelist/microdesc.c @@ -124,8 +124,9 @@ microdesc_note_outdated_dirserver(const char *relay_digest) tor_assert(outdated_dirserver_list); /* If the list grows too big, clean it up */ - if (BUG(smartlist_len(outdated_dirserver_list) > - TOO_MANY_OUTDATED_DIRSERVERS)) { + if (smartlist_len(outdated_dirserver_list) > TOO_MANY_OUTDATED_DIRSERVERS) { + log_info(LD_GENERAL,"Too many outdated directory servers (%d). Resetting.", + smartlist_len(outdated_dirserver_list)); microdesc_reset_outdated_dirservers_list(); }

1 0

[tor/master] Merge branch 'mr/252' into maint-0.4.5
by asn＠torproject.org 13 Jan '21

13 Jan '21

commit c931eae9811a3bba3720f22159f43af8ad3a1b1b Merge: 01be7cc535 4d6d3b3c05 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jan 13 16:01:11 2021 +0200 Merge branch 'mr/252' into maint-0.4.5 src/feature/nodelist/microdesc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0