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

[tor/master] 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 @@@ 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 type. * Each authority's bits are restricted to the bits shared with type.

1 0

[tor/maint-0.2.4] 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/changes/bug17906 @@ -0,0 +1,4 @@ + o Minor features (authorities): + - Update the V3 identity key for dannenberg, it was changed on + 18 November 2015. + Closes task #17906. Patch by "teor". diff --git a/src/or/config.c b/src/or/config.c index fde88ad..1610cad 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -800,7 +800,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", "dannenberg orport=443 no-v2 " - "v3ident=585769C78764D58426B8B52B6651A5A71137189A " + "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",

1 0

[tor/maint-0.2.5] 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/changes/bug17906 @@ -0,0 +1,4 @@ + o Minor features (authorities): + - Update the V3 identity key for dannenberg, it was changed on + 18 November 2015. + Closes task #17906. Patch by "teor". diff --git a/src/or/config.c b/src/or/config.c index fde88ad..1610cad 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -800,7 +800,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", "dannenberg orport=443 no-v2 " - "v3ident=585769C78764D58426B8B52B6651A5A71137189A " + "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",

1 0

[tor/maint-0.2.5] 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 @@@ add_default_trusted_dir_authorities(dir "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 no-v2 82.94.251.203:80 " + "Tonga orport=443 bridge 82.94.251.203:80 " "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", - "gabelmoo orport=443 no-v2 " + "gabelmoo orport=443 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", - "dannenberg orport=443 no-v2 " + "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 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " + "urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", - "maatuska orport=80 no-v2 " + "maatuska orport=80 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", - "Faravahar orport=443 no-v2 " + "Faravahar orport=443 " "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", - "longclaw orport=443 no-v2 " + "longclaw orport=443 " "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " "199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", NULL

1 0

[tor/maint-0.2.6] 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/changes/bug17906 @@ -0,0 +1,4 @@ + o Minor features (authorities): + - Update the V3 identity key for dannenberg, it was changed on + 18 November 2015. + Closes task #17906. Patch by "teor". diff --git a/src/or/config.c b/src/or/config.c index fde88ad..1610cad 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -800,7 +800,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", "dannenberg orport=443 no-v2 " - "v3ident=585769C78764D58426B8B52B6651A5A71137189A " + "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417",

1 0

[tor/master] Try to fix windows test build (#18012)
by nickm＠torproject.org 07 Jan '16

07 Jan '16

commit b5ce3329581b29c61e81f69a5768d7ec0d4e30bf Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 7 09:25:44 2016 -0800 Try to fix windows test build (#18012) --- src/test/test_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index bf789c5..fd711a2 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4676,7 +4676,7 @@ test_util_pwdb(void *arg) #ifdef _WIN32 #define UTIL_TEST_NO_WIN(n, f) { #n, NULL, TT_SKIP, NULL, NULL } #define UTIL_TEST_WIN_ONLY(n, f) UTIL_TEST(n, (f)) -#define UTIL_LEGACY_NO_WIN(n) UTIL_NO_WIN(n) +#define UTIL_LEGACY_NO_WIN(n) UTIL_TEST_NO_WIN(n) #else #define UTIL_TEST_NO_WIN(n, f) UTIL_TEST(n, (f)) #define UTIL_TEST_WIN_ONLY(n, f) { #n, NULL, TT_SKIP, NULL, NULL }

1 0

[tor/master] Add FallbackDir list to GETINFO config/defaults
by nickm＠torproject.org 07 Jan '16

07 Jan '16

commit 3bc45f2628b8f9f979835503b42f6ae103dbd703 Author: George Tankersley <george.tankersley(a)gmail.com> Date: Thu Dec 10 22:55:42 2015 -0800 Add FallbackDir list to GETINFO config/defaults --- changes/feature16774 | 3 +++ src/or/config.c | 45 +++++++++++++++++++++++++++++++++++++-------- src/test/test_config.c | 4 +++- 3 files changed, 43 insertions(+), 9 deletions(-) diff --git a/changes/feature16774 b/changes/feature16774 new file mode 100644 index 0000000..87ba488 --- /dev/null +++ b/changes/feature16774 @@ -0,0 +1,3 @@ + o Minor enhancement: + - Adds FallbackDir entries to 'GETINFO config/defaults'. Closes ticket + #16774 and 17817. Patch by George Tankersley. diff --git a/src/or/config.c b/src/or/config.c index a1f8e49..ff25a79 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -938,6 +938,14 @@ static const char *default_authorities[] = { NULL }; +/** List of fallback directory authorities. The list is generated by opt-in of + * relays that meet certain stability criteria. + */ +static const char *default_fallbacks[] = { +#include "fallback_dirs.inc" + NULL +}; + /** Add the default directory authorities directly into the trusted dir list, * but only add them insofar as they share bits with type. * Each authority's bits are restricted to the bits shared with type. @@ -960,14 +968,10 @@ MOCK_IMPL(void, add_default_fallback_dir_servers,(void)) { int i; - const char *fallback[] = { -#include "fallback_dirs.inc" - NULL - }; - for (i=0; fallback[i]; i++) { - if (parse_dir_fallback_line(fallback[i], 0)<0) { + for (i=0; default_fallbacks[i]; i++) { + if (parse_dir_fallback_line(default_fallbacks[i], 0)<0) { log_err(LD_BUG, "Couldn't parse internal FallbackDir line %s", - fallback[i]); + default_fallbacks[i]); } } } @@ -7390,7 +7394,7 @@ getinfo_helper_config(control_connection_t *conn, smartlist_free(sl); } else if (!strcmp(question, "config/defaults")) { smartlist_t *sl = smartlist_new(); - int i, dirauth_lines_seen = 0; + int i, dirauth_lines_seen = 0, fallback_lines_seen = 0; for (i = 0; option_vars_[i].name; ++i) { const config_var_t *var = &option_vars_[i]; if (var->initvalue != NULL) { @@ -7401,6 +7405,13 @@ getinfo_helper_config(control_connection_t *conn, */ ++dirauth_lines_seen; } + if (strcmp(option_vars_[i].name, "FallbackDir") == 0) { + /* + * Similarly count fallback lines, so that we can decided later + * to add the defaults manually. + */ + ++fallback_lines_seen; + } char *val = esc_for_log(var->initvalue); smartlist_add_asprintf(sl, "%s %s\n",var->name,val); tor_free(val); @@ -7426,6 +7437,24 @@ getinfo_helper_config(control_connection_t *conn, } } + if (fallback_lines_seen == 0 && + get_options()->UseDefaultFallbackDirs == 1) { + /* + * We didn't see any explicitly configured fallback mirrors, + * so add the defaults to the list manually. + * + * default_fallbacks is included earlier in this file and + * is a const char ** NULL-terminated array of fallback config lines. + */ + const char **i; + + for (i = default_fallbacks; *i != NULL; ++i) { + char *val = esc_for_log(*i); + smartlist_add_asprintf(sl, "FallbackDir %s\n", val); + tor_free(val); + } + } + *answer = smartlist_join_strings(sl, "", 0, NULL); SMARTLIST_FOREACH(sl, char *, c, tor_free(c)); smartlist_free(sl); diff --git a/src/test/test_config.c b/src/test/test_config.c index 1b9e84d..097fe15 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -3421,9 +3421,11 @@ test_config_default_dir_servers(void *arg) int trusted_count = 0; int fallback_count = 0; + /* new set of options should stop fallback parsing */ opts = tor_malloc_zero(sizeof(or_options_t)); opts->UseDefaultFallbackDirs = 0; - consider_adding_dir_servers(opts, opts); + /* set old_options to NULL to force dir update */ + consider_adding_dir_servers(opts, NULL); trusted_count = smartlist_len(router_get_trusted_dir_servers()); fallback_count = smartlist_len(router_get_fallback_dir_servers()); or_options_free(opts);

1 0

[tor/master] Merge remote-tracking branch 'gtank/feature16774-squashed'
by nickm＠torproject.org 07 Jan '16

07 Jan '16

commit 5ba7b1a74d3cfc85db898dd1af748bf4234fc9a7 Merge: 37b0d27 3bc45f2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 7 09:20:03 2016 -0800 Merge remote-tracking branch 'gtank/feature16774-squashed' changes/feature16774 | 3 +++ src/or/config.c | 45 +++++++++++++++++++++++++++++++++++++-------- src/test/test_config.c | 4 +++- 3 files changed, 43 insertions(+), 9 deletions(-)

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 ae223138fbdd28ef452191c3a489e25e9a9b22c7 Merge: c3d11b1 1496056 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 7 09:13:54 2016 -0800 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-january2016 | 4 + src/config/geoip | 1734 +++++++++++++++++++++++++++++++++++---------- src/config/geoip6 | 881 +++++++++++++++++------ 3 files changed, 2016 insertions(+), 603 deletions(-)

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 400df18688e3b657852a9007151aaf26febe29a6 Merge: 1adc2bf ae22313 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 7 09:14:05 2016 -0800 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-january2016 | 4 + src/config/geoip | 1734 +++++++++++++++++++++++++++++++++++---------- src/config/geoip6 | 881 +++++++++++++++++------ 3 files changed, 2016 insertions(+), 603 deletions(-)

1 0