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

[tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.4
by dgoulet＠torproject.org 14 Apr '21

14 Apr '21

commit bba3393d20976b5c668b15fb6202531772a6d8ff Merge: 59f6248e09 131e2d99a4 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 14 08:39:16 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 src/app/config/fallback_dirs.inc | 2 -- 1 file changed, 2 deletions(-)

1 0

[tor/maint-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.4
by dgoulet＠torproject.org 14 Apr '21

14 Apr '21

commit bba3393d20976b5c668b15fb6202531772a6d8ff Merge: 59f6248e09 131e2d99a4 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 14 08:39:16 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 src/app/config/fallback_dirs.inc | 2 -- 1 file changed, 2 deletions(-)

1 0

[tor/maint-0.4.4] fallbackdir: Remove two unspec lines
by dgoulet＠torproject.org 14 Apr '21

14 Apr '21

commit 131e2d99a45bd86b8379664cccb59bfc66f80c96 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 14 08:39:04 2021 -0400 fallbackdir: Remove two unspec lines Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/app/config/fallback_dirs.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/config/fallback_dirs.inc b/src/app/config/fallback_dirs.inc index c8b133da1b..4f43a4ba6e 100644 --- a/src/app/config/fallback_dirs.inc +++ b/src/app/config/fallback_dirs.inc @@ -2,8 +2,6 @@ /* version=4.0.0 */ /* timestamp=20210412000000 */ /* source=offer-list */ -// -// Generated on: Mon, 12 Apr 2021 13:57:46 +0000 "62.78.194.4 orport=9001 id=BD5609383472735292627DB86D92A29F3CFEE52A" /* nickname=Unnamed */

1 0

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

14 Apr '21

commit 30fa80c0fc1a1996d72b4fb3dead58cf877395f9 Merge: 59bc377dce bba3393d20 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 14 08:39:16 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 src/app/config/fallback_dirs.inc | 2 -- 1 file changed, 2 deletions(-)

1 0

[tor/master] fallbackdir: Remove two unspec lines
by dgoulet＠torproject.org 14 Apr '21

14 Apr '21

commit 131e2d99a45bd86b8379664cccb59bfc66f80c96 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 14 08:39:04 2021 -0400 fallbackdir: Remove two unspec lines Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/app/config/fallback_dirs.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/config/fallback_dirs.inc b/src/app/config/fallback_dirs.inc index c8b133da1b..4f43a4ba6e 100644 --- a/src/app/config/fallback_dirs.inc +++ b/src/app/config/fallback_dirs.inc @@ -2,8 +2,6 @@ /* version=4.0.0 */ /* timestamp=20210412000000 */ /* source=offer-list */ -// -// Generated on: Mon, 12 Apr 2021 13:57:46 +0000 "62.78.194.4 orport=9001 id=BD5609383472735292627DB86D92A29F3CFEE52A" /* nickname=Unnamed */

1 0

[tor/master] Merge branch 'maint-0.4.4' into maint-0.4.5
by dgoulet＠torproject.org 14 Apr '21

14 Apr '21

commit 30fa80c0fc1a1996d72b4fb3dead58cf877395f9 Merge: 59bc377dce bba3393d20 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 14 08:39:16 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 src/app/config/fallback_dirs.inc | 2 -- 1 file changed, 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.4
by dgoulet＠torproject.org 14 Apr '21

14 Apr '21

commit bba3393d20976b5c668b15fb6202531772a6d8ff Merge: 59f6248e09 131e2d99a4 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 14 08:39:16 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 src/app/config/fallback_dirs.inc | 2 -- 1 file changed, 2 deletions(-)

1 0

[tor/release-0.3.5] fallbackdir: Remove two unspec lines
by dgoulet＠torproject.org 14 Apr '21

14 Apr '21

commit 131e2d99a45bd86b8379664cccb59bfc66f80c96 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 14 08:39:04 2021 -0400 fallbackdir: Remove two unspec lines Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/app/config/fallback_dirs.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/config/fallback_dirs.inc b/src/app/config/fallback_dirs.inc index c8b133da1b..4f43a4ba6e 100644 --- a/src/app/config/fallback_dirs.inc +++ b/src/app/config/fallback_dirs.inc @@ -2,8 +2,6 @@ /* version=4.0.0 */ /* timestamp=20210412000000 */ /* source=offer-list */ -// -// Generated on: Mon, 12 Apr 2021 13:57:46 +0000 "62.78.194.4 orport=9001 id=BD5609383472735292627DB86D92A29F3CFEE52A" /* nickname=Unnamed */

1 0

[tor/master] Merge branch 'maint-0.4.5'
by dgoulet＠torproject.org 14 Apr '21

14 Apr '21

commit 91569c4dad91029a70b0d8e89c1fb901a371b012 Merge: 2815721243 30fa80c0fc Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 14 08:39:17 2021 -0400 Merge branch 'maint-0.4.5' src/app/config/fallback_dirs.inc | 2 -- 1 file changed, 2 deletions(-)

1 0

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

14 Apr '21

commit eff0682842980117d14cc783bb32baa3c5837c39 Merge: bb6362c06c bba3393d20 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 14 08:39:16 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 src/app/config/fallback_dirs.inc | 2 -- 1 file changed, 2 deletions(-)

1 0