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

[onionoo/release] Bump version to 7.0-1.19.0-dev.
by karsten＠torproject.org 20 Nov '18

20 Nov '18

commit 2e278f68b35a665ae577a4395c9ab34f1ff50519 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 20 14:43:33 2018 +0100 Bump version to 7.0-1.19.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index c4522b6..65a3af1 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.19.0"/> + value="${onionoo.protocol.version}-1.19.0-dev"/> <property name="metricslibversion" value="2.4.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/release] Accept empty AS names.
by karsten＠torproject.org 20 Nov '18

20 Nov '18

commit e01e8ba9eb1f1a5f4f433c98bb3c4b78aeac3d15 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 20 16:51:10 2018 +0100 Accept empty AS names. Partially takes back b45c630. --- .../java/org/torproject/metrics/onionoo/updater/LookupService.java | 5 ----- .../org/torproject/metrics/onionoo/updater/LookupServiceTest.java | 5 +++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java b/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java index 3664186..947c78c 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java @@ -250,11 +250,6 @@ public class LookupService { } String asNumber = "AS" + String.valueOf(Integer.parseInt(parts[1])); String asName = parts[2]; - if (asName.isEmpty()) { - log.error("Illegal AS name in '{}' in {}.", line, - this.geoLite2AsnBlocksIpv4CsvFile.getAbsolutePath()); - return lookupResults; - } while (firstAddressNumber < startIpNum && firstAddressNumber != -1L) { sortedAddressNumbers.remove(firstAddressNumber); diff --git a/src/test/java/org/torproject/metrics/onionoo/updater/LookupServiceTest.java b/src/test/java/org/torproject/metrics/onionoo/updater/LookupServiceTest.java index f521dfc..515280e 100644 --- a/src/test/java/org/torproject/metrics/onionoo/updater/LookupServiceTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/updater/LookupServiceTest.java @@ -440,13 +440,14 @@ public class LookupServiceTest { } @Test() - public void testLookupGeoLite2AsnBlocksIpv4TooFewFieldsNoAsName() { + public void testLookupGeoLite2AsnBlocksIpv4AsNameEmpty() { List<String> geoLite2AsnBlocksIpv4Lines = new ArrayList<>(); geoLite2AsnBlocksIpv4Lines.add("network,autonomous_system_number," + "autonomous_system_organization"); geoLite2AsnBlocksIpv4Lines.add("8.8.8.0/24,15169,"); this.assertLookupResult(null, null, geoLite2AsnBlocksIpv4Lines, "8.8.8.8", - null, null, null, null, null, null, null, null); + "us", "United States", "California", "Mountain View", 37.3860f, + -122.0838f, "AS15169", ""); } @Test()

1 0

[onionoo/master] Accept empty AS names.
by karsten＠torproject.org 20 Nov '18

20 Nov '18

commit e01e8ba9eb1f1a5f4f433c98bb3c4b78aeac3d15 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 20 16:51:10 2018 +0100 Accept empty AS names. Partially takes back b45c630. --- .../java/org/torproject/metrics/onionoo/updater/LookupService.java | 5 ----- .../org/torproject/metrics/onionoo/updater/LookupServiceTest.java | 5 +++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java b/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java index 3664186..947c78c 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java @@ -250,11 +250,6 @@ public class LookupService { } String asNumber = "AS" + String.valueOf(Integer.parseInt(parts[1])); String asName = parts[2]; - if (asName.isEmpty()) { - log.error("Illegal AS name in '{}' in {}.", line, - this.geoLite2AsnBlocksIpv4CsvFile.getAbsolutePath()); - return lookupResults; - } while (firstAddressNumber < startIpNum && firstAddressNumber != -1L) { sortedAddressNumbers.remove(firstAddressNumber); diff --git a/src/test/java/org/torproject/metrics/onionoo/updater/LookupServiceTest.java b/src/test/java/org/torproject/metrics/onionoo/updater/LookupServiceTest.java index f521dfc..515280e 100644 --- a/src/test/java/org/torproject/metrics/onionoo/updater/LookupServiceTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/updater/LookupServiceTest.java @@ -440,13 +440,14 @@ public class LookupServiceTest { } @Test() - public void testLookupGeoLite2AsnBlocksIpv4TooFewFieldsNoAsName() { + public void testLookupGeoLite2AsnBlocksIpv4AsNameEmpty() { List<String> geoLite2AsnBlocksIpv4Lines = new ArrayList<>(); geoLite2AsnBlocksIpv4Lines.add("network,autonomous_system_number," + "autonomous_system_organization"); geoLite2AsnBlocksIpv4Lines.add("8.8.8.0/24,15169,"); this.assertLookupResult(null, null, geoLite2AsnBlocksIpv4Lines, "8.8.8.8", - null, null, null, null, null, null, null, null); + "us", "United States", "California", "Mountain View", 37.3860f, + -122.0838f, "AS15169", ""); } @Test()

1 0

[onionoo/master] Prepare for 7.0-1.19.1 release.
by karsten＠torproject.org 20 Nov '18

20 Nov '18

commit 7dc8daed5a5c21fe576ea6c859b20a7ae8d54159 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 20 16:59:16 2018 +0100 Prepare for 7.0-1.19.1 release. --- CHANGELOG.md | 6 ++++++ build.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 470d919..8d3fb72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# Changes in version 7.0-1.19.1 - 2018-11-20 + + * Minor changes + - Accept empty AS names in GeoLite2 ASN database files. + + # Changes in version 7.0-1.19.0 - 2018-11-15 * Medium changes diff --git a/build.xml b/build.xml index 65a3af1..d066bcb 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.19.0-dev"/> + value="${onionoo.protocol.version}-1.19.1"/> <property name="metricslibversion" value="2.4.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 20 Nov '18

20 Nov '18

commit 8bec2d59f4ad140d07793430c62277ce3b39186b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 20 14:19:16 2018 +0000 Update translations for support-portal_completed --- contents+fr.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 56b79601a..55e4450ff 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -40,12 +40,12 @@ msgstr "navigateur-tor" #: http//localhost/tormessenger/ #: (content/tormessenger/contents+en.lrtopic.title) msgid "Tor Messenger" -msgstr "Le messager Tor" +msgstr "Messager Tor" #: http//localhost/tormessenger/ #: (content/tormessenger/contents+en.lrtopic.seo_slug) msgid "tor-messenger" -msgstr "tor-messenger" +msgstr "messager-tor" #: http//localhost/tormobile/ (content/tormobile/contents+en.lrtopic.title) msgid "Tor Mobile" @@ -136,9 +136,9 @@ msgid "" "see that you're using Tor, but they won't know where you're going when you " "do." msgstr "" -"Certaines organisations, comme votre Fournisseur d’Accès à Internet (FAI), " -"peuvent voir que vous utilisez Tor, mais ils ne sont pas en mesure de " -"connaître votre destination quand c’est le cas." +"Certaines entités, comme votre fournisseur d’accès à Internet (FAI), " +"pourraient voir que vous utilisez Tor, mais elles ne pourraient pas " +"connaître les destinations de votre navigation." #: http//localhost/faq/faq-1/ #: (content/faq/faq-1/contents+en.lrquestion.seo_slug)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 20 Nov '18

20 Nov '18

commit a416e9dc2dea3ec149780aa21aaf93859168d394 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 20 14:19:10 2018 +0000 Update translations for support-portal --- contents+fr.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 56b79601a..55e4450ff 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -40,12 +40,12 @@ msgstr "navigateur-tor" #: http//localhost/tormessenger/ #: (content/tormessenger/contents+en.lrtopic.title) msgid "Tor Messenger" -msgstr "Le messager Tor" +msgstr "Messager Tor" #: http//localhost/tormessenger/ #: (content/tormessenger/contents+en.lrtopic.seo_slug) msgid "tor-messenger" -msgstr "tor-messenger" +msgstr "messager-tor" #: http//localhost/tormobile/ (content/tormobile/contents+en.lrtopic.title) msgid "Tor Mobile" @@ -136,9 +136,9 @@ msgid "" "see that you're using Tor, but they won't know where you're going when you " "do." msgstr "" -"Certaines organisations, comme votre Fournisseur d’Accès à Internet (FAI), " -"peuvent voir que vous utilisez Tor, mais ils ne sont pas en mesure de " -"connaître votre destination quand c’est le cas." +"Certaines entités, comme votre fournisseur d’accès à Internet (FAI), " +"pourraient voir que vous utilisez Tor, mais elles ne pourraient pas " +"connaître les destinations de votre navigation." #: http//localhost/faq/faq-1/ #: (content/faq/faq-1/contents+en.lrquestion.seo_slug)

1 0

[tor/master] Update control_free_all() for #27169
by nickm＠torproject.org 20 Nov '18

20 Nov '18

commit 0489288aa2ec62c84f612f80bb56883244af380d Author: Taylor Yu <catalyst(a)torproject.org> Date: Mon Nov 19 15:48:08 2018 -0600 Update control_free_all() for #27169 Reset the added bootstrap tracking state introduced by ticket 27169. Fixes bug 28524; bugfix on 0.3.5.1-alpha. --- changes/bug28524 | 4 ++++ src/feature/control/control.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/changes/bug28524 b/changes/bug28524 new file mode 100644 index 000000000..1cad70042 --- /dev/null +++ b/changes/bug28524 @@ -0,0 +1,4 @@ + o Minor bugfixes (restart-in-process, boostrap): + - Add missing resets of bootstrap tracking state when shutting + down (regression caused by ticket 27169). Fixes bug 28524; + bugfix on 0.3.5.1-alpha. diff --git a/src/feature/control/control.c b/src/feature/control/control.c index f0db97dc8..795902e6f 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -7880,8 +7880,12 @@ control_free_all(void) flush_queued_events_event = NULL; } bootstrap_percent = BOOTSTRAP_STATUS_UNDEF; + bootstrap_phase = BOOTSTRAP_STATUS_UNDEF; notice_bootstrap_percent = 0; bootstrap_problems = 0; + bootstrap_first_orconn = 0; + bootstrap_dir_progress = BOOTSTRAP_STATUS_UNDEF; + bootstrap_dir_phase = BOOTSTRAP_STATUS_UNDEF; authentication_cookie_is_set = 0; global_event_mask = 0; disable_log_messages = 0;

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 20 Nov '18

20 Nov '18

commit 34cadefe3455d2536d207e62caaade6a723a0ddb Merge: 8183640ad 0489288aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 20 09:04:35 2018 -0500 Merge branch 'maint-0.3.5' changes/bug28524 | 4 ++++ src/feature/control/control.c | 4 ++++ 2 files changed, 8 insertions(+)

1 0

[tor/release-0.3.5] Update control_free_all() for #27169
by nickm＠torproject.org 20 Nov '18

20 Nov '18

commit 0489288aa2ec62c84f612f80bb56883244af380d Author: Taylor Yu <catalyst(a)torproject.org> Date: Mon Nov 19 15:48:08 2018 -0600 Update control_free_all() for #27169 Reset the added bootstrap tracking state introduced by ticket 27169. Fixes bug 28524; bugfix on 0.3.5.1-alpha. --- changes/bug28524 | 4 ++++ src/feature/control/control.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/changes/bug28524 b/changes/bug28524 new file mode 100644 index 000000000..1cad70042 --- /dev/null +++ b/changes/bug28524 @@ -0,0 +1,4 @@ + o Minor bugfixes (restart-in-process, boostrap): + - Add missing resets of bootstrap tracking state when shutting + down (regression caused by ticket 27169). Fixes bug 28524; + bugfix on 0.3.5.1-alpha. diff --git a/src/feature/control/control.c b/src/feature/control/control.c index f0db97dc8..795902e6f 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -7880,8 +7880,12 @@ control_free_all(void) flush_queued_events_event = NULL; } bootstrap_percent = BOOTSTRAP_STATUS_UNDEF; + bootstrap_phase = BOOTSTRAP_STATUS_UNDEF; notice_bootstrap_percent = 0; bootstrap_problems = 0; + bootstrap_first_orconn = 0; + bootstrap_dir_progress = BOOTSTRAP_STATUS_UNDEF; + bootstrap_dir_phase = BOOTSTRAP_STATUS_UNDEF; authentication_cookie_is_set = 0; global_event_mask = 0; disable_log_messages = 0;

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 20 Nov '18

20 Nov '18

commit 49e243f88526ffe76530c1e7dfc37ae374db3239 Merge: 2d227dcfc 0489288aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 20 09:04:35 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug28524 | 4 ++++ src/feature/control/control.c | 4 ++++ 2 files changed, 8 insertions(+)

1 0