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

[tor/maint-0.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 07 Jan '16

07 Jan '16

commit 9ca329581af71c9aa6890b63c29c6a51ac37e408 Merge: ae22313 11f63d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 7 09:40:23 2016 -0800 Merge branch 'maint-0.2.4' into maint-0.2.5 Conflicts: src/or/config.c changes/bug17906 | 4 ++++ src/or/config.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc src/or/config.c index 2a7237d,1610cad..60d3d7f --- a/src/or/config.c +++ b/src/or/config.c @@@ -856,23 -794,23 +856,23 @@@ … [View More]

1 0

[tor/maint-0.2.6] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 07 Jan '16

07 Jan '16

commit c7b0cd9c2f52ca289515833060ac0b8461da2225 Merge: 400df18 9ca3295 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 7 09:41:36 2016 -0800 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug17906 | 4 ++++ src/or/config.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc src/or/config.c index fca350c,60d3d7f..7444af6 --- a/src/or/config.c +++ b/src/or/config.c @@@ -865,10 -862,9 +865,10 @@@ add_default_trusted_dir_authorities(dir … [View More]

1 0

[tor/maint-0.2.7] Update dannenberg's V3 authority identity fingerprint
by nickm＠torproject.org 07 Jan '16

07 Jan '16

commit 11f63d26acb8ca872d894fb1423b380dc1f8dc2e Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Mon Dec 21 10:40:10 2015 +1100 Update dannenberg's V3 authority identity fingerprint This new identity key was changed on 18 November 2015. --- changes/bug17906 | 4 ++++ src/or/config.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug17906 b/changes/bug17906 new file mode 100644 index 0000000..fff76d1 --- /dev/null +++ b/… [View More]

1 0

[tor/maint-0.2.7] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 07 Jan '16

07 Jan '16

commit 9ca329581af71c9aa6890b63c29c6a51ac37e408 Merge: ae22313 11f63d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 7 09:40:23 2016 -0800 Merge branch 'maint-0.2.4' into maint-0.2.5 Conflicts: src/or/config.c changes/bug17906 | 4 ++++ src/or/config.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc src/or/config.c index 2a7237d,1610cad..60d3d7f --- a/src/or/config.c +++ b/src/or/config.c @@@ -856,23 -794,23 +856,23 @@@ … [View More]

1 0

[tor/maint-0.2.7] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 07 Jan '16

07 Jan '16

commit c7b0cd9c2f52ca289515833060ac0b8461da2225 Merge: 400df18 9ca3295 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 7 09:41:36 2016 -0800 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug17906 | 4 ++++ src/or/config.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc src/or/config.c index fca350c,60d3d7f..7444af6 --- a/src/or/config.c +++ b/src/or/config.c @@@ -865,10 -862,9 +865,10 @@@ add_default_trusted_dir_authorities(dir … [View More]

1 0

[tor/master] Update dannenberg's V3 authority identity fingerprint
by nickm＠torproject.org 07 Jan '16

07 Jan '16

commit 11f63d26acb8ca872d894fb1423b380dc1f8dc2e Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Mon Dec 21 10:40:10 2015 +1100 Update dannenberg's V3 authority identity fingerprint This new identity key was changed on 18 November 2015. --- changes/bug17906 | 4 ++++ src/or/config.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug17906 b/changes/bug17906 new file mode 100644 index 0000000..fff76d1 --- /dev/null +++ b/… [View More]

1 0

[tor/maint-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 07 Jan '16

07 Jan '16

commit b34c5c6b8ac0d13d5e2bda188ff038f6ff7eb4f3 Merge: d9b11d0 c7b0cd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 7 09:43:12 2016 -0800 Merge branch 'maint-0.2.6' into maint-0.2.7 Conflicts: src/or/config.c changes/bug17906 | 4 ++++ src/or/config.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc src/or/config.c index fa860af,7444af6..3b35b5a --- a/src/or/config.c +++ b/src/or/config.c @@@ -857,41 -841,6 +857,41 @@@ … [View More]escaped_safe_str(const char *address return escaped(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 " + "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", + "Tonga orport=443 bridge " + "82.94.251.203:80 4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", + "gabelmoo orport=443 " + "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " + "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", + "dannenberg orport=443 " - "v3ident=585769C78764D58426B8B52B6651A5A71137189A " ++ "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " + "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", + "urras orport=80 " + "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " + "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", + "maatuska orport=80 " + "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " + "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.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", + NULL +}; + /** Add the default directory authorities directly into the trusted dir list, * but only add them insofar as they share bits with <b>type</b>. * Each authority's bits are restricted to the bits shared with <b>type</b>. [View Less]

1 0

[tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 07 Jan '16

07 Jan '16

commit 9ca329581af71c9aa6890b63c29c6a51ac37e408 Merge: ae22313 11f63d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 7 09:40:23 2016 -0800 Merge branch 'maint-0.2.4' into maint-0.2.5 Conflicts: src/or/config.c changes/bug17906 | 4 ++++ src/or/config.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc src/or/config.c index 2a7237d,1610cad..60d3d7f --- a/src/or/config.c +++ b/src/or/config.c @@@ -856,23 -794,23 +856,23 @@@ … [View More]

1 0

[tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 07 Jan '16

07 Jan '16

commit c7b0cd9c2f52ca289515833060ac0b8461da2225 Merge: 400df18 9ca3295 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 7 09:41:36 2016 -0800 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug17906 | 4 ++++ src/or/config.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc src/or/config.c index fca350c,60d3d7f..7444af6 --- a/src/or/config.c +++ b/src/or/config.c @@@ -865,10 -862,9 +865,10 @@@ add_default_trusted_dir_authorities(dir … [View More]

1 0

[tor/master] Merge branch 'maint-0.2.7'
by nickm＠torproject.org 07 Jan '16

07 Jan '16

commit 55232e32c73b114dbe8de643ff0f352e252457ac Merge: b5ce332 b34c5c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 7 09:43:24 2016 -0800 Merge branch 'maint-0.2.7' changes/bug17906 | 4 ++++ src/or/config.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc src/or/config.c index ff25a79,3b35b5a..c1db844 --- a/src/or/config.c +++ b/src/or/config.c @@@ -914,10 -873,9 +914,10 @@@ static const char *default_authorities[ "82.94.251.203:80 … [View More]

1 0