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

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 09 Nov '16

09 Nov '16

commit ac56ce48f1c4cc13eac1799d39259c5e82ebbb76 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 9 04:47:02 2016 +0000 Update translations for torbutton-abouttorproperties_completed --- tr/abouttor.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tr/abouttor.properties b/tr/abouttor.properties index 686b883..322cc2e 100644 --- a/tr/abouttor.properties +++ b/tr/abouttor.properties @@ -19,3 +19,10 @@ aboutTor.searchDC.privacy=<a href="%2$S">Disconnect.me</a> kullanarak <a href="% aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ + +aboutTor.donationBanner.donate=Bağış Yapın +aboutTor.donationBanner.heart=Tor İnternet özgürlüğünün kalbinde yer alır +aboutTor.donationBanner.tagline1=Milyonlarda İnsan Çevrimiçi Güvenlik ve Gizlilik Sağlamak için Tor Kullanıyor +aboutTor.donationBanner.tagline2=İnsanları İnsanlardan Koruyan Bir Ağ +aboutTor.donationBanner.tagline3=İzleme = Baskı +aboutTor.donationBanner.tagline4=2006 Yılından Beri Gazeteci, Aktivist ve Yolsuzluk Açıklayanları Koruyor

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 09 Nov '16

09 Nov '16

commit dff132b733ced0a711f734d3a8fdb0368ab58ce0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 9 04:46:58 2016 +0000 Update translations for torbutton-abouttorproperties --- tr/abouttor.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tr/abouttor.properties b/tr/abouttor.properties index ae0dfec..322cc2e 100644 --- a/tr/abouttor.properties +++ b/tr/abouttor.properties @@ -20,9 +20,9 @@ aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ -aboutTor.donationBanner.donate=Donate Now! -aboutTor.donationBanner.heart=Tor is at the heart of Internet freedom -aboutTor.donationBanner.tagline1=Millions of People Depend on Tor for Online Security & Privacy -aboutTor.donationBanner.tagline2=A Network of People Protecting People -aboutTor.donationBanner.tagline3=Surveillance = Oppression -aboutTor.donationBanner.tagline4=Protecting Journalists, Activists & Whistleblowers Since 2006 +aboutTor.donationBanner.donate=Bağış Yapın +aboutTor.donationBanner.heart=Tor İnternet özgürlüğünün kalbinde yer alır +aboutTor.donationBanner.tagline1=Milyonlarda İnsan Çevrimiçi Güvenlik ve Gizlilik Sağlamak için Tor Kullanıyor +aboutTor.donationBanner.tagline2=İnsanları İnsanlardan Koruyan Bir Ağ +aboutTor.donationBanner.tagline3=İzleme = Baskı +aboutTor.donationBanner.tagline4=2006 Yılından Beri Gazeteci, Aktivist ve Yolsuzluk Açıklayanları Koruyor

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 09 Nov '16

09 Nov '16

commit 60bdd2a8c3f5415dacf02b725f92bb240d85eb76 Merge: 0f9e6c7 e4ef9f7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 8 19:25:39 2016 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug20085 | 4 ++++ src/config/torrc.minimal.in-staging | 2 +- src/config/torrc.sample.in | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/master] In torrc.sample.in, note that bandwidth must be >=75 KB.
by nickm＠torproject.org 09 Nov '16

09 Nov '16

commit e4ef9f7491ed1495869692b57644885f9772bef5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 8 19:23:49 2016 -0500 In torrc.sample.in, note that bandwidth must be >=75 KB. Queue a corresponding change for torrc.minimal.in. Closes ticket 20085. --- changes/bug20085 | 4 ++++ src/config/torrc.minimal.in-staging | 2 +- src/config/torrc.sample.in | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug20085 b/changes/bug20085 new file mode 100644 index 0000000..fd10e7e --- /dev/null +++ b/changes/bug20085 @@ -0,0 +1,4 @@ + o Documentation: + - Correct the minimum bandwidth value in torrc.sample, and queue a + corresponding change for torrc.minimal. Closes ticket 20085. + diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging index 5fa37c1..c537c51 100644 --- a/src/config/torrc.minimal.in-staging +++ b/src/config/torrc.minimal.in-staging @@ -105,7 +105,7 @@ ## Define these to limit how much relayed traffic you will allow. Your ## own traffic is still unthrottled. Note that RelayBandwidthRate must -## be at least 20 kilobytes per second. +## be at least 75 kilobytes per second. ## Note that units for these config options are bytes (per second), not ## bits (per second), and that prefixes are binary prefixes, i.e. 2^10, ## 2^20, etc. diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index d4dfd5f..5328206 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -104,7 +104,7 @@ ## Define these to limit how much relayed traffic you will allow. Your ## own traffic is still unthrottled. Note that RelayBandwidthRate must -## be at least 20 kilobytes per second. +## be at least 75 kilobytes per second. ## Note that units for these config options are bytes (per second), not ## bits (per second), and that prefixes are binary prefixes, i.e. 2^10, ## 2^20, etc.

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 09 Nov '16

09 Nov '16

commit d564187deedb9b8541ab8c83e6c4375ddda66149 Merge: c58592e e4ef9f7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 8 19:25:44 2016 -0500 Merge branch 'maint-0.2.9' changes/bug20085 | 4 ++++ src/config/torrc.minimal.in-staging | 2 +- src/config/torrc.sample.in | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.9] In torrc.sample.in, note that bandwidth must be >=75 KB.
by nickm＠torproject.org 09 Nov '16

09 Nov '16

commit e4ef9f7491ed1495869692b57644885f9772bef5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 8 19:23:49 2016 -0500 In torrc.sample.in, note that bandwidth must be >=75 KB. Queue a corresponding change for torrc.minimal.in. Closes ticket 20085. --- changes/bug20085 | 4 ++++ src/config/torrc.minimal.in-staging | 2 +- src/config/torrc.sample.in | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug20085 b/changes/bug20085 new file mode 100644 index 0000000..fd10e7e --- /dev/null +++ b/changes/bug20085 @@ -0,0 +1,4 @@ + o Documentation: + - Correct the minimum bandwidth value in torrc.sample, and queue a + corresponding change for torrc.minimal. Closes ticket 20085. + diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging index 5fa37c1..c537c51 100644 --- a/src/config/torrc.minimal.in-staging +++ b/src/config/torrc.minimal.in-staging @@ -105,7 +105,7 @@ ## Define these to limit how much relayed traffic you will allow. Your ## own traffic is still unthrottled. Note that RelayBandwidthRate must -## be at least 20 kilobytes per second. +## be at least 75 kilobytes per second. ## Note that units for these config options are bytes (per second), not ## bits (per second), and that prefixes are binary prefixes, i.e. 2^10, ## 2^20, etc. diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index d4dfd5f..5328206 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -104,7 +104,7 @@ ## Define these to limit how much relayed traffic you will allow. Your ## own traffic is still unthrottled. Note that RelayBandwidthRate must -## be at least 20 kilobytes per second. +## be at least 75 kilobytes per second. ## Note that units for these config options are bytes (per second), not ## bits (per second), and that prefixes are binary prefixes, i.e. 2^10, ## 2^20, etc.

1 0

[tor/maint-0.2.9] In torrc.sample.in, note that bandwidth must be >=75 KB.
by nickm＠torproject.org 09 Nov '16

09 Nov '16

commit e4ef9f7491ed1495869692b57644885f9772bef5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 8 19:23:49 2016 -0500 In torrc.sample.in, note that bandwidth must be >=75 KB. Queue a corresponding change for torrc.minimal.in. Closes ticket 20085. --- changes/bug20085 | 4 ++++ src/config/torrc.minimal.in-staging | 2 +- src/config/torrc.sample.in | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug20085 b/changes/bug20085 new file mode 100644 index 0000000..fd10e7e --- /dev/null +++ b/changes/bug20085 @@ -0,0 +1,4 @@ + o Documentation: + - Correct the minimum bandwidth value in torrc.sample, and queue a + corresponding change for torrc.minimal. Closes ticket 20085. + diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging index 5fa37c1..c537c51 100644 --- a/src/config/torrc.minimal.in-staging +++ b/src/config/torrc.minimal.in-staging @@ -105,7 +105,7 @@ ## Define these to limit how much relayed traffic you will allow. Your ## own traffic is still unthrottled. Note that RelayBandwidthRate must -## be at least 20 kilobytes per second. +## be at least 75 kilobytes per second. ## Note that units for these config options are bytes (per second), not ## bits (per second), and that prefixes are binary prefixes, i.e. 2^10, ## 2^20, etc. diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index d4dfd5f..5328206 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -104,7 +104,7 @@ ## Define these to limit how much relayed traffic you will allow. Your ## own traffic is still unthrottled. Note that RelayBandwidthRate must -## be at least 20 kilobytes per second. +## be at least 75 kilobytes per second. ## Note that units for these config options are bytes (per second), not ## bits (per second), and that prefixes are binary prefixes, i.e. 2^10, ## 2^20, etc.

1 0

[webwml/master] Update BandwidthRate minimum in FAQ.
by nickm＠torproject.org 09 Nov '16

09 Nov '16

commit 5300884f74218b51c5a9ac1a7561d642b6d20dc2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 8 19:25:02 2016 -0500 Update BandwidthRate minimum in FAQ. --- docs/en/faq.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/faq.wml b/docs/en/faq.wml index 5f89bcc..4b03ad5 100644 --- a/docs/en/faq.wml +++ b/docs/en/faq.wml @@ -2192,7 +2192,7 @@ too. second). For example, you might want to choose "BandwidthRate 10 MBytes" for 10 megabytes per second (a fast connection), or "BandwidthRate 500 KBytes" for 500 kilobytes per second (a decent cable connection). - The minimum BandwidthRate setting is 20 kilobytes per second. + The minimum BandwidthRate setting is 75 kilobytes per second. </li> <li> BandwidthBurst is a pool of bytes used to fulfill requests during

1 0

[tor/maint-0.2.9] policy_is_reject_star():
by nickm＠torproject.org 08 Nov '16

08 Nov '16

commit d73c671d6d9a60d9318814b7f95ede320e5d58b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 31 15:05:56 2016 -0400 policy_is_reject_star(): ome policies are default-reject, some default-accept. But policy_is_reject_star() assumed they were all default_reject. Fix that! Also, document that policy_is_reject_star() treats a NULL policy as empty. This allows us to simplify the checks in parse_reachable_addresses() by quite a bit. Fxes bug 20306; bugfix on 0.2.8.2-alpha. --- changes/bug20306_029 | 4 ++++ src/or/policies.c | 37 +++++++++++++++++-------------------- src/or/policies.h | 3 ++- src/or/router.c | 4 ++-- src/or/routerparse.c | 2 +- src/test/test_policy.c | 18 ++++++++++-------- 6 files changed, 36 insertions(+), 32 deletions(-) diff --git a/changes/bug20306_029 b/changes/bug20306_029 new file mode 100644 index 0000000..ada2676 --- /dev/null +++ b/changes/bug20306_029 @@ -0,0 +1,4 @@ + o Minor bugfixes (fascistfirewall): + - Avoid spurious warnings when ReachableAddresses or FascistFirewall + is set. Fixes bug 20306; bugfix on 0.2.8.2-alpha. + diff --git a/src/or/policies.c b/src/or/policies.c index 44a46d2..227e168 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -274,28 +274,22 @@ parse_reachable_addresses(void) /* We ignore ReachableAddresses for relays */ if (!server_mode(options)) { - if ((reachable_or_addr_policy - && policy_is_reject_star(reachable_or_addr_policy, AF_UNSPEC)) - || (reachable_dir_addr_policy - && policy_is_reject_star(reachable_dir_addr_policy, AF_UNSPEC))) { + if (policy_is_reject_star(reachable_or_addr_policy, AF_UNSPEC, 0) + || policy_is_reject_star(reachable_dir_addr_policy, AF_UNSPEC,0)) { log_warn(LD_CONFIG, "Tor cannot connect to the Internet if " "ReachableAddresses, ReachableORAddresses, or " "ReachableDirAddresses reject all addresses. Please accept " "some addresses in these options."); } else if (options->ClientUseIPv4 == 1 - && ((reachable_or_addr_policy - && policy_is_reject_star(reachable_or_addr_policy, AF_INET)) - || (reachable_dir_addr_policy - && policy_is_reject_star(reachable_dir_addr_policy, AF_INET)))) { + && (policy_is_reject_star(reachable_or_addr_policy, AF_INET, 0) + || policy_is_reject_star(reachable_dir_addr_policy, AF_INET, 0))) { log_warn(LD_CONFIG, "You have set ClientUseIPv4 1, but " "ReachableAddresses, ReachableORAddresses, or " "ReachableDirAddresses reject all IPv4 addresses. " "Tor will not connect using IPv4."); } else if (fascist_firewall_use_ipv6(options) - && ((reachable_or_addr_policy - && policy_is_reject_star(reachable_or_addr_policy, AF_INET6)) - || (reachable_dir_addr_policy - && policy_is_reject_star(reachable_dir_addr_policy, AF_INET6)))) { + && (policy_is_reject_star(reachable_or_addr_policy, AF_INET6, 0) + || policy_is_reject_star(reachable_dir_addr_policy, AF_INET6, 0))) { log_warn(LD_CONFIG, "You have configured tor to use IPv6 " "(ClientUseIPv6 1 or UseBridges 1), but " "ReachableAddresses, ReachableORAddresses, or " @@ -1084,8 +1078,8 @@ validate_addr_policies(const or_options_t *options, char **msg) const int exitrelay_setting_is_auto = options->ExitRelay == -1; const int policy_accepts_something = - ! (policy_is_reject_star(addr_policy, AF_INET) && - policy_is_reject_star(addr_policy, AF_INET6)); + ! (policy_is_reject_star(addr_policy, AF_INET, 1) && + policy_is_reject_star(addr_policy, AF_INET6, 1)); if (server_mode(options) && ! warned_about_exitrelay && @@ -2156,13 +2150,16 @@ exit_policy_is_general_exit(smartlist_t *policy) } /** Return false if policy might permit access to some addr:port; - * otherwise if we are certain it rejects everything, return true. */ + * otherwise if we are certain it rejects everything, return true. If no + * part of policy matches, return default_reject. + * NULL policies are allowed, and treated as empty. */ int -policy_is_reject_star(const smartlist_t *policy, sa_family_t family) +policy_is_reject_star(const smartlist_t *policy, sa_family_t family, + int default_reject) { - if (!policy) /*XXXX disallow NULL policies? */ - return 1; - SMARTLIST_FOREACH_BEGIN(policy, addr_policy_t *, p) { + if (!policy) + return default_reject; + SMARTLIST_FOREACH_BEGIN(policy, const addr_policy_t *, p) { if (p->policy_type == ADDR_POLICY_ACCEPT && (tor_addr_family(&p->addr) == family || tor_addr_family(&p->addr) == AF_UNSPEC)) { @@ -2175,7 +2172,7 @@ policy_is_reject_star(const smartlist_t *policy, sa_family_t family) return 1; } } SMARTLIST_FOREACH_END(p); - return 1; + return default_reject; } /** Write a single address policy to the buf_len byte buffer at buf. Return diff --git a/src/or/policies.h b/src/or/policies.h index e134e68..20f58f2 100644 --- a/src/or/policies.h +++ b/src/or/policies.h @@ -100,7 +100,8 @@ void addr_policy_append_reject_addr_list(smartlist_t **dest, const smartlist_t *addrs); void policies_set_node_exitpolicy_to_reject_all(node_t *exitrouter); int exit_policy_is_general_exit(smartlist_t *policy); -int policy_is_reject_star(const smartlist_t *policy, sa_family_t family); +int policy_is_reject_star(const smartlist_t *policy, sa_family_t family, + int reject_by_default); char * policy_dump_to_string(const smartlist_t *policy_list, int include_ipv4, int include_ipv6); diff --git a/src/or/router.c b/src/or/router.c index 10498e8..b968072 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2158,8 +2158,8 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) &ri->exit_policy); } ri->policy_is_reject_star = - policy_is_reject_star(ri->exit_policy, AF_INET) && - policy_is_reject_star(ri->exit_policy, AF_INET6); + policy_is_reject_star(ri->exit_policy, AF_INET, 1) && + policy_is_reject_star(ri->exit_policy, AF_INET6, 1); if (options->IPv6Exit) { char *p_tmp = policy_summarize(ri->exit_policy, AF_INET6); diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 9348466..a78d1ee 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2206,7 +2206,7 @@ router_parse_entry_from_string(const char *s, const char *end, } } - if (policy_is_reject_star(router->exit_policy, AF_INET) && + if (policy_is_reject_star(router->exit_policy, AF_INET, 1) && (!router->ipv6_exit_policy || short_policy_is_reject_star(router->ipv6_exit_policy))) router->policy_is_reject_star = 1; diff --git a/src/test/test_policy.c b/src/test/test_policy.c index 0d4a3b1..22f473f 100644 --- a/src/test/test_policy.c +++ b/src/test/test_policy.c @@ -258,14 +258,16 @@ test_policies_general(void *arg) tt_assert(!cmp_addr_policies(policy2, policy2)); tt_assert(!cmp_addr_policies(NULL, NULL)); - tt_assert(!policy_is_reject_star(policy2, AF_INET)); - tt_assert(policy_is_reject_star(policy, AF_INET)); - tt_assert(policy_is_reject_star(policy10, AF_INET)); - tt_assert(!policy_is_reject_star(policy10, AF_INET6)); - tt_assert(policy_is_reject_star(policy11, AF_INET)); - tt_assert(policy_is_reject_star(policy11, AF_INET6)); - tt_assert(policy_is_reject_star(NULL, AF_INET)); - tt_assert(policy_is_reject_star(NULL, AF_INET6)); + tt_assert(!policy_is_reject_star(policy2, AF_INET, 1)); + tt_assert(policy_is_reject_star(policy, AF_INET, 1)); + tt_assert(policy_is_reject_star(policy10, AF_INET, 1)); + tt_assert(!policy_is_reject_star(policy10, AF_INET6, 1)); + tt_assert(policy_is_reject_star(policy11, AF_INET, 1)); + tt_assert(policy_is_reject_star(policy11, AF_INET6, 1)); + tt_assert(policy_is_reject_star(NULL, AF_INET, 1)); + tt_assert(policy_is_reject_star(NULL, AF_INET6, 1)); + tt_assert(!policy_is_reject_star(NULL, AF_INET, 0)); + tt_assert(!policy_is_reject_star(NULL, AF_INET6, 0)); addr_policy_list_free(policy); policy = NULL;

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 08 Nov '16

08 Nov '16

commit c58592e658d6e9d7a99ec61b3746a80e4e6debe0 Merge: 31f41fe 89ec191 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 8 18:51:19 2016 -0500 Merge branch 'maint-0.2.9' changes/bug20306_029 | 4 ++++ src/or/policies.c | 37 +++++++++++++++++-------------------- src/or/policies.h | 3 ++- src/or/router.c | 4 ++-- src/or/routerparse.c | 2 +- src/test/test_policy.c | 18 ++++++++++-------- 6 files changed, 36 insertions(+), 32 deletions(-)

1 0