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

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

21 Jan '21

commit 9e33aa878f091248ee5ec9da9d7d0d9fa216b965 Merge: 1f7876ff7e 4cbd22f1a7 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jan 22 00:21:21 2021 +0200 Merge branch 'maint-0.4.5' into release-0.4.5 changes/bug40238 | 3 +++ src/feature/dirparse/routerparse.c | 11 +++++++++++ 2 files changed, 14 insertions(+)

1 0

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

21 Jan '21

commit 4cbd22f1a7f876c7b47a0e688e28c5ac1f256d6d Merge: 68d1e02c3a 5d711450dd Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jan 22 00:21:09 2021 +0200 Merge branch 'mr/251' into maint-0.4.5 changes/bug40238 | 3 +++ src/feature/dirparse/routerparse.c | 11 +++++++++++ 2 files changed, 14 insertions(+)

1 0

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

21 Jan '21

commit 641dce2d6bfe382411d5897003b18167fdddfc2b Merge: c09f8da8a9 65087903d9 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 21 16:18:43 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 .gitignore | 1 + 1 file changed, 1 insertion(+)

1 0

[tor/release-0.4.5] gitignore: don't ignore core directory
by dgoulet＠torproject.org 21 Jan '21

21 Jan '21

commit 65087903d9e55f77a6c0d66517adb605aacab485 Author: Alex Xu (Hello71) <alex_y_xu(a)yahoo.ca> Date: Thu Jan 21 16:06:28 2021 -0500 gitignore: don't ignore core directory otherwise src/core is ignored. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index cb49c098cd..736abbedc3 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,7 @@ uptime-*.json # Core files core core.* +!core/ # ccls file that can be per directory. *.ccls

1 0

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

21 Jan '21

commit 5a131c35ee65e7f7385598ebc8f725d3fc485570 Merge: 5110b15cee 09a1a34ad1 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 21 16:18:43 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 .gitignore | 1 + 1 file changed, 1 insertion(+)

1 0

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

21 Jan '21

commit 68d1e02c3a7594dc3f293edfe69ce49eb856d3ce Merge: e06a0e904c 09a1a34ad1 Author: David Goulet <dgoulet(a)torproject.org> 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(+)

1 0

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

21 Jan '21

commit 641dce2d6bfe382411d5897003b18167fdddfc2b Merge: c09f8da8a9 65087903d9 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 21 16:18:43 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 .gitignore | 1 + 1 file changed, 1 insertion(+)

1 0

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

21 Jan '21

commit 09a1a34ad1167fd0c9c97b323fa4e227394bd41f Merge: 2a3cf37450 641dce2d6b Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 21 16:18:43 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitignore | 1 + 1 file changed, 1 insertion(+)

1 0

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

21 Jan '21

commit 1f7876ff7eff328fd4850ea1ef9ade81ac9c676e Merge: e07d62f5c3 68d1e02c3a Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 21 16:18:43 2021 -0500 Merge branch 'maint-0.4.5' into release-0.4.5 .gitignore | 1 + 1 file changed, 1 insertion(+)

1 0

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

21 Jan '21

commit 09a1a34ad1167fd0c9c97b323fa4e227394bd41f Merge: 2a3cf37450 641dce2d6b Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 21 16:18:43 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 .gitignore | 1 + 1 file changed, 1 insertion(+)

1 0