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

[tor/maint-0.3.2] Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9
by nickm＠torproject.org 10 Apr '18

10 Apr '18

commit 10a1969ca327c517e20aeefdc86f88c95322289d Merge: b68e636b3 1295044dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 10 14:25:57 2018 -0400 Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9 changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33 +++++++++++++++++++++++++++++++++ src/or/config.c | 34 +--------------------------------- src/or/include.am | 1 + 4 files changed, 38 insertions(+), 33 deletions(-)

1 0

[tor/maint-0.3.3] Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9
by nickm＠torproject.org 10 Apr '18

10 Apr '18

commit 10a1969ca327c517e20aeefdc86f88c95322289d Merge: b68e636b3 1295044dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 10 14:25:57 2018 -0400 Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9 changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33 +++++++++++++++++++++++++++++++++ src/or/config.c | 34 +--------------------------------- src/or/include.am | 1 + 4 files changed, 38 insertions(+), 33 deletions(-)

1 0

[tor/master] Lift the list of default directory servers into their own file.
by nickm＠torproject.org 10 Apr '18

10 Apr '18

commit 1295044dc8c999fb8c4a3de0011ab900053e7b1b Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Apr 6 03:58:16 2018 +0200 Lift the list of default directory servers into their own file. This patch lifts the list of default directory authorities from config.c into their own auth_dirs.inc file, which is then included in config.c using the C preprocessor. Patch by beastr0. See: https://bugs.torproject.org/24854 --- changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33 +++++++++++++++++++++++++++++++++ src/or/config.c | 34 +--------------------------------- src/or/include.am | 1 + 4 files changed, 38 insertions(+), 33 deletions(-) diff --git a/changes/bug24854 b/changes/bug24854 new file mode 100644 index 000000000..64e10772e --- /dev/null +++ b/changes/bug24854 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Move the list of default directory authorities to their own file for + inclusion using the C preprocessor. Closes ticket 24854. Patch by "beastr0". diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc new file mode 100644 index 000000000..58e6817c8 --- /dev/null +++ b/src/or/auth_dirs.inc @@ -0,0 +1,33 @@ +"moria1 orport=9101 " + "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 " + "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31", +"tor26 orport=443 " + "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 " + "ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 " + "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", +"dizum orport=443 " + "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " + "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", +"Bifroest orport=443 bridge " + "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1", +"gabelmoo orport=443 " + "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " + "ipv6=[2001:638:a000:4140::ffff:189]:443 " + "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", +"dannenberg orport=443 " + "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " + "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", +"maatuska orport=80 " + "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " + "ipv6=[2001:67c:289c::9]:80 " + "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", +"Faravahar orport=443 " + "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " + "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", +"longclaw orport=443 " + "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " + "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", +"bastet orport=443 " + "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 " + "ipv6=[2620:13:4000:6000::1000:118]:443 " + "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413", diff --git a/src/or/config.c b/src/or/config.c index 3b4027433..75e406585 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -967,39 +967,7 @@ escaped_safe_str(const char *address) /** List of default directory authorities */ static const char *default_authorities[] = { - "moria1 orport=9101 " - "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 " - "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31", - "tor26 orport=443 " - "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 " - "ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 " - "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", - "dizum orport=443 " - "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " - "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", - "Bifroest orport=443 bridge " - "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1", - "gabelmoo orport=443 " - "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " - "ipv6=[2001:638:a000:4140::ffff:189]:443 " - "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", - "dannenberg orport=443 " - "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " - "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "maatuska orport=80 " - "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " - "ipv6=[2001:67c:289c::9]:80 " - "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", - "Faravahar orport=443 " - "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " - "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", - "longclaw orport=443 " - "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " - "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", - "bastet orport=443 " - "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 " - "ipv6=[2620:13:4000:6000::1000:118]:443 " - "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413", +#include "auth_dirs.inc" NULL }; diff --git a/src/or/include.am b/src/or/include.am index 5108a08e5..19cf00264 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -127,6 +127,7 @@ endif ORHEADERS = \ src/or/addressmap.h \ + src/or/auth_dirs.inc \ src/or/buffers.h \ src/or/channel.h \ src/or/channeltls.h \

1 0

[tor/maint-0.3.3] Lift the list of default directory servers into their own file.
by nickm＠torproject.org 10 Apr '18

10 Apr '18

commit 1295044dc8c999fb8c4a3de0011ab900053e7b1b Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Apr 6 03:58:16 2018 +0200 Lift the list of default directory servers into their own file. This patch lifts the list of default directory authorities from config.c into their own auth_dirs.inc file, which is then included in config.c using the C preprocessor. Patch by beastr0. See: https://bugs.torproject.org/24854 --- changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33 +++++++++++++++++++++++++++++++++ src/or/config.c | 34 +--------------------------------- src/or/include.am | 1 + 4 files changed, 38 insertions(+), 33 deletions(-) diff --git a/changes/bug24854 b/changes/bug24854 new file mode 100644 index 000000000..64e10772e --- /dev/null +++ b/changes/bug24854 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Move the list of default directory authorities to their own file for + inclusion using the C preprocessor. Closes ticket 24854. Patch by "beastr0". diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc new file mode 100644 index 000000000..58e6817c8 --- /dev/null +++ b/src/or/auth_dirs.inc @@ -0,0 +1,33 @@ +"moria1 orport=9101 " + "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 " + "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31", +"tor26 orport=443 " + "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 " + "ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 " + "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", +"dizum orport=443 " + "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " + "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", +"Bifroest orport=443 bridge " + "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1", +"gabelmoo orport=443 " + "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " + "ipv6=[2001:638:a000:4140::ffff:189]:443 " + "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", +"dannenberg orport=443 " + "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " + "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", +"maatuska orport=80 " + "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " + "ipv6=[2001:67c:289c::9]:80 " + "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", +"Faravahar orport=443 " + "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " + "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", +"longclaw orport=443 " + "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " + "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", +"bastet orport=443 " + "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 " + "ipv6=[2620:13:4000:6000::1000:118]:443 " + "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413", diff --git a/src/or/config.c b/src/or/config.c index 3b4027433..75e406585 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -967,39 +967,7 @@ escaped_safe_str(const char *address) /** List of default directory authorities */ static const char *default_authorities[] = { - "moria1 orport=9101 " - "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 " - "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31", - "tor26 orport=443 " - "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 " - "ipv6=[2001:858:2:2:aabb:0:563b:1526]:443 " - "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", - "dizum orport=443 " - "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " - "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", - "Bifroest orport=443 bridge " - "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1", - "gabelmoo orport=443 " - "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " - "ipv6=[2001:638:a000:4140::ffff:189]:443 " - "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", - "dannenberg orport=443 " - "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " - "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "maatuska orport=80 " - "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " - "ipv6=[2001:67c:289c::9]:80 " - "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", - "Faravahar orport=443 " - "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " - "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", - "longclaw orport=443 " - "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " - "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", - "bastet orport=443 " - "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 " - "ipv6=[2620:13:4000:6000::1000:118]:443 " - "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413", +#include "auth_dirs.inc" NULL }; diff --git a/src/or/include.am b/src/or/include.am index 5108a08e5..19cf00264 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -127,6 +127,7 @@ endif ORHEADERS = \ src/or/addressmap.h \ + src/or/auth_dirs.inc \ src/or/buffers.h \ src/or/channel.h \ src/or/channeltls.h \

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 10 Apr '18

10 Apr '18

commit d3ac47b4153fbe51ca63882ce63165abdf50901b Merge: 124e06e85 db6902c23 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 10 14:26:32 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33 +++++++++++++++++++++++++++++++++ src/or/config.c | 34 +--------------------------------- src/or/include.am | 1 + 4 files changed, 38 insertions(+), 33 deletions(-) diff --cc src/or/include.am index abf62c2e8,7548ed094..4938ae8e7 --- a/src/or/include.am +++ b/src/or/include.am @@@ -156,7 -144,9 +156,8 @@@ endi ORHEADERS = \ src/or/addressmap.h \ + src/or/auth_dirs.inc \ src/or/bridges.h \ - src/or/buffers.h \ src/or/channel.h \ src/or/channelpadding.h \ src/or/channeltls.h \

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 10 Apr '18

10 Apr '18

commit db6902c23530f8d58e999701685e9cbd74b15a82 Merge: e813116d3 10a1969ca Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 10 14:26:29 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33 +++++++++++++++++++++++++++++++++ src/or/config.c | 34 +--------------------------------- src/or/include.am | 1 + 4 files changed, 38 insertions(+), 33 deletions(-) diff --cc src/or/include.am index 5d5ff5c41,19cf00264..7548ed094 --- a/src/or/include.am +++ b/src/or/include.am @@@ -144,10 -127,9 +144,11 @@@ endi ORHEADERS = \ src/or/addressmap.h \ + src/or/auth_dirs.inc \ + src/or/bridges.h \ src/or/buffers.h \ src/or/channel.h \ + src/or/channelpadding.h \ src/or/channeltls.h \ src/or/circpathbias.h \ src/or/circuitbuild.h \

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 10 Apr '18

10 Apr '18

commit d3ac47b4153fbe51ca63882ce63165abdf50901b Merge: 124e06e85 db6902c23 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 10 14:26:32 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33 +++++++++++++++++++++++++++++++++ src/or/config.c | 34 +--------------------------------- src/or/include.am | 1 + 4 files changed, 38 insertions(+), 33 deletions(-) diff --cc src/or/include.am index abf62c2e8,7548ed094..4938ae8e7 --- a/src/or/include.am +++ b/src/or/include.am @@@ -156,7 -144,9 +156,8 @@@ endi ORHEADERS = \ src/or/addressmap.h \ + src/or/auth_dirs.inc \ src/or/bridges.h \ - src/or/buffers.h \ src/or/channel.h \ src/or/channelpadding.h \ src/or/channeltls.h \

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 10 Apr '18

10 Apr '18

commit d3ac47b4153fbe51ca63882ce63165abdf50901b Merge: 124e06e85 db6902c23 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 10 14:26:32 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33 +++++++++++++++++++++++++++++++++ src/or/config.c | 34 +--------------------------------- src/or/include.am | 1 + 4 files changed, 38 insertions(+), 33 deletions(-) diff --cc src/or/include.am index abf62c2e8,7548ed094..4938ae8e7 --- a/src/or/include.am +++ b/src/or/include.am @@@ -156,7 -144,9 +156,8 @@@ endi ORHEADERS = \ src/or/addressmap.h \ + src/or/auth_dirs.inc \ src/or/bridges.h \ - src/or/buffers.h \ src/or/channel.h \ src/or/channelpadding.h \ src/or/channeltls.h \

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 10 Apr '18

10 Apr '18

commit ef16a11b90a107c6bc5178af1cbd083f80b39842 Merge: 395fa0258 0b1a054d6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 10 14:26:32 2018 -0400 Merge branch 'maint-0.3.3' changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33 +++++++++++++++++++++++++++++++++ src/or/config.c | 34 +--------------------------------- src/or/include.am | 1 + 4 files changed, 38 insertions(+), 33 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 10 Apr '18

10 Apr '18

commit d3ac47b4153fbe51ca63882ce63165abdf50901b Merge: 124e06e85 db6902c23 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 10 14:26:32 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24854 | 3 +++ src/or/auth_dirs.inc | 33 +++++++++++++++++++++++++++++++++ src/or/config.c | 34 +--------------------------------- src/or/include.am | 1 + 4 files changed, 38 insertions(+), 33 deletions(-) diff --cc src/or/include.am index abf62c2e8,7548ed094..4938ae8e7 --- a/src/or/include.am +++ b/src/or/include.am @@@ -156,7 -144,9 +156,8 @@@ endi ORHEADERS = \ src/or/addressmap.h \ + src/or/auth_dirs.inc \ src/or/bridges.h \ - src/or/buffers.h \ src/or/channel.h \ src/or/channelpadding.h \ src/or/channeltls.h \

1 0