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

[translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
by translation＠torproject.org 19 Jan '21

19 Jan '21

commit 62ee736ee27f219091169fff524b56f1e8a91084 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 19 18:45:54 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- uk/messages.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/uk/messages.json b/uk/messages.json index fde347d67d..c2716a68d4 100644 --- a/uk/messages.json +++ b/uk/messages.json @@ -42,7 +42,7 @@ "message": "вікі документація" }, "browser": { - "message": "Браузер" + "message": "Вебоглядач" }, "censoredUsers": { "message": "Якщо ваш інтернет під цензурою, тоді вам потрібно завантажити <a href=\"https://www.torproject.org/download/\">Tor Browser</a>." @@ -66,16 +66,16 @@ "message": "Якщо у вас виникли проблеми з використанням Snowflake як клієнта або проксі, будь ласка, прозвітуйте про помилку. Є два способи повідомлення про помилку:" }, "sharedAccount": { - "message": "Edit the <a href=\"https://pad.riseup.net/p/tor-anti-censorship-bugs-keep\">public bug-reporting pad</a> of the anti-censorship team." + "message": "Відредагувати <a href=\"https://pad.riseup.net/p/tor-anti-censorship-bugs-keep\">публічний записник звітів про помилки</a>, який належить антицензурній команді." }, "bugTracker": { "message": "<a href=\"https://gitlab.torproject.org/\">Створити обліковий запис</a> на GitLab проєкту Tor, потім <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">відкрити нову гілку</a> про проблему в розділі issue проєкту Snowflake." }, "descriptive": { - "message": "Please try to be as descriptive as possible with your ticket and if possible include log messages that will help us reproduce the bug." + "message": "Прохання описувати якомога точніше і по можливості вкажіть повідомлення лоґів, це допоможе нам точніше відтворити помилку." }, "embed": { - "message": "Embed" + "message": "Вставити" }, "possible": { "message": "Відтепер є можливість вбудувати значок Snowflake у будь-який веб-сайт:"

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit 7185860ef583beac1a85c46d1378c53dbaca1a57 Merge: ede9554b5f 27ee12836d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 13:20:43 2021 -0500 Merge branch 'maint-0.4.5' into release-0.4.5 changes/ticket40243 | 4 ++++ src/feature/dirauth/dirvote.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/261' into maint-0.4.5
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit 27ee12836d67a0cfa123a2f2fad378c93848519a Merge: e3a5482681 691c717187 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 13:20:31 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/261' into maint-0.4.5 changes/ticket40243 | 4 ++++ src/feature/dirauth/dirvote.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.5] Revert "IPv6 sybil: consider addresses in the same /64 to be equal."
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit 691c7171878371f98c4b0a32992f7d9ed9b1ac74 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Jan 15 12:54:07 2021 -0500 Revert "IPv6 sybil: consider addresses in the same /64 to be equal." This reverts commit d07f17f67685d75fec8a851b3ae3d157c1e31aa3. We don't want to consider an entire routable IPv6 network as sybil if more than 2 relays happen to be on it. For path selection it is very important but not for selecting relays in the consensus. Fixes #40243 --- changes/ticket40243 | 4 ++++ src/feature/dirauth/dirvote.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/ticket40243 b/changes/ticket40243 new file mode 100644 index 0000000000..548ec95ab4 --- /dev/null +++ b/changes/ticket40243 @@ -0,0 +1,4 @@ + o Major bugfixes (authority, IPv6): + - Do not consider multiple relays in the same IPv6 network to be sybils. + Sybils are selected based on the /128 now, not the /64. Fixes bug 40243; + bugfix on 0.4.5.1-alpha. diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index a1f9bb28ae..6824af815f 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -4219,8 +4219,7 @@ compare_routerinfo_addrs_by_family(const routerinfo_t *a, { const tor_addr_t *addr1 = (family==AF_INET) ? &a->ipv4_addr : &a->ipv6_addr; const tor_addr_t *addr2 = (family==AF_INET) ? &b->ipv4_addr : &b->ipv6_addr; - const int maskbits = (family==AF_INET) ? 32 : 64; - return tor_addr_compare_masked(addr1, addr2, maskbits, CMP_EXACT); + return tor_addr_compare(addr1, addr2, CMP_EXACT); } /** Helper for sorting: compares two ipv4 routerinfos first by ipv4 address,

1 0

[tor/master] Revert "IPv6 sybil: consider addresses in the same /64 to be equal."
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit 691c7171878371f98c4b0a32992f7d9ed9b1ac74 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Jan 15 12:54:07 2021 -0500 Revert "IPv6 sybil: consider addresses in the same /64 to be equal." This reverts commit d07f17f67685d75fec8a851b3ae3d157c1e31aa3. We don't want to consider an entire routable IPv6 network as sybil if more than 2 relays happen to be on it. For path selection it is very important but not for selecting relays in the consensus. Fixes #40243 --- changes/ticket40243 | 4 ++++ src/feature/dirauth/dirvote.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/ticket40243 b/changes/ticket40243 new file mode 100644 index 0000000000..548ec95ab4 --- /dev/null +++ b/changes/ticket40243 @@ -0,0 +1,4 @@ + o Major bugfixes (authority, IPv6): + - Do not consider multiple relays in the same IPv6 network to be sybils. + Sybils are selected based on the /128 now, not the /64. Fixes bug 40243; + bugfix on 0.4.5.1-alpha. diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index a1f9bb28ae..6824af815f 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -4219,8 +4219,7 @@ compare_routerinfo_addrs_by_family(const routerinfo_t *a, { const tor_addr_t *addr1 = (family==AF_INET) ? &a->ipv4_addr : &a->ipv6_addr; const tor_addr_t *addr2 = (family==AF_INET) ? &b->ipv4_addr : &b->ipv6_addr; - const int maskbits = (family==AF_INET) ? 32 : 64; - return tor_addr_compare_masked(addr1, addr2, maskbits, CMP_EXACT); + return tor_addr_compare(addr1, addr2, CMP_EXACT); } /** Helper for sorting: compares two ipv4 routerinfos first by ipv4 address,

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/261' into maint-0.4.5
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit 27ee12836d67a0cfa123a2f2fad378c93848519a Merge: e3a5482681 691c717187 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 13:20:31 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/261' into maint-0.4.5 changes/ticket40243 | 4 ++++ src/feature/dirauth/dirvote.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.5'
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit b0af4ddc7c2fe80a79e41e31b7050d949561e044 Merge: deb445e94b 27ee12836d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 13:20:43 2021 -0500 Merge branch 'maint-0.4.5' changes/ticket40243 | 4 ++++ src/feature/dirauth/dirvote.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/261' into maint-0.4.5
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit 27ee12836d67a0cfa123a2f2fad378c93848519a Merge: e3a5482681 691c717187 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 13:20:31 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/261' into maint-0.4.5 changes/ticket40243 | 4 ++++ src/feature/dirauth/dirvote.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.5] Revert "IPv6 sybil: consider addresses in the same /64 to be equal."
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit 691c7171878371f98c4b0a32992f7d9ed9b1ac74 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Jan 15 12:54:07 2021 -0500 Revert "IPv6 sybil: consider addresses in the same /64 to be equal." This reverts commit d07f17f67685d75fec8a851b3ae3d157c1e31aa3. We don't want to consider an entire routable IPv6 network as sybil if more than 2 relays happen to be on it. For path selection it is very important but not for selecting relays in the consensus. Fixes #40243 --- changes/ticket40243 | 4 ++++ src/feature/dirauth/dirvote.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/ticket40243 b/changes/ticket40243 new file mode 100644 index 0000000000..548ec95ab4 --- /dev/null +++ b/changes/ticket40243 @@ -0,0 +1,4 @@ + o Major bugfixes (authority, IPv6): + - Do not consider multiple relays in the same IPv6 network to be sybils. + Sybils are selected based on the /128 now, not the /64. Fixes bug 40243; + bugfix on 0.4.5.1-alpha. diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index a1f9bb28ae..6824af815f 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -4219,8 +4219,7 @@ compare_routerinfo_addrs_by_family(const routerinfo_t *a, { const tor_addr_t *addr1 = (family==AF_INET) ? &a->ipv4_addr : &a->ipv6_addr; const tor_addr_t *addr2 = (family==AF_INET) ? &b->ipv4_addr : &b->ipv6_addr; - const int maskbits = (family==AF_INET) ? 32 : 64; - return tor_addr_compare_masked(addr1, addr2, maskbits, CMP_EXACT); + return tor_addr_compare(addr1, addr2, CMP_EXACT); } /** Helper for sorting: compares two ipv4 routerinfos first by ipv4 address,

1 0

[translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
by translation＠torproject.org 19 Jan '21

19 Jan '21

commit 62541d86e4d06ad94837b83cf158b571b8ce727d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 19 18:15:53 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- uk/messages.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/uk/messages.json b/uk/messages.json index e5615f5b77..fde347d67d 100644 --- a/uk/messages.json +++ b/uk/messages.json @@ -36,7 +36,7 @@ "message": "Куки не увімкнено." }, "websiteIntro": { - "message": "Snowflake is a system to defeat internet censorship. People who are censored can use Snowflake to access the internet. Their connection goes through Snowflake proxies, which are run by volunteers. For more detailed information about how Snowflake works see our <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\" data-msgid=\"__MSG_docWiki__\">documentation wiki</a>." + "message": "Snowflake - це система проти інтернет-цензури. Цензуровані люди можуть використовувати Snowflake для доступу до інтернету. Їхнє з'єднання проходить через проксі-сервери Snowflake, які були надані волонтерами. Детальніше про те, як працює Snowflake дивіться <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\" data-msgid=\"__MSG_docWiki__\">вікі документацію</a>." }, "docWiki": { "message": "вікі документація" @@ -45,13 +45,13 @@ "message": "Браузер" }, "censoredUsers": { - "message": "If your internet access is censored, you should download <a href=\"https://www.torproject.org/download/\">Tor Browser</a>." + "message": "Якщо ваш інтернет під цензурою, тоді вам потрібно завантажити <a href=\"https://www.torproject.org/download/\">Tor Browser</a>." }, "extension": { "message": "Розширення" }, "installExtension": { - "message": "If your internet access is <strong>not</strong> censored, you should consider installing the Snowflake extension to help users in censored networks. There is no need to worry about which websites people are accessing through your proxy. Their visible browsing IP address will match their Tor exit node, not yours." + "message": "Якщо ваш інтернет <strong>не</strong> піддається цензурі, тоді ви можете встановити розширення Snowflake, щоб допомогти користувачам у цензурованих мережах. Не хвилюйтеся про сайти, які люди відвідуватимуть через ваш проксі. Їхня видима IP-адреса відповідатиме їхньому вихідному вузлу Tor, не вашому." }, "installFirefox": { "message": "Встановити у Firefox" @@ -63,13 +63,13 @@ "message": "Повідомлення про помилки" }, "fileBug": { - "message": "If you encounter problems with Snowflake as a client or a proxy, please consider filing a bug report. There are two ways to file a bug report:" + "message": "Якщо у вас виникли проблеми з використанням Snowflake як клієнта або проксі, будь ласка, прозвітуйте про помилку. Є два способи повідомлення про помилку:" }, "sharedAccount": { "message": "Edit the <a href=\"https://pad.riseup.net/p/tor-anti-censorship-bugs-keep\">public bug-reporting pad</a> of the anti-censorship team." }, "bugTracker": { - "message": "<a href=\"https://gitlab.torproject.org/\">Request an account</a> at the Tor Project GitLab, then <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">open a new issue</a> in the Snowflake project." + "message": "<a href=\"https://gitlab.torproject.org/\">Створити обліковий запис</a> на GitLab проєкту Tor, потім <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">відкрити нову гілку</a> про проблему в розділі issue проєкту Snowflake." }, "descriptive": { "message": "Please try to be as descriptive as possible with your ticket and if possible include log messages that will help us reproduce the bug."

1 0