date:20161108

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2016-11-08 Thread translation

commit dff132b733ced0a711f734d3a8fdb0368ab58ce0
Author: Translation commit bot 
Date:   Wed Nov 9 04:46:58 2016 +

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

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed

2016-11-08 Thread translation

commit ac56ce48f1c4cc13eac1799d39259c5e82ebbb76
Author: Translation commit bot 
Date:   Wed Nov 9 04:47:02 2016 +

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=Disconnect.me 
kullanarak 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

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] In torrc.sample.in, note that bandwidth must be >=75 KB.

2016-11-08 Thread nickm

commit e4ef9f7491ed1495869692b57644885f9772bef5
Author: Nick Mathewson 
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 000..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.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

2016-11-08 Thread nickm

commit d564187deedb9b8541ab8c83e6c4375ddda66149
Merge: c58592e e4ef9f7
Author: Nick Mathewson 
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(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] In torrc.sample.in, note that bandwidth must be >=75 KB.

2016-11-08 Thread nickm

commit e4ef9f7491ed1495869692b57644885f9772bef5
Author: Nick Mathewson 
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 000..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.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] In torrc.sample.in, note that bandwidth must be >=75 KB.

2016-11-08 Thread nickm

commit e4ef9f7491ed1495869692b57644885f9772bef5
Author: Nick Mathewson 
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 000..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.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2016-11-08 Thread nickm

commit 60bdd2a8c3f5415dacf02b725f92bb240d85eb76
Merge: 0f9e6c7 e4ef9f7
Author: Nick Mathewson 
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(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Update BandwidthRate minimum in FAQ.

2016-11-08 Thread nickm

commit 5300884f74218b51c5a9ac1a7561d642b6d20dc2
Author: Nick Mathewson 
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.
 
 
 BandwidthBurst is a pool of bytes used to fulfill requests during

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug20306_029' into maint-0.2.9

2016-11-08 Thread nickm

commit 89ec191b6885d8e65f7cbdf1a56e2627c3aec75a
Merge: 286fa94 d73c671
Author: Nick Mathewson 
Date:   Tue Nov 8 18:51:07 2016 -0500

Merge remote-tracking branch 'public/bug20306_029' into 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(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2016-11-08 Thread nickm

commit 0f9e6c74ffc13eb1c5dd3a5cab4793ffc1681825
Merge: effeb36 89ec191
Author: Nick Mathewson 
Date:   Tue Nov 8 18:51:15 2016 -0500

Merge branch 'maint-0.2.9' into release-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(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] policy_is_reject_star():

2016-11-08 Thread nickm

commit d73c671d6d9a60d9318814b7f95ede320e5d58b2
Author: Nick Mathewson 
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 000..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) /* 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(>addr) == family ||
  tor_addr_family(>addr) == AF_UNSPEC)) {
@@ -2175,7 +2172,7 @@ policy_is_reject_star(const smartlist_t *policy, 
sa_family_t family)
   return 1;
 }
   }

[tor-commits] [tor/maint-0.2.9] policy_is_reject_star():

2016-11-08 Thread nickm

commit d73c671d6d9a60d9318814b7f95ede320e5d58b2
Author: Nick Mathewson 
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 000..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) /* 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(>addr) == family ||
  tor_addr_family(>addr) == AF_UNSPEC)) {
@@ -2175,7 +2172,7 @@ policy_is_reject_star(const smartlist_t *policy, 
sa_family_t family)
   return 1;
 }
   }

[tor-commits] [tor/release-0.2.9] Merge remote-tracking branch 'public/bug20306_029' into maint-0.2.9

2016-11-08 Thread nickm

commit 89ec191b6885d8e65f7cbdf1a56e2627c3aec75a
Merge: 286fa94 d73c671
Author: Nick Mathewson 
Date:   Tue Nov 8 18:51:07 2016 -0500

Merge remote-tracking branch 'public/bug20306_029' into 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(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] policy_is_reject_star():

2016-11-08 Thread nickm

commit d73c671d6d9a60d9318814b7f95ede320e5d58b2
Author: Nick Mathewson 
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 000..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) /* 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(>addr) == family ||
  tor_addr_family(>addr) == AF_UNSPEC)) {
@@ -2175,7 +2172,7 @@ policy_is_reject_star(const smartlist_t *policy, 
sa_family_t family)
   return 1;
 }
   }

[tor-commits] [tor/maint-0.2.9] Merge remote-tracking branch 'public/bug20306_029' into maint-0.2.9

2016-11-08 Thread nickm

commit 89ec191b6885d8e65f7cbdf1a56e2627c3aec75a
Merge: 286fa94 d73c671
Author: Nick Mathewson 
Date:   Tue Nov 8 18:51:07 2016 -0500

Merge remote-tracking branch 'public/bug20306_029' into 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(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

2016-11-08 Thread nickm

commit c58592e658d6e9d7a99ec61b3746a80e4e6debe0
Merge: 31f41fe 89ec191
Author: Nick Mathewson 
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(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2016-11-08 Thread nickm

commit effeb36968ff565ac70929b5ace12c4ef52f4590
Merge: e083a62 286fa94
Author: Nick Mathewson 
Date:   Tue Nov 8 18:45:05 2016 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug20560| 4 
 src/common/compat.c | 5 -
 2 files changed, 8 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Use va_copy() in pure-windows version of tor_asprintf().

2016-11-08 Thread nickm

commit 286fa94064dcc6d1b260bec77de052274e3c4403
Author: Nick Mathewson 
Date:   Tue Nov 8 18:44:06 2016 -0500

Use va_copy() in pure-windows version of tor_asprintf().

It's not okay to use the same varargs list twice, and apparently
some windows build environments produce code here that would leave
tor_asprintf() broken. Fix for bug 20560; bugfix on 0.2.2.11-alpha
when tor_asprintf() was introduced.
---
 changes/bug20560| 4 
 src/common/compat.c | 5 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/changes/bug20560 b/changes/bug20560
new file mode 100644
index 000..43d605b
--- /dev/null
+++ b/changes/bug20560
@@ -0,0 +1,4 @@
+  o Minor bugfixes (portability):
+- Run correctly when built on Windows build environments that require
+  _vcsprintf(). Fixes bug 20560; bugfix on 0.2.2.11-alpha.
+
diff --git a/src/common/compat.c b/src/common/compat.c
index 4f2f977..8d6a491 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -532,7 +532,10 @@ tor_vasprintf(char **strp, const char *fmt, va_list args)
   /* On Windows, _vsnprintf won't tell us the length of the string if it
* overflows, so we need to use _vcsprintf to tell how much to allocate */
   int len, r;
-  len = _vscprintf(fmt, args);
+  va_list tmp_args;
+  va_copy(tmp_args, args);
+  len = _vscprintf(fmt, tmp_args);
+  va_end(tmp_args);
   if (len < 0) {
 *strp = NULL;
 return -1;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Use va_copy() in pure-windows version of tor_asprintf().

2016-11-08 Thread nickm

commit 286fa94064dcc6d1b260bec77de052274e3c4403
Author: Nick Mathewson 
Date:   Tue Nov 8 18:44:06 2016 -0500

Use va_copy() in pure-windows version of tor_asprintf().

It's not okay to use the same varargs list twice, and apparently
some windows build environments produce code here that would leave
tor_asprintf() broken. Fix for bug 20560; bugfix on 0.2.2.11-alpha
when tor_asprintf() was introduced.
---
 changes/bug20560| 4 
 src/common/compat.c | 5 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/changes/bug20560 b/changes/bug20560
new file mode 100644
index 000..43d605b
--- /dev/null
+++ b/changes/bug20560
@@ -0,0 +1,4 @@
+  o Minor bugfixes (portability):
+- Run correctly when built on Windows build environments that require
+  _vcsprintf(). Fixes bug 20560; bugfix on 0.2.2.11-alpha.
+
diff --git a/src/common/compat.c b/src/common/compat.c
index 4f2f977..8d6a491 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -532,7 +532,10 @@ tor_vasprintf(char **strp, const char *fmt, va_list args)
   /* On Windows, _vsnprintf won't tell us the length of the string if it
* overflows, so we need to use _vcsprintf to tell how much to allocate */
   int len, r;
-  len = _vscprintf(fmt, args);
+  va_list tmp_args;
+  va_copy(tmp_args, args);
+  len = _vscprintf(fmt, tmp_args);
+  va_end(tmp_args);
   if (len < 0) {
 *strp = NULL;
 return -1;

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

2016-11-08 Thread nickm

commit 31f41fe09613398dc818ae30251724779f1f53c8
Merge: 053cf55 286fa94
Author: Nick Mathewson 
Date:   Tue Nov 8 18:45:10 2016 -0500

Merge branch 'maint-0.2.9'

 changes/bug20560| 4 
 src/common/compat.c | 5 -
 2 files changed, 8 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Use va_copy() in pure-windows version of tor_asprintf().

2016-11-08 Thread nickm

commit 286fa94064dcc6d1b260bec77de052274e3c4403
Author: Nick Mathewson 
Date:   Tue Nov 8 18:44:06 2016 -0500

Use va_copy() in pure-windows version of tor_asprintf().

It's not okay to use the same varargs list twice, and apparently
some windows build environments produce code here that would leave
tor_asprintf() broken. Fix for bug 20560; bugfix on 0.2.2.11-alpha
when tor_asprintf() was introduced.
---
 changes/bug20560| 4 
 src/common/compat.c | 5 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/changes/bug20560 b/changes/bug20560
new file mode 100644
index 000..43d605b
--- /dev/null
+++ b/changes/bug20560
@@ -0,0 +1,4 @@
+  o Minor bugfixes (portability):
+- Run correctly when built on Windows build environments that require
+  _vcsprintf(). Fixes bug 20560; bugfix on 0.2.2.11-alpha.
+
diff --git a/src/common/compat.c b/src/common/compat.c
index 4f2f977..8d6a491 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -532,7 +532,10 @@ tor_vasprintf(char **strp, const char *fmt, va_list args)
   /* On Windows, _vsnprintf won't tell us the length of the string if it
* overflows, so we need to use _vcsprintf to tell how much to allocate */
   int len, r;
-  len = _vscprintf(fmt, args);
+  va_list tmp_args;
+  va_copy(tmp_args, args);
+  len = _vscprintf(fmt, tmp_args);
+  va_end(tmp_args);
   if (len < 0) {
 *strp = NULL;
 return -1;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] Use proposal number, not RFC number.

2016-11-08 Thread nickm

commit 430731018b41b2d622a4dfd59c9603e4e1364e59
Author: Nick Mathewson 
Date:   Tue Nov 8 18:14:27 2016 -0500

Use proposal number, not RFC number.

(Spotted by Roger)
---
 proposals/264-subprotocol-versions.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proposals/264-subprotocol-versions.txt 
b/proposals/264-subprotocol-versions.txt
index 5990ef8..f183acc 100644
--- a/proposals/264-subprotocol-versions.txt
+++ b/proposals/264-subprotocol-versions.txt
@@ -185,7 +185,7 @@ Implemented-In: 0.2.9.4-alpha
 
The current version is "1".
 
-   "2" is unused, and reserved by proposal 5705.
+   "2" is unused, and reserved by proposal 244.
 
"3" is the ed25519 link handshake of proposal 220.
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2016-11-08 Thread translation

commit f20c96e9fb29f00e82e35df7dca0933110e0a72a
Author: Translation commit bot 
Date:   Tue Nov 8 22:17:02 2016 +

Update translations for torbutton-abouttorproperties
---
 pt_BR/abouttor.properties | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pt_BR/abouttor.properties b/pt_BR/abouttor.properties
index e6bdfc9..f1b2911 100644
--- a/pt_BR/abouttor.properties
+++ b/pt_BR/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=Doe Agora!
+aboutTor.donationBanner.heart=O Tor Ã© o coraÃ§Ã£o da liberdade na Internet
+aboutTor.donationBanner.tagline1=Milhares de pessoas dependem do Tor para 
SeguranÃ§a & Privacidade Online
+aboutTor.donationBanner.tagline2=Uma Rede de Pessoas Protegendo Pessoas
+aboutTor.donationBanner.tagline3=VigilÃ¢ncia = OpressÃ£o
+aboutTor.donationBanner.tagline4=Protegendo Jornalistas, Ativistas & 
Denunciantes Desde 2006

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed

2016-11-08 Thread translation

commit 8b9aa9e008eb6ae65770ea1f3acf0e4743210344
Author: Translation commit bot 
Date:   Tue Nov 8 22:17:05 2016 +

Update translations for torbutton-abouttorproperties_completed
---
 pt_BR/abouttor.properties | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/pt_BR/abouttor.properties b/pt_BR/abouttor.properties
index 4739a10..f1b2911 100644
--- a/pt_BR/abouttor.properties
+++ b/pt_BR/abouttor.properties
@@ -19,3 +19,10 @@ aboutTor.searchDC.privacy=Buscar com 
seguranÃ§a utilizando 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=Doe Agora!
+aboutTor.donationBanner.heart=O Tor Ã© o coraÃ§Ã£o da liberdade na Internet
+aboutTor.donationBanner.tagline1=Milhares de pessoas dependem do Tor para 
SeguranÃ§a & Privacidade Online
+aboutTor.donationBanner.tagline2=Uma Rede de Pessoas Protegendo Pessoas
+aboutTor.donationBanner.tagline3=VigilÃ¢ncia = OpressÃ£o
+aboutTor.donationBanner.tagline4=Protegendo Jornalistas, Ativistas & 
Denunciantes Desde 2006

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

2016-11-08 Thread translation

commit 761bc613f7b6f42e0b3c880ca27c9e336dcd0438
Author: Translation commit bot 
Date:   Tue Nov 8 22:16:33 2016 +

Update translations for torbutton-torbuttondtd
---
 sv/torbutton.dtd | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sv/torbutton.dtd b/sv/torbutton.dtd
index c6bd887..7452ae3 100644
--- a/sv/torbutton.dtd
+++ b/sv/torbutton.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -11,9 +11,9 @@
 
 
 
-
-
-
+
+
+
 
 
 
@@ -27,10 +27,10 @@
 
 
 
-
+
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed

2016-11-08 Thread translation

commit 380b59b42b92a8c97a1fc141a2f24467dc5e7325
Author: Translation commit bot 
Date:   Tue Nov 8 21:47:07 2016 +

Update translations for torbutton-abouttorproperties_completed
---
 sv/abouttor.properties | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/sv/abouttor.properties b/sv/abouttor.properties
index fafe44a..3b0ddcd 100644
--- a/sv/abouttor.properties
+++ b/sv/abouttor.properties
@@ -19,3 +19,10 @@ aboutTor.searchDC.privacy=SÃ¶k sÃ¤kert 
med Dis
 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=Donera nu!
+aboutTor.donationBanner.heart=Tor Ã¤r i centrum av internetfrihet
+aboutTor.donationBanner.tagline1=Miljoner av mÃ¤nniskor anvÃ¤nder Tor fÃ¶r 
onlinesÃ¤kerhet och integritet
+aboutTor.donationBanner.tagline2=Ett nÃ¤tverk av folk som skyddar folk
+aboutTor.donationBanner.tagline3=Ãvervakning = FÃ¶rtryck
+aboutTor.donationBanner.tagline4=Skyddar journalister, aktivister och 
visselblÃ¥sare sedan 2006

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2016-11-08 Thread translation

commit ed1b0d6e13d01d63421806e9982035f260f5092a
Author: Translation commit bot 
Date:   Tue Nov 8 21:47:04 2016 +

Update translations for torbutton-abouttorproperties
---
 sv/abouttor.properties | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sv/abouttor.properties b/sv/abouttor.properties
index 7720c38..3b0ddcd 100644
--- a/sv/abouttor.properties
+++ b/sv/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=Donera nu!
+aboutTor.donationBanner.heart=Tor Ã¤r i centrum av internetfrihet
+aboutTor.donationBanner.tagline1=Miljoner av mÃ¤nniskor anvÃ¤nder Tor fÃ¶r 
onlinesÃ¤kerhet och integritet
+aboutTor.donationBanner.tagline2=Ett nÃ¤tverk av folk som skyddar folk
+aboutTor.donationBanner.tagline3=Ãvervakning = FÃ¶rtryck
+aboutTor.donationBanner.tagline4=Skyddar journalister, aktivister och 
visselblÃ¥sare sedan 2006

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [onionoo/master] Don't write flags:[""] but flags:[].

2016-11-08 Thread karsten

commit 3aff99ae6e4bb978b169c0b8bad3fe8b91e06db8
Author: Karsten Loesing 
Date:   Sat Apr 25 11:23:43 2015 +0200

Don't write flags:[""] but flags:[].

Fixes #15798.
---
 src/main/java/org/torproject/onionoo/docs/NodeStatus.java | 10 ++
 src/main/resources/web/protocol.html  |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java 
b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
index 87cacb4..7d595e4 100644
--- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
+++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java
@@ -205,6 +205,16 @@ public class NodeStatus extends Document {
   public void setRelayFlags(SortedSet relayFlags) {
 BitSet newRelayFlags = new BitSet(relayFlagIndexes.size());
 for (String relayFlag : relayFlags) {
+  if (relayFlag.length() == 0) {
+/* Workaround to handle cases when nodes have no relay flags at
+ * all.  The problem is that we cannot distinguish an empty relay
+ * flags set from a set with a single flag being the empty string.
+ * But given that the empty string is not a valid flag, we can
+ * just skip flags being the empty string and return an empty
+ * set below.  Without this workaround, we'd return a set with one
+ * flag in it: "". */
+continue;
+  }
   if (!relayFlagIndexes.containsKey(relayFlag)) {
 relayFlagStrings.put(relayFlagIndexes.size(), relayFlag);
 relayFlagIndexes.put(relayFlag, relayFlagIndexes.size());
diff --git a/src/main/resources/web/protocol.html 
b/src/main/resources/web/protocol.html
index c6cc534..efb31e3 100644
--- a/src/main/resources/web/protocol.html
+++ b/src/main/resources/web/protocol.html
@@ -904,7 +904,7 @@ available about the hiberation status of the relay.
 
 Array of relay flags that the directory authorities
 assigned to this relay.
-Omitted if empty.
+May be omitted if empty.
 
 
 
@@ -1399,7 +1399,7 @@ as running in the last bridge network status.
 
 Array of relay flags that the bridge authority
 assigned to this bridge.
-Omitted if empty.
+May be omitted if empty.
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Update changelog after ec41e467

2016-11-08 Thread arlo

commit 2b0fb7a045b25f6fc3a01aa468841a9e6d5df063
Author: Arlo Breault 
Date:   Tue Nov 8 13:07:06 2016 -0800

Update changelog after ec41e467
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 3baea50..765e033 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ Tor Messenger 0.3.0b1 --
* Trac 20208: Put conversations on hold by default
* Trac 20231: Remove incomplete translations
* Trac 20276: Fix toggling sounds
+   * Trac 20608: Use Instantbird app version
* Bugzilla 1246431: Properly handle incoming xmpp server messages
* Bugzilla 1313137: Fix irc "msg is not defined" error
  * Mac

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Trac 20608: Use Instantbird app version

2016-11-08 Thread arlo

commit ec41e467065ab4c8d5b64e0b2b8f16fe5c1a2871
Author: Arlo Breault 
Date:   Tue Nov 8 11:40:12 2016 -0800

Trac 20608: Use Instantbird app version

 * Otherwise, extensions are considered incompatible.
---
 .../instantbird/0001-Set-Tor-Messenger-preferences.patch|  6 +++---
 .../0002-Trac-16489-Prevent-account-autologin.patch |  2 +-
 ...ac-17896-Support-Special-Characters-input-prompt-o.patch |  2 +-
 ...ac-17494-Better-error-reporting-for-failed-outgoin.patch |  2 +-
 .../instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch  |  2 +-
 ...g-1218193-Fix-tab-strip-background-colour-on-OS-X..patch |  2 +-
 ...g-1246431-XMPP-createConversation-should-handle-in.patch |  2 +-
 ...g-1298574-Set-_userVCard-own-property-when-downloa.patch |  2 +-
 projects/instantbird/0009-XMPP-in-band-registration.patch   |  2 +-
 projects/instantbird/0010-Remove-search-from-UI.patch   |  2 +-
 projects/instantbird/0011-Add-Tor-Messenger-branding.patch  | 13 +++--
 projects/instantbird/0012-Account-picture.patch |  2 +-
 projects/instantbird/0013-Modify-protocol-defaults.patch|  2 +-
 projects/instantbird/0014-Modify-IRC-defaults.patch |  2 +-
 projects/instantbird/0015-Modify-themes.patch   |  2 +-
 projects/instantbird/0016-Modify-XMPP-defaults.patch|  2 +-
 projects/instantbird/0017-Remove-logging-UI.patch   |  2 +-
 projects/instantbird/0018-Cert-override.patch   |  2 +-
 .../instantbird/0019-Display-all-traffic-over-Tor.patch |  2 +-
 projects/instantbird/0020-Trac-17480-Content-sink.patch |  2 +-
 .../instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch|  2 +-
 ...g-1313137-msg-is-not-defined-error-in-irc.js-chang.patch |  2 +-
 ...g-954368-Contact-list-entries-should-adapt-their-h.patch |  2 +-
 ...0024-Bug-1187281-Only-show-close-button-on-Windows.patch |  2 +-
 projects/instantbird/build  |  2 --
 25 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch 
b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
index ed4f073..44e2669 100644
--- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
+++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
@@ -1,4 +1,4 @@
-From 6d141536baa7461f99f8067a2a93fd10740569c1 Mon Sep 17 00:00:00 2001
+From 1d67d081f0a1c5c354152c5c54387403a7334946 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh 
 Date: Mon, 10 Oct 2016 19:48:41 -0700
 Subject: [PATCH 01/24] Set Tor Messenger preferences
@@ -8,7 +8,7 @@ Subject: [PATCH 01/24] Set Tor Messenger preferences
  1 file changed, 378 insertions(+), 21 deletions(-)
 
 diff --git a/im/app/profile/all-instantbird.js 
b/im/app/profile/all-instantbird.js
-index b7a3970..09cfee3 100644
+index b7a3970..2d9a217 100644
 --- a/im/app/profile/all-instantbird.js
 +++ b/im/app/profile/all-instantbird.js
 @@ -1,3 +1,46 @@
@@ -298,7 +298,7 @@ index b7a3970..09cfee3 100644
 +pref("general.appversion.override", "5.0 (Windows)");
 +pref("general.oscpu.override", "Windows NT 6.1");
 +pref("general.platform.override", "Win32");
-+pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:25.0) 
Gecko/20100101 Instantbird/1.5");  // TM
++pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:45.0) 
Gecko/20100101 Firefox/45.0");
 +pref("general.productSub.override", "20100101");
 +pref("general.buildID.override", "20100101");
 +pref("browser.startup.homepage_override.buildID", "20100101");
diff --git 
a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch 
b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
index c5c01b4..3b908e3 100644
--- a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
+++ b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
@@ -1,4 +1,4 @@
-From 7c9ac99bbcb06d68fb908333eb8cc5143637154a Mon Sep 17 00:00:00 2001
+From f1e661a5b83c86b1f2d04a434f59c938d3ae1eef Mon Sep 17 00:00:00 2001
 From: Arlo Breault 
 Date: Mon, 16 Nov 2015 20:37:53 -0800
 Subject: [PATCH 02/24] Trac 16489: Prevent account autologin
diff --git 
a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
 
b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
index 204be81..454ce61 100644
--- 
a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
+++ 
b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
@@ -1,4 +1,4 @@
-From 2613a52919e2418eb1203ced487e220d9b41095d Mon Sep 17 00:00:00 2001
+From ffc41b64d3a203ada0549a57044329afb31e88dd Mon Sep 17 00:00:00 2001
 From: aleth 
 Date: Sat, 30 Jan 2016 20:56:38 +0100
 Subject: [PATCH 03/24] Trac 17896: Support "Special Characters" input prompt
diff --git

[tor-commits] [tor-messenger-build/master] Fix 233e7b23 after dbf84f58

2016-11-08 Thread arlo

commit 022f322487e917311d8a1ef99fc508c93459f84b
Author: Arlo Breault 
Date:   Tue Nov 8 10:48:21 2016 -0800

Fix 233e7b23 after dbf84f58

 * Setting "external-default" to true is undesirable.  We're relying on
   imContentSink.jsm to filter all protocols, save for https?/mailto.

 * In im/components/contentHandler.js, exposed https? call out to the
   external handler.  Seemingly "external.http?" would be enough,
   however setting those takes precedence over expose and then accounts
   don't connect.

 * In trac 16494, we'd want to port TorButton's external-app-blocker.js
   Also, see https://bugzilla.mozilla.org/show_bug.cgi?id=440892
---
 .../0001-Set-Tor-Messenger-preferences.patch|  8 
 .../0002-Trac-16489-Prevent-account-autologin.patch |  2 +-
 ...7896-Support-Special-Characters-input-prompt-o.patch |  2 +-
 ...7494-Better-error-reporting-for-failed-outgoin.patch |  2 +-
 .../0005-Trac-13312-OTR-over-Twitter-DMs.patch  |  2 +-
 ...18193-Fix-tab-strip-background-colour-on-OS-X..patch |  2 +-
 ...46431-XMPP-createConversation-should-handle-in.patch |  2 +-
 ...98574-Set-_userVCard-own-property-when-downloa.patch |  2 +-
 .../instantbird/0009-XMPP-in-band-registration.patch|  2 +-
 projects/instantbird/0010-Remove-search-from-UI.patch   |  2 +-
 .../instantbird/0011-Add-Tor-Messenger-branding.patch   |  2 +-
 projects/instantbird/0012-Account-picture.patch |  2 +-
 .../instantbird/0013-Modify-protocol-defaults.patch |  2 +-
 projects/instantbird/0014-Modify-IRC-defaults.patch |  2 +-
 projects/instantbird/0015-Modify-themes.patch   |  2 +-
 projects/instantbird/0016-Modify-XMPP-defaults.patch|  2 +-
 projects/instantbird/0017-Remove-logging-UI.patch   |  2 +-
 projects/instantbird/0018-Cert-override.patch   |  2 +-
 .../instantbird/0019-Display-all-traffic-over-Tor.patch |  2 +-
 projects/instantbird/0020-Trac-17480-Content-sink.patch | 17 +
 .../0021-SASL-ECDSA-NIST256P-CHALLENGE.patch|  2 +-
 ...13137-msg-is-not-defined-error-in-irc.js-chang.patch |  2 +-
 ...4368-Contact-list-entries-should-adapt-their-h.patch |  2 +-
 ...-Bug-1187281-Only-show-close-button-on-Windows.patch |  2 +-
 24 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch 
b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
index 55861c9..ed4f073 100644
--- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
+++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
@@ -1,4 +1,4 @@
-From b229ec3ed7af7f4e78b1d75a26c1ed76046ad3fe Mon Sep 17 00:00:00 2001
+From 6d141536baa7461f99f8067a2a93fd10740569c1 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh 
 Date: Mon, 10 Oct 2016 19:48:41 -0700
 Subject: [PATCH 01/24] Set Tor Messenger preferences
@@ -8,7 +8,7 @@ Subject: [PATCH 01/24] Set Tor Messenger preferences
  1 file changed, 378 insertions(+), 21 deletions(-)
 
 diff --git a/im/app/profile/all-instantbird.js 
b/im/app/profile/all-instantbird.js
-index b7a3970..a4e0654 100644
+index b7a3970..09cfee3 100644
 --- a/im/app/profile/all-instantbird.js
 +++ b/im/app/profile/all-instantbird.js
 @@ -1,3 +1,46 @@
@@ -352,8 +352,8 @@ index b7a3970..a4e0654 100644
 +pref("network.proxy.type", 1);
 +pref("network.security.ports.banned", "9050,9051,9150,9151");
 +pref("network.dns.disablePrefetch", true);
-+pref("network.protocol-handler.external-default", false);
-+pref("network.protocol-handler.external.mailto", false);
++//pref("network.protocol-handler.external-default", false);  // TM
++//pref("network.protocol-handler.external.mailto", false);  // TM
 +pref("network.protocol-handler.external.news", false);
 +pref("network.protocol-handler.external.nntp", false);
 +pref("network.protocol-handler.external.snews", false);
diff --git 
a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch 
b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
index 0164642..c5c01b4 100644
--- a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
+++ b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
@@ -1,4 +1,4 @@
-From facec2ac69b9068c63278572ffdfa432f259f373 Mon Sep 17 00:00:00 2001
+From 7c9ac99bbcb06d68fb908333eb8cc5143637154a Mon Sep 17 00:00:00 2001
 From: Arlo Breault 
 Date: Mon, 16 Nov 2015 20:37:53 -0800
 Subject: [PATCH 02/24] Trac 16489: Prevent account autologin
diff --git 
a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
 
b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
index 78751e2..204be81 100644
--- 
a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
+++ 
b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
@@ -1,4 +1,4

[tor-commits] [torbutton/master] Bug 20347.1: Apply torbutton security_slider pref at startup

2016-11-08 Thread gk

commit 595b01456eaa3b0759f1f80d562ebf6520c8c182
Author: Arthur Edelstein 
Date:   Tue Nov 8 07:57:10 2016 -0800

Bug 20347.1: Apply torbutton security_slider pref at startup

Fixes bug in the main 20347 patch, reported at
https://trac.torproject.org/projects/tor/ticket/20347#comment:13
---
 src/modules/security-prefs.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/security-prefs.js b/src/modules/security-prefs.js
index 3710862..fa30aba 100644
--- a/src/modules/security-prefs.js
+++ b/src/modules/security-prefs.js
@@ -78,7 +78,7 @@ var watch_security_prefs = function (onSettingChanged) {
   let prefNames = Object.keys(kSecuritySettings);
   let unbindFuncs = [];
   for (let prefName of prefNames) {
-unbindFuncs.push(bindPref(
+unbindFuncs.push(bindPrefAndInit(
   prefName, () => onSettingChanged(read_setting_from_prefs(;
   }
   // Call all the unbind functions.
@@ -102,7 +102,7 @@ var initialize = function () {
   initialized = true;
   // When security_custom is set to false, apply security_slider setting
   // to the security-sensitive prefs.
-  bindPref(kCustomPref, function (custom) {
+  bindPrefAndInit(kCustomPref, function (custom) {
 if (custom === false) {
   write_setting_to_prefs(getIntPref(kSliderPref));
 }

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2016-11-08 Thread translation

commit 537496f21fcf77595d48504d4a15a99b3392a2bf
Author: Translation commit bot 
Date:   Tue Nov 8 15:16:13 2016 +

Update translations for tails-misc
---
 nb.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nb.po b/nb.po
index e608436..68574b0 100644
--- a/nb.po
+++ b/nb.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 16:02+0200\n"
-"PO-Revision-Date: 2016-09-03 08:57+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2016-09-19 13:02+0200\n"
+"PO-Revision-Date: 2016-11-08 15:01+\n"
+"Last-Translator: Allan NordhÃ¸y \n"
 "Language-Team: Norwegian BokmÃ¥l 
(http://www.transifex.com/otf/torproject/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -248,11 +248,11 @@ msgstr "Tor er ikke klar"
 
 #: config/chroot_local-includes/usr/local/bin/tor-browser:41
 msgid "Tor is not ready. Start Tor Browser anyway?"
-msgstr "Tor er ikke klar. Starte Tor Browser uansett?"
+msgstr "Tor er ikke klar. Start Tor-nettleseren uansett?"
 
 #: config/chroot_local-includes/usr/local/bin/tor-browser:42
 msgid "Start Tor Browser"
-msgstr "Start Tor Browser"
+msgstr "Start Tor-nettleseren"
 
 #: config/chroot_local-includes/usr/local/bin/tor-browser:43
 msgid "Cancel"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2016-11-08 Thread translation

commit 6a2a3594a9977b5a2a840e497a79451f078609fb
Author: Translation commit bot 
Date:   Tue Nov 8 15:17:12 2016 +

Update translations for torbutton-abouttorproperties
---
 nb/abouttor.properties | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nb/abouttor.properties b/nb/abouttor.properties
index 0edcab0..5f61c0b 100644
--- a/nb/abouttor.properties
+++ b/nb/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=Doner nÃ¥.
+aboutTor.donationBanner.heart=Tor er en sentral del av frihet pÃ¥ Internett
+aboutTor.donationBanner.tagline1=Millioner av folk avhenger av Tor for sin 
sikkerhet pÃ¥ nett og sitt personvern
+aboutTor.donationBanner.tagline2=Et nettverk av folk som beskytter hverandre
+aboutTor.donationBanner.tagline3=OvervÃ¥kning = Undertrykking
+aboutTor.donationBanner.tagline4=Beskyttelse av journalister, aktivister og 
flÃ¸yteblÃ¥sere, siden 2006

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed

2016-11-08 Thread translation

commit de3871138f00aa61cec791df39dc7ac03d118714
Author: Translation commit bot 
Date:   Tue Nov 8 15:17:15 2016 +

Update translations for torbutton-abouttorproperties_completed
---
 nb/abouttor.properties | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/nb/abouttor.properties b/nb/abouttor.properties
index 7861a96..5f61c0b 100644
--- a/nb/abouttor.properties
+++ b/nb/abouttor.properties
@@ -19,3 +19,10 @@ aboutTor.searchDC.privacy=SÃ¸k sikkert 
med Dis
 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=Doner nÃ¥.
+aboutTor.donationBanner.heart=Tor er en sentral del av frihet pÃ¥ Internett
+aboutTor.donationBanner.tagline1=Millioner av folk avhenger av Tor for sin 
sikkerhet pÃ¥ nett og sitt personvern
+aboutTor.donationBanner.tagline2=Et nettverk av folk som beskytter hverandre
+aboutTor.donationBanner.tagline3=OvervÃ¥kning = Undertrykking
+aboutTor.donationBanner.tagline4=Beskyttelse av journalister, aktivister og 
flÃ¸yteblÃ¥sere, siden 2006

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

2016-11-08 Thread translation

commit 59f793859e3a5f7f029d884b8ceda00756cc05d8
Author: Translation commit bot 
Date:   Tue Nov 8 15:16:43 2016 +

Update translations for torbutton-torbuttondtd
---
 nb/torbutton.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nb/torbutton.dtd b/nb/torbutton.dtd
index 26c9f76..be5420f 100644
--- a/nb/torbutton.dtd
+++ b/nb/torbutton.dtd
@@ -4,16 +4,16 @@
 
 
 
-
+
 
 
 
 
 
 
-
-
-
+
+
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2016-11-08 Thread translation

commit 47ae1c0e4c0a2be7310424417fd5b587bf919d31
Author: Translation commit bot 
Date:   Tue Nov 8 15:16:20 2016 +

Update translations for abouttor-homepage
---
 nb/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nb/aboutTor.dtd b/nb/aboutTor.dtd
index faf78e2..1eae44c 100644
--- a/nb/aboutTor.dtd
+++ b/nb/aboutTor.dtd
@@ -10,7 +10,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-brandproperties] Update translations for torbutton-brandproperties

2016-11-08 Thread translation

commit d914d8f28b4bc5a203e6295139e8e2ba14ea2531
Author: Translation commit bot 
Date:   Tue Nov 8 15:16:27 2016 +

Update translations for torbutton-brandproperties
---
 nb/brand.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nb/brand.properties b/nb/brand.properties
index 5baf4e5..f859936 100644
--- a/nb/brand.properties
+++ b/nb/brand.properties
@@ -3,8 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 brandShorterName=Tor Nettleser
-brandShortName=Tor Browser
-brandFullName=Tor Browser
+brandShortName=Tor-nettleseren
+brandFullName=Tor-nettleseren
 vendorShortName=Tor-prosjektet
 
 homePageSingleStartMain=Firefox Start, en rask startside med innebygd sÃ¸k

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-brandproperties_completed] Update translations for torbutton-brandproperties_completed

2016-11-08 Thread translation

commit abeb584a1fe25bb811d7e46e1e818354b3219b48
Author: Translation commit bot 
Date:   Tue Nov 8 15:16:30 2016 +

Update translations for torbutton-brandproperties_completed
---
 nb/brand.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nb/brand.properties b/nb/brand.properties
index 5baf4e5..f859936 100644
--- a/nb/brand.properties
+++ b/nb/brand.properties
@@ -3,8 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 brandShorterName=Tor Nettleser
-brandShortName=Tor Browser
-brandFullName=Tor Browser
+brandShortName=Tor-nettleseren
+brandFullName=Tor-nettleseren
 vendorShortName=Tor-prosjektet
 
 homePageSingleStartMain=Firefox Start, en rask startside med innebygd sÃ¸k

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2016-11-08 Thread translation

commit d9fedd7a914883e35adfdb8534f4430914793407
Author: Translation commit bot 
Date:   Tue Nov 8 15:16:40 2016 +

Update translations for torbutton-torbuttonproperties
---
 nb/torbutton.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nb/torbutton.properties b/nb/torbutton.properties
index 4828cfb..ddf7d3b 100644
--- a/nb/torbutton.properties
+++ b/nb/torbutton.properties
@@ -12,7 +12,7 @@ torbutton.panel.label.disabled = Tor er deaktivert
 torbutton.panel.label.enabled = Tor er aktivert
 extensions.torbut...@torproject.org.description = Torbutton tilbyr en knapp 
til Ã¥ sette opp Tor-innstillinger, samt rask og enkel tilgang til Ã¥ slette 
privat nettleserhistorikk.
 torbutton.popup.external.title = Last ned en ekstern filtype?
-torbutton.popup.external.app = Tor Browser kan ikke Ã¥pne denne filen. Du er 
nÃ¸dt til Ã¥ Ã¥pne den med et annet program.\n
+torbutton.popup.external.app = Tor-nettleseren kan ikke Ã¥pne denne filen. Du 
er nÃ¸dt til Ã¥ Ã¥pne den med et annet program.\n
 torbutton.popup.external.note = Noen filtyper kan forÃ¥rsake at programmer 
kobler til internett uten Ã¥ bruke Tor.\n
 torbutton.popup.external.suggest = For Ã¥ vÃ¦re pÃ¥ den sikre siden, bÃ¸r du 
kun Ã¥pne nedlastede filer nÃ¥r du frakoblet internett, eller bruke en Tor Live 
CD som Tails.\n
 torbutton.popup.launch = Last ned fil

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

2016-11-08 Thread translation

commit 1aa3f72a10ccb2cd2549b383e2e6f8522ed088b8
Author: Translation commit bot 
Date:   Tue Nov 8 15:16:24 2016 +

Update translations for abouttor-homepage_completed
---
 nb/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nb/aboutTor.dtd b/nb/aboutTor.dtd
index faf78e2..1eae44c 100644
--- a/nb/aboutTor.dtd
+++ b/nb/aboutTor.dtd
@@ -10,7 +10,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2016-11-08 Thread translation

commit 8b5be46b7b893c512bf36f72d4027381cab73169
Author: Translation commit bot 
Date:   Tue Nov 8 15:16:17 2016 +

Update translations for tails-misc_completed
---
 nb.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nb.po b/nb.po
index e608436..68574b0 100644
--- a/nb.po
+++ b/nb.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 16:02+0200\n"
-"PO-Revision-Date: 2016-09-03 08:57+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2016-09-19 13:02+0200\n"
+"PO-Revision-Date: 2016-11-08 15:01+\n"
+"Last-Translator: Allan NordhÃ¸y \n"
 "Language-Team: Norwegian BokmÃ¥l 
(http://www.transifex.com/otf/torproject/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -248,11 +248,11 @@ msgstr "Tor er ikke klar"
 
 #: config/chroot_local-includes/usr/local/bin/tor-browser:41
 msgid "Tor is not ready. Start Tor Browser anyway?"
-msgstr "Tor er ikke klar. Starte Tor Browser uansett?"
+msgstr "Tor er ikke klar. Start Tor-nettleseren uansett?"
 
 #: config/chroot_local-includes/usr/local/bin/tor-browser:42
 msgid "Start Tor Browser"
-msgstr "Start Tor Browser"
+msgstr "Start Tor-nettleseren"
 
 #: config/chroot_local-includes/usr/local/bin/tor-browser:43
 msgid "Cancel"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2016-11-08 Thread translation

commit 41be65b217d4a549786831c4f783571f182ecca6
Author: Translation commit bot 
Date:   Tue Nov 8 15:15:04 2016 +

Update translations for bridgedb
---
 nb/LC_MESSAGES/bridgedb.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nb/LC_MESSAGES/bridgedb.po b/nb/LC_MESSAGES/bridgedb.po
index a744b39..a004ead 100644
--- a/nb/LC_MESSAGES/bridgedb.po
+++ b/nb/LC_MESSAGES/bridgedb.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2016-04-02 01:14+\n"
+"PO-Revision-Date: 2016-11-08 15:02+\n"
 "Last-Translator: Allan NordhÃ¸y \n"
 "Language-Team: Norwegian BokmÃ¥l 
(http://www.transifex.com/otf/torproject/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -337,7 +337,7 @@ msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "For Ã¥ sette opp broer i Tor Browser, fÃ¸rst gÃ¥ til %s Tor Browser 
download\nsiden %s fÃ¸lg sÃ¥ instruksene for nedlasting og start av Tor 
Browser."
+msgstr "For Ã¥ sette opp broer i Tor-nettleseren, gÃ¥ fÃ¸rst til %s siden for 
nedlasting av Tor-nettleser\n%s fÃ¸lg sÃ¥ instruksene for nedlasting og start 
av Tor-nettleseren."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:151

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed

2016-11-08 Thread translation

commit 490e0b120e81556a2d7613622d40fb1bb543c79d
Author: Translation commit bot 
Date:   Tue Nov 8 15:15:08 2016 +

Update translations for bridgedb_completed
---
 nb/LC_MESSAGES/bridgedb.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nb/LC_MESSAGES/bridgedb.po b/nb/LC_MESSAGES/bridgedb.po
index a744b39..a004ead 100644
--- a/nb/LC_MESSAGES/bridgedb.po
+++ b/nb/LC_MESSAGES/bridgedb.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2016-04-02 01:14+\n"
+"PO-Revision-Date: 2016-11-08 15:02+\n"
 "Last-Translator: Allan NordhÃ¸y \n"
 "Language-Team: Norwegian BokmÃ¥l 
(http://www.transifex.com/otf/torproject/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -337,7 +337,7 @@ msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
 "page %s and then follow the instructions there for downloading and starting\n"
 "Tor Browser."
-msgstr "For Ã¥ sette opp broer i Tor Browser, fÃ¸rst gÃ¥ til %s Tor Browser 
download\nsiden %s fÃ¸lg sÃ¥ instruksene for nedlasting og start av Tor 
Browser."
+msgstr "For Ã¥ sette opp broer i Tor-nettleseren, gÃ¥ fÃ¸rst til %s siden for 
nedlasting av Tor-nettleser\n%s fÃ¸lg sÃ¥ instruksene for nedlasting og start 
av Tor-nettleseren."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:151

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/maint-6.0] Bug 20023: Upgrade Go to 1.7.3.

2016-11-08 Thread gk

commit 4a0bf1ed2578e3e742e00f95385f914a241904fd
Author: David Fifield 
Date:   Sun Apr 10 08:32:54 2016 +

Bug 20023: Upgrade Go to 1.7.3.

Go 1.7 has a necessary fix for macOS Sierra that is not in Go 1.6.3 or
earlier:
https://github.com/golang/go/commit/2da5633eb9091608047881953f75b489a3134cdc
meek was unstable on macOS Sierra when compiled with Go 1.4.3 or 1.6.3.
Reported by tordevSZ0: https://bugs.torproject.org/20250.

We need to use the Mac OS X 10.7 SDK (not 10.6) to build Go 1.7 and
later:
https://bugs.torproject.org/20023#comment:6

We add -std=gnu99 to CFLAGS when building Go. A piece of new C code uses
c99 features. Other code uses "asm", which requires gnu99.
https://bugs.torproject.org/20023#comment:6
https://trac.macports.org/ticket/52506

We hack one of the source files with sed to remove 
-D__MAC_OS_X_VERSION_MAX_ALLOWED=1060,
which otherwise causes the build to fail, thinking a couple of functions
are unavailable.
https://github.com/golang/go/issues/17732
---
 gitian/descriptors/mac/gitian-pluggable-transports.yml | 12 +++-
 gitian/versions|  4 ++--
 gitian/versions.alpha  |  4 ++--
 gitian/versions.beta   |  4 ++--
 gitian/versions.nightly|  4 ++--
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml 
b/gitian/descriptors/mac/gitian-pluggable-transports.yml
index 33b134e..519a3ee 100644
--- a/gitian/descriptors/mac/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml
@@ -48,6 +48,7 @@ files:
 - "go14.tar.gz"
 - "go.tar.gz"
 - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb"
+- "MacOSX10.7.sdk.tar.gz"
 - 
"multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz"
 - "dzip.sh"
 - "gmp-mac64-utils.zip"
@@ -82,6 +83,8 @@ script: |
   export PATH="/usr/sbin:/sbin:$PATH"
   sudo dpkg -i *.deb
   tar xaf multiarch-darwin*tar.xz
+  # The 10.7 SDK is needed for Go: https://bugs.torproject.org/20023#comment:6
+  tar xaf MacOSX10.7.sdk.tar.gz
   export PATH="$PATH:$HOME/build/apple-osx/bin/"
   if [ "z$INCLUDE_FTE" = "z1" ]; then
 unzip -d $INSTDIR gmp-mac64-utils.zip
@@ -99,10 +102,6 @@ script: |
   export CXX=$HOME/build/apple-osx/bin/i686-apple-darwin11-g++
   # http://bugs.python.org/issue9437
   export LDSHARED="$CC -pthread -shared"
-  # XXX Clean up these flags?
-  export CFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ 
-I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I.  
-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ 
-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ 
-F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks 
-mmacosx-version-min=10.5 
-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1$FTE_EXTRA_CFLAGS"
-  export CXXFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ 
-I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I.  
-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ 
-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ 
-F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks 
-mmacosx-version-min=10.5 
-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1$FTE_EXTRA_CFLAGS"
-  export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ 
-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ 
-F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks 
-mmacosx-version-min=10.5"
 
   # Building go 1.4.x
   # This is needed to bootstrap the go that we actually use
@@ -122,7 +121,7 @@ script: |
   # https://github.com/golang/go/issues/15457
   CC_FOR_TARGET="$(pwd)/cc-for-target"
   echo "#!/bin/sh" > "$CC_FOR_TARGET"
-  echo "exec $CC $CFLAGS $LDFLAGS \"\$@\"" >> "$CC_FOR_TARGET"
+  echo "exec $CC $CFLAGS $LDFLAGS -isysroot $HOME/build/MacOSX10.7.sdk 
-std=gnu99 \"\$@\"" >> "$CC_FOR_TARGET"
   chmod +x "$CC_FOR_TARGET"
   # http://golang.org/doc/install/source#environment
   export GOPATH="$HOME/go"
@@ -130,6 +129,9 @@ script: |
   export GOARCH=386
   tar xvf go.tar.gz
   cd go/src
+  # Remove a preprocessor directive that causes problems when building with 
the 10.7 SDK.
+  # https://github.com/golang/go/issues/17732
+  sed -i -e '/^#cgo CFLAGS:/s/-D__MAC_OS_X_VERSION_MAX_ALLOWED=1060//' 
crypto/x509/root_cgo_darwin.go
   CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash
   cd ../..
   export PATH="$PATH:$PWD/go/bin"
diff --git a/gitian/versions b/gitian/versions
index 784b7ea..92d7125 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -62,7 +62,7 @@ SETUPTOOLS_VER=1.4
 PARSLEY_VER=1.2
 # We need a Go 1.4 to bootstrap later versions; see 
https://golang.org/doc/install/source#go14
 GO14_VER=1.4.3
-GO_VER=1.6.3
+GO_VER=1.7.3
 NSIS_VER=2.51
 
 ## File names for the source

[tor-commits] [tor-browser-bundle/maint-6.0] Upgrade Go to 1.6.3.

2016-11-08 Thread gk

commit 3dee56db1330daa8df7e4d0c90d88bff17b80fec
Author: David Fifield 
Date:   Sun Apr 10 08:32:54 2016 +

Upgrade Go to 1.6.3.

This commit is a combination of two commits from master:
778fd2d0 Bug 18333: Upgrade go to 1.6.2.
1aa712a5 Bug 19703: Upgrade Go to 1.6.3.
---
 .../linux/gitian-pluggable-transports.yml  | 12 ++
 .../mac/gitian-pluggable-transports.yml| 27 -
 .../windows/gitian-pluggable-transports.yml| 28 +-
 gitian/fetch-inputs.sh |  5 ++--
 gitian/verify-tags.sh  |  2 +-
 gitian/versions|  9 +--
 gitian/versions.alpha  |  9 +--
 gitian/versions.beta   |  9 +--
 gitian/versions.nightly|  9 +--
 9 files changed, 87 insertions(+), 23 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml 
b/gitian/descriptors/linux/gitian-pluggable-transports.yml
index 38ae561..a1cdc48 100644
--- a/gitian/descriptors/linux/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml
@@ -46,6 +46,7 @@ files:
 - "zope.interface.zip"
 - "twisted.tar.bz2"
 - "parsley.tar.gz"
+- "go14.tar.gz"
 - "go.tar.gz"
 - "dzip.sh"
 - "gmp-linux32-utils.zip"
@@ -74,6 +75,17 @@ script: |
   # FTE only needs libgmp.so.10 and no libgmpxx anymore.
   cp $INSTDIR/gmp/lib/libgmp.so.10 $INSTDIR/Tor
 
+  # Building go 1.4.x
+  # This is needed to bootstrap the go that we actually use
+  # https://golang.org/doc/install/source#go14
+  tar xvf go14.tar.gz --transform='s,^go\>,go1.4,'
+  cd go1.4/src
+  # Disable cgo to avoid conflicts with newer GCC. cgo is not needed for the 
bootstrap go.
+  # https://github.com/golang/go/issues/13114#issuecomment-186922245
+  CGO_ENABLED=0 ./make.bash
+  cd ../..
+  export GOROOT_BOOTSTRAP="$PWD/go1.4"
+
   # Building go
   # http://golang.org/doc/install/source#environment
   export GOPATH="$HOME/go"
diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml 
b/gitian/descriptors/mac/gitian-pluggable-transports.yml
index fbf38c2..33b134e 100644
--- a/gitian/descriptors/mac/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml
@@ -45,6 +45,7 @@ files:
 - "zope.interface.zip"
 - "twisted.tar.bz2"
 - "parsley.tar.gz"
+- "go14.tar.gz"
 - "go.tar.gz"
 - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb"
 - 
"multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz"
@@ -103,19 +104,33 @@ script: |
   export CXXFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ 
-I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I.  
-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ 
-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ 
-F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks 
-mmacosx-version-min=10.5 
-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1$FTE_EXTRA_CFLAGS"
   export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ 
-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ 
-F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks 
-mmacosx-version-min=10.5"
 
+  # Building go 1.4.x
+  # This is needed to bootstrap the go that we actually use
+  # https://golang.org/doc/install/source#go14
+  tar xvf go14.tar.gz --transform='s,^go\>,go1.4,'
+  cd go1.4/src
+  # Disable cgo to avoid conflicts with newer GCC. cgo is not needed for the 
bootstrap go.
+  # https://github.com/golang/go/issues/13114#issuecomment-186922245
+  # Disable CC etc. that are set up for cross builds.
+  CGO_ENABLED=0 CC= CFLAGS= LDFLAGS= ./make.bash
+  cd ../..
+  export GOROOT_BOOTSTRAP="$PWD/go1.4"
+
   # Building go
+  # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS.
+  # Go's CC_FOR_TARGET only allows a command name, not a command with 
arguments.
+  # https://github.com/golang/go/issues/15457
+  CC_FOR_TARGET="$(pwd)/cc-for-target"
+  echo "#!/bin/sh" > "$CC_FOR_TARGET"
+  echo "exec $CC $CFLAGS $LDFLAGS \"\$@\"" >> "$CC_FOR_TARGET"
+  chmod +x "$CC_FOR_TARGET"
   # http://golang.org/doc/install/source#environment
   export GOPATH="$HOME/go"
   export GOOS=darwin
   export GOARCH=386
   tar xvf go.tar.gz
   cd go/src
-  # http://golang.org/cmd/cgo/:
-  # "To enable cgo during cross compiling builds, set the CGO_ENABLED
-  # environment variable to 1 when building the Go tools with make.bash. Also,
-  # set CC_FOR_TARGET to the C cross compiler for the target. CC will be used
-  # for compiling for the host."
-  CGO_ENABLED=1 CC_FOR_TARGET="$CC $CFLAGS $LDFLAGS" CC= CFLAGS= LDFLAGS= 
./make.bash
+  CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash
   cd ../..
   export PATH="$PATH:$PWD/go/bin"
 
diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

2016-11-08 Thread translation

commit ecc889b25a6245155a122c99d03df79fce6a3a21
Author: Translation commit bot 
Date:   Tue Nov 8 13:46:35 2016 +

Update translations for torbutton-torbuttondtd
---
 fr_CA/torbutton.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fr_CA/torbutton.dtd b/fr_CA/torbutton.dtd
index c2384c7..9ccf523 100644
--- a/fr_CA/torbutton.dtd
+++ b/fr_CA/torbutton.dtd
@@ -11,9 +11,9 @@
 
 
 
-
-
-
+
+
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/maint-6.0] Bug 19646: Bump meek tag to 0.25

2016-11-08 Thread gk

commit bd1da40b8ac70aabc1c1793d649430a1dcbbc1f8
Author: Georg Koppen 
Date:   Tue Nov 8 13:33:24 2016 +

Bug 19646: Bump meek tag to 0.25
---
 gitian/versions | 2 +-
 gitian/versions.alpha   | 2 +-
 gitian/versions.beta| 2 +-
 gitian/versions.nightly | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gitian/versions b/gitian/versions
index 85b2a7a..de92243 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -33,7 +33,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 
0.2.19
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=0.5
-MEEK_TAG=0.24
+MEEK_TAG=0.25
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 97cf78f..65acf45 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -33,7 +33,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 
0.2.19
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=0.5
-MEEK_TAG=0.24
+MEEK_TAG=0.25
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
diff --git a/gitian/versions.beta b/gitian/versions.beta
index 8452954..2564e41 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -27,7 +27,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 
0.2.19
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=0.2
-MEEK_TAG=0.18
+MEEK_TAG=0.25
 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2
 
 GITIAN_TAG=tor-browser-builder-3.x-6
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index 22e9742..781d4ae 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -40,7 +40,7 @@ FTEPROXY_TAG=master
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=master
-MEEK_TAG=0.24
+MEEK_TAG=0.25
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/hardened-builds] Bug 19646: Bump meek tag to 0.25

2016-11-08 Thread gk

commit 0502b7aa79e336d826c80ed78800388ff573a60a
Author: Georg Koppen 
Date:   Tue Nov 8 13:33:24 2016 +

Bug 19646: Bump meek tag to 0.25
---
 gitian/versions | 2 +-
 gitian/versions.alpha   | 2 +-
 gitian/versions.beta| 2 +-
 gitian/versions.nightly | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gitian/versions b/gitian/versions
index 6118eac..d1dfa22 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -29,7 +29,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 
0.2.19
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=0.5
-MEEK_TAG=0.24
+MEEK_TAG=0.25
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 8018692..02e2bbd 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -37,7 +37,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 
0.2.19
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=0.5
-MEEK_TAG=0.24
+MEEK_TAG=0.25
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
diff --git a/gitian/versions.beta b/gitian/versions.beta
index f9fb037..6444915 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -28,7 +28,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 
0.2.19
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=0.2
-MEEK_TAG=0.18
+MEEK_TAG=0.25
 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2
 
 GITIAN_TAG=tor-browser-builder-3.x-6
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index b3ec60f..ffa3809 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -40,7 +40,7 @@ FTEPROXY_TAG=master
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=master
-MEEK_TAG=0.24
+MEEK_TAG=0.25
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Bug 19646: Bump meek tag to 0.25

2016-11-08 Thread gk

commit 3308ef8028c10c900ee5c914cf9bb653ec498167
Author: Georg Koppen 
Date:   Tue Nov 8 13:33:24 2016 +

Bug 19646: Bump meek tag to 0.25
---
 gitian/versions | 2 +-
 gitian/versions.alpha   | 2 +-
 gitian/versions.beta| 2 +-
 gitian/versions.nightly | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gitian/versions b/gitian/versions
index a61c4aa..71faeff 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -33,7 +33,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 
0.2.19
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=0.5
-MEEK_TAG=0.24
+MEEK_TAG=0.25
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 90f8d4a..5dd5488 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -33,7 +33,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 
0.2.19
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=0.5
-MEEK_TAG=0.24
+MEEK_TAG=0.25
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
diff --git a/gitian/versions.beta b/gitian/versions.beta
index 6226f77..222f529 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -27,7 +27,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 
0.2.19
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=0.2
-MEEK_TAG=0.18
+MEEK_TAG=0.25
 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2
 
 GITIAN_TAG=tor-browser-builder-3.x-6
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index eaf1a28..f9cfbfb 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -40,7 +40,7 @@ FTEPROXY_TAG=master
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=master
-MEEK_TAG=0.24
+MEEK_TAG=0.25
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2016-11-08 Thread nickm

commit e083a62095bf6ae609fda8b58443247c3232bd15
Merge: 330846a 74e84b7
Author: Nick Mathewson 
Date:   Tue Nov 8 07:55:20 2016 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Bump version to 0.2.9.5-alpha-dev

2016-11-08 Thread nickm

commit 74e84b7eb7ecde8aaa195a7388af0d8dde5df8a9
Author: Nick Mathewson 
Date:   Tue Nov 8 07:55:15 2016 -0500

Bump version to 0.2.9.5-alpha-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 58eab73..1acbe04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.9.5-alpha])
+AC_INIT([tor],[0.2.9.5-alpha-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 05d5a6c..3086e9b 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.9.5-alpha"
+!define VERSION "0.2.9.5-alpha-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index db6c07b..7f42796 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.9.5-alpha"
+#define VERSION "0.2.9.5-alpha-dev"
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] forwardport changelog

2016-11-08 Thread nickm

commit 053cf55cab4753cf0bcfb7e3bc7cf7038833a3a7
Author: Nick Mathewson 
Date:   Tue Nov 8 07:57:04 2016 -0500

forwardport changelog
---
 ChangeLog | 105 +-
 1 file changed, 104 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7a10a7c..5556182 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,107 @@
-Changes in version 0.2.9.5-rc - 2016-1?-??
+Changes in version 0.3.0.1-alpha - 2016-??-??
+
+
+Changes in version 0.2.9.5-alpha - 2016-11-08
+  Tor 0.2.9.5-alpha fixes numerous bugs discovered in the previous alpha
+  version. We believe one or two probably remain, and we encourage
+  everyone to test this release.
+
+  o Major bugfixes (client performance):
+- Clients now respond to new application stream requests immediately
+  when they arrive, rather than waiting up to one second before
+  starting to handle them. Fixes part of bug 19969; bugfix
+  on 0.2.8.1-alpha.
+
+  o Major bugfixes (client reliability):
+- When Tor leaves standby because of a new application request, open
+  circuits as needed to serve that request. Previously, we would
+  potentially wait a very long time. Fixes part of bug 19969; bugfix
+  on 0.2.8.1-alpha.
+
+  o Major bugfixes (download scheduling):
+- When using an exponential backoff schedule, do not give up on
+  downloading just because we have failed a bunch of times. Since
+  each delay is longer than the last, retrying indefinitely won't
+  hurt. Fixes bug 20536; bugfix on 0.2.9.1-alpha.
+- If a consensus expires while we are waiting for certificates to
+  download, stop waiting for certificates.
+- If we stop waiting for certificates less than a minute after we
+  started downloading them, do not consider the certificate download
+  failure a separate failure. Fixes bug 20533; bugfix
+  on 0.2.0.9-alpha.
+- Remove the maximum delay on exponential-backoff scheduling. Since
+  we now allow an infinite number of failures (see ticket 20536), we
+  must now allow the time to grow longer on each failure. Fixes part
+  of bug 20534; bugfix on 0.2.9.1-alpha.
+- Make our initial download delays closer to those from 0.2.8. Fixes
+  another part of bug 20534; bugfix on 0.2.9.1-alpha.
+- When determining when to download a directory object, handle times
+  after 2038 if the operating system supports them. (Someday this
+  will be important!) Fixes bug 20587; bugfix on 0.2.8.1-alpha.
+- When using exponential backoff in test networks, use a lower
+  exponent, so the delays do not vary as much. This helps test
+  networks bootstrap consistently. Fixes bug 20597; bugfix on 20499.
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the November 3 2016 Maxmind GeoLite2
+  Country database.
+
+  o Minor bugfixes (client directory scheduling):
+- Treat "relay too busy to answer request" as a failed request and a
+  reason to back off on our retry frequency. This is safe now that
+  exponential backoffs retry indefinitely, and avoids a bug where we
+  would reset our download schedule erroneously. Fixes bug 20593;
+  bugfix on 0.2.9.1-alpha.
+
+  o Minor bugfixes (client, logging):
+- Remove a BUG warning in circuit_pick_extend_handshake(). Instead,
+  assume all nodes support EXTEND2. Use ntor whenever a key is
+  available. Fixes bug 20472; bugfix on 0.2.9.3-alpha.
+- On DNSPort, stop logging a BUG warning on a failed hostname
+  lookup. Fixes bug 19869; bugfix on 0.2.9.1-alpha.
+
+  o Minor bugfixes (hidden services):
+- When configuring hidden services, check every hidden service
+  directory's permissions. Previously, we only checked the last
+  hidden service. Fixes bug 20529; bugfix the work to fix 13942
+  in 0.2.6.2-alpha.
+
+  o Minor bugfixes (portability):
+- Fix compilation with OpenSSL 1.1 and less commonly-used CPU
+  architectures. Closes ticket 20588.
+- Use ECDHE ciphers instead of ECDH in tortls tests. LibreSSL has
+  removed the ECDH ciphers which caused the tests to fail on
+  platforms which use it. Fixes bug 20460; bugfix on 0.2.8.1-alpha.
+- Fix implicit conversion warnings under OpenSSL 1.1. Fixes bug
+  20551; bugfix on 0.2.1.1-alpha.
+
+  o Minor bugfixes (relay bootstrap):
+- Ensure relays don't make multiple connections during bootstrap.
+  Fixes bug 20591; bugfix on 0.2.8.1-alpha.
+
+  o Minor bugfixes (relay):
+- Work around a memory leak in OpenSSL 1.1 when encoding public
+  keys. Fixes bug 20553; bugfix on 0.0.2pre8.
+- Avoid a small memory leak when informing worker threads about
+  rotated onion keys. Fixes bug 20401; bugfix on 0.2.6.3-alpha.
+- Do not try to parallelize workers more than 16x without the user
+  explicitly configuring us to do so, even if we do detect more than
+  16 CPU cores.

[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

2016-11-08 Thread nickm

commit 93c430cab3c2db8da91d76477468f68cb1e89fac
Merge: d1a0f2e 74e84b7
Author: Nick Mathewson 
Date:   Tue Nov 8 07:55:53 2016 -0500

Merge branch 'maint-0.2.9'

This is an "ours" merge to avoid bumping the version.




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Bump version to 0.2.9.5-alpha-dev

2016-11-08 Thread nickm

commit 74e84b7eb7ecde8aaa195a7388af0d8dde5df8a9
Author: Nick Mathewson 
Date:   Tue Nov 8 07:55:15 2016 -0500

Bump version to 0.2.9.5-alpha-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 58eab73..1acbe04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.9.5-alpha])
+AC_INIT([tor],[0.2.9.5-alpha-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 05d5a6c..3086e9b 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.9.5-alpha"
+!define VERSION "0.2.9.5-alpha-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index db6c07b..7f42796 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.9.5-alpha"
+#define VERSION "0.2.9.5-alpha-dev"
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Bump version to 0.2.9.5-alpha-dev

2016-11-08 Thread nickm

commit 74e84b7eb7ecde8aaa195a7388af0d8dde5df8a9
Author: Nick Mathewson 
Date:   Tue Nov 8 07:55:15 2016 -0500

Bump version to 0.2.9.5-alpha-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 58eab73..1acbe04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.9.5-alpha])
+AC_INIT([tor],[0.2.9.5-alpha-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 05d5a6c..3086e9b 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.9.5-alpha"
+!define VERSION "0.2.9.5-alpha-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index db6c07b..7f42796 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.9.5-alpha"
+#define VERSION "0.2.9.5-alpha-dev"
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] New alpha is out

2016-11-08 Thread nickm

commit f659d20e143c1f1a78cb01bed0c90cfd96b55492
Author: Nick Mathewson 
Date:   Tue Nov 8 07:31:29 2016 -0500

New alpha is out
---
 Makefile | 2 +-
 include/versions.wmi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index cceee41..0b371cf 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 # website component, and set it to needs_review.
 
 export STABLETAG=tor-0.2.8.9
-export DEVTAG=tor-0.2.9.4-alpha
+export DEVTAG=tor-0.2.9.5-alpha
 
 
 WMLBASE=.
diff --git a/include/versions.wmi b/include/versions.wmi
index 044bb6d..0a68efa 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,5 +1,5 @@
 0.2.8.9
-0.2.9.4-alpha
+0.2.9.5-alpha
 
 0.2.8.7
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Fold in one more changes entry

2016-11-08 Thread nickm

commit 330846ac087f7b327d77e118a2bcf96839befc60
Author: Nick Mathewson 
Date:   Tue Nov 8 07:15:18 2016 -0500

Fold in one more changes entry
---
 ChangeLog| 3 +++
 changes/bug20597 | 5 -
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 772b619..3e542cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,9 @@ Changes in version 0.2.9.5-alpha - 2016-11-08
 - When determining when to download a directory object, handle times
   after 2038 if the operating system supports them. (Someday this
   will be important!) Fixes bug 20587; bugfix on 0.2.8.1-alpha.
+- When using exponential backoff in test networks, use a lower
+  exponent, so the delays do not vary as much. This helps test
+  networks bootstrap consistently. Fixes bug 20597; bugfix on 20499.
 
   o Minor features (geoip):
 - Update geoip and geoip6 to the November 3 2016 Maxmind GeoLite2
diff --git a/changes/bug20597 b/changes/bug20597
deleted file mode 100644
index f199b63..000
--- a/changes/bug20597
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (test networks, exponential backoff):
-- When using exponential backoff in test networks, use a lower exponent,
-  so the delays do not vary as much. This helps test networks bootstrap
-  consistently. Fixes bug 20597; bugfix on 20499; not in any released
-  version of tor.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2016-11-08 Thread nickm

commit 7ed7d0571404ebd91698cc3f255d6aa1e547dfff
Merge: 2b2a44a 38e3f91
Author: Nick Mathewson 
Date:   Tue Nov 8 07:12:07 2016 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug20597   | 5 +
 src/or/directory.c | 7 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/hardened-builds] Updating dgoulet's bridge

2016-11-08 Thread gk

commit 0194cfb1ce4019d9d34ac3fa32a05ae242bd4c55
Author: Georg Koppen 
Date:   Tue Nov 8 11:44:49 2016 +

Updating dgoulet's bridge
---
 Bundle-Data/PTConfigs/bridge_prefs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js 
b/Bundle-Data/PTConfigs/bridge_prefs.js
index c4752c1..e188c26 100644
--- a/Bundle-Data/PTConfigs/bridge_prefs.js
+++ b/Bundle-Data/PTConfigs/bridge_prefs.js
@@ -33,7 +33,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 
154.35.22.9:80 C73
 pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:443 
C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 
cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA 
iat-mode=0");
 pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 
154.35.22.12:4148 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB 
cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg 
iat-mode=0");
 pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 
154.35.22.13:6041 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D 
cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 
192.95.36.142:443 445AAA9309486821673F1BAD2F5DA31D57BA14A1 
cert=G2f9hXO446LRm6zZo6i5ayMwk7q9PzcGu5ZNCbx+rYsoyJvWLl/RenYJeOZfsNc4m+KcSw 
iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 
192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 
cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ 
iat-mode=0");
 // Not used yet
 // pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 
85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A 
cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA 
iat-mode=0");
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] When using exponential backoff in test networks, use a lower exponent

2016-11-08 Thread nickm

commit 38e3f91c6388bc676c0007b009488ffcc2496bc8
Author: teor 
Date:   Tue Nov 8 16:39:36 2016 +1100

When using exponential backoff in test networks, use a lower exponent

Lower exponents mean that delays do not vary as much. This helps test
networks bootstrap consistently.

Bugfix on 20499.
---
 changes/bug20597   | 5 +
 src/or/directory.c | 7 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/changes/bug20597 b/changes/bug20597
new file mode 100644
index 000..f199b63
--- /dev/null
+++ b/changes/bug20597
@@ -0,0 +1,5 @@
+  o Minor bugfixes (test networks, exponential backoff):
+- When using exponential backoff in test networks, use a lower exponent,
+  so the delays do not vary as much. This helps test networks bootstrap
+  consistently. Fixes bug 20597; bugfix on 20499; not in any released
+  version of tor.
diff --git a/src/or/directory.c b/src/or/directory.c
index 1f39981..f4fd521 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -3796,7 +3796,12 @@ next_random_exponential_delay(int delay, int max_delay)
 
   /* How much are we willing to add to the delay? */
   int max_increment;
-  const int multiplier = 3; /* no more than quadruple the previous delay */
+  int multiplier = 3; /* no more than quadruple the previous delay */
+  if (get_options()->TestingTorNetwork) {
+/* Decrease the multiplier in testing networks. This reduces the variance,
+ * so that bootstrap is more reliable. */
+multiplier = 2; /* no more than triple the previous delay */
+  }
 
   if (delay && delay < (INT_MAX-1) / multiplier) {
 max_increment = delay * multiplier;

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] When using exponential backoff in test networks, use a lower exponent

2016-11-08 Thread nickm

commit 38e3f91c6388bc676c0007b009488ffcc2496bc8
Author: teor 
Date:   Tue Nov 8 16:39:36 2016 +1100

When using exponential backoff in test networks, use a lower exponent

Lower exponents mean that delays do not vary as much. This helps test
networks bootstrap consistently.

Bugfix on 20499.
---
 changes/bug20597   | 5 +
 src/or/directory.c | 7 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/changes/bug20597 b/changes/bug20597
new file mode 100644
index 000..f199b63
--- /dev/null
+++ b/changes/bug20597
@@ -0,0 +1,5 @@
+  o Minor bugfixes (test networks, exponential backoff):
+- When using exponential backoff in test networks, use a lower exponent,
+  so the delays do not vary as much. This helps test networks bootstrap
+  consistently. Fixes bug 20597; bugfix on 20499; not in any released
+  version of tor.
diff --git a/src/or/directory.c b/src/or/directory.c
index 1f39981..f4fd521 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -3796,7 +3796,12 @@ next_random_exponential_delay(int delay, int max_delay)
 
   /* How much are we willing to add to the delay? */
   int max_increment;
-  const int multiplier = 3; /* no more than quadruple the previous delay */
+  int multiplier = 3; /* no more than quadruple the previous delay */
+  if (get_options()->TestingTorNetwork) {
+/* Decrease the multiplier in testing networks. This reduces the variance,
+ * so that bootstrap is more reliable. */
+multiplier = 2; /* no more than triple the previous delay */
+  }
 
   if (delay && delay < (INT_MAX-1) / multiplier) {
 max_increment = delay * multiplier;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] When using exponential backoff in test networks, use a lower exponent

2016-11-08 Thread nickm

commit 38e3f91c6388bc676c0007b009488ffcc2496bc8
Author: teor 
Date:   Tue Nov 8 16:39:36 2016 +1100

When using exponential backoff in test networks, use a lower exponent

Lower exponents mean that delays do not vary as much. This helps test
networks bootstrap consistently.

Bugfix on 20499.
---
 changes/bug20597   | 5 +
 src/or/directory.c | 7 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/changes/bug20597 b/changes/bug20597
new file mode 100644
index 000..f199b63
--- /dev/null
+++ b/changes/bug20597
@@ -0,0 +1,5 @@
+  o Minor bugfixes (test networks, exponential backoff):
+- When using exponential backoff in test networks, use a lower exponent,
+  so the delays do not vary as much. This helps test networks bootstrap
+  consistently. Fixes bug 20597; bugfix on 20499; not in any released
+  version of tor.
diff --git a/src/or/directory.c b/src/or/directory.c
index 1f39981..f4fd521 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -3796,7 +3796,12 @@ next_random_exponential_delay(int delay, int max_delay)
 
   /* How much are we willing to add to the delay? */
   int max_increment;
-  const int multiplier = 3; /* no more than quadruple the previous delay */
+  int multiplier = 3; /* no more than quadruple the previous delay */
+  if (get_options()->TestingTorNetwork) {
+/* Decrease the multiplier in testing networks. This reduces the variance,
+ * so that bootstrap is more reliable. */
+multiplier = 2; /* no more than triple the previous delay */
+  }
 
   if (delay && delay < (INT_MAX-1) / multiplier) {
 max_increment = delay * multiplier;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

2016-11-08 Thread nickm

commit d1a0f2e7e43553d25e5b9d9ba71ee058897b0ce1
Merge: a9fb2b4 38e3f91
Author: Nick Mathewson 
Date:   Tue Nov 8 07:12:16 2016 -0500

Merge branch 'maint-0.2.9'

 changes/bug20597   | 5 +
 src/or/directory.c | 7 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/maint-6.0] Updating dgoulet's bridge

2016-11-08 Thread gk

commit 08da98bfd734581660db11e0cc599a5a362fdccf
Author: Georg Koppen 
Date:   Tue Nov 8 11:44:49 2016 +

Updating dgoulet's bridge
---
 Bundle-Data/PTConfigs/bridge_prefs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js 
b/Bundle-Data/PTConfigs/bridge_prefs.js
index c4752c1..e188c26 100644
--- a/Bundle-Data/PTConfigs/bridge_prefs.js
+++ b/Bundle-Data/PTConfigs/bridge_prefs.js
@@ -33,7 +33,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 
154.35.22.9:80 C73
 pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:443 
C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 
cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA 
iat-mode=0");
 pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 
154.35.22.12:4148 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB 
cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg 
iat-mode=0");
 pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 
154.35.22.13:6041 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D 
cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 
192.95.36.142:443 445AAA9309486821673F1BAD2F5DA31D57BA14A1 
cert=G2f9hXO446LRm6zZo6i5ayMwk7q9PzcGu5ZNCbx+rYsoyJvWLl/RenYJeOZfsNc4m+KcSw 
iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 
192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 
cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ 
iat-mode=0");
 // Not used yet
 // pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 
85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A 
cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA 
iat-mode=0");
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Updating dgoulet's bridge

2016-11-08 Thread gk

commit 6f0f3056e1cc896ee56ff03d5e306a672b17b75a
Author: Georg Koppen 
Date:   Tue Nov 8 11:44:49 2016 +

Updating dgoulet's bridge
---
 Bundle-Data/PTConfigs/bridge_prefs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js 
b/Bundle-Data/PTConfigs/bridge_prefs.js
index c4752c1..e188c26 100644
--- a/Bundle-Data/PTConfigs/bridge_prefs.js
+++ b/Bundle-Data/PTConfigs/bridge_prefs.js
@@ -33,7 +33,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 
154.35.22.9:80 C73
 pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:443 
C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 
cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA 
iat-mode=0");
 pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 
154.35.22.12:4148 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB 
cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg 
iat-mode=0");
 pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 
154.35.22.13:6041 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D 
cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA 
iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 
192.95.36.142:443 445AAA9309486821673F1BAD2F5DA31D57BA14A1 
cert=G2f9hXO446LRm6zZo6i5ayMwk7q9PzcGu5ZNCbx+rYsoyJvWLl/RenYJeOZfsNc4m+KcSw 
iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 
192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 
cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ 
iat-mode=0");
 // Not used yet
 // pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 
85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A 
cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA 
iat-mode=0");
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/hardened-builds] Bug 20582: move tor-browser specific strings to config.yml

2016-11-08 Thread gk

commit 4fb93b748090ae3e13201f76dac033a0350116e9
Author: Nicolas Vigier 
Date:   Sat Nov 5 20:23:02 2016 +0100

Bug 20582: move tor-browser specific strings to config.yml
---
 tools/update-responses/config.yml   |  5 +
 tools/update-responses/update_responses | 26 +++---
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/tools/update-responses/config.yml 
b/tools/update-responses/config.yml
index f7edb24..022cea2 100644
--- a/tools/update-responses/config.yml
+++ b/tools/update-responses/config.yml
@@ -1,4 +1,9 @@
 ---
+appname_marfile: tor-browser
+appname_bundle_osx: TorBrowser
+appname_bundle_linux: tor-browser
+appname_bundle_win: torbrowser-install
+appdir_osx: TorBrowser.app
 releases_dir: ../../gitian
 download:
 archive_url: https://archive.torproject.org/tor-package-archive/torbrowser
diff --git a/tools/update-responses/update_responses 
b/tools/update-responses/update_responses
index 69535c9..bef5615 100755
--- a/tools/update-responses/update_responses
+++ b/tools/update-responses/update_responses
@@ -82,13 +82,14 @@ sub get_sha512_hex_of_file {
 sub get_version_files {
 my ($config, $version) = @_;
 return if $config->{versions}{$version}{files};
+my $appname = $config->{appname_marfile};
 my $files = {};
 my $vdir = "$releases_dir/$version";
 my $download_url = "$config->{download}{mars_url}/$version";
 opendir(my $d, $vdir) or exit_error "Error opening directory $vdir";
 foreach my $file (readdir $d) {
 next unless -f "$vdir/$file";
-if ($file =~ m/^tor-browser-([^-]+)-${version}_(.+)\.mar$/) {
+if ($file =~ m/^$appname-([^-]+)-${version}_(.+)\.mar$/) {
 my ($os, $lang) = ($1, $2);
 $files->{$os}{$lang}{complete} = {
 type => 'complete',
@@ -99,7 +100,7 @@ sub get_version_files {
 };
 next;
 }
-if ($file =~ 
m/^tor-browser-([^-]+)-(.+)-${version}_(.+)\.incremental\.mar$/) {
+if ($file =~ 
m/^$appname-([^-]+)-(.+)-${version}_(.+)\.incremental\.mar$/) {
 my ($os, $from_version, $lang) = ($1, $2, $3);
 $files->{$os}{$lang}{partial}{$from_version} = {
 type => 'partial',
@@ -123,11 +124,11 @@ sub get_version_downloads {
 foreach my $file (readdir $d) {
 next unless -f "$vdir/$file";
 my ($os, $lang);
-if ($file =~ m/^TorBrowser-$version-osx64_(.+).dmg$/) {
+if ($file =~ 
m/^$config->{appname_bundle_osx}-$version-osx64_(.+).dmg$/) {
 ($os, $lang) = ('osx64', $1);
-} elsif ($file =~ 
m/^tor-browser-(linux32|linux64)-${version}_(.+).tar.xz$/) {
+} elsif ($file =~ 
m/^$config->{appname_bundle_linux}-(linux32|linux64)-${version}_(.+).tar.xz$/) {
 ($os, $lang) = ($1, $2);
-} elsif ($file =~ m/^torbrowser-install-${version}_(.+).exe$/) {
+} elsif ($file =~ 
m/^$config->{appname_bundle_win}-${version}_(.+).exe$/) {
 ($os, $lang) = ('win32', $1);
 } else {
 next;
@@ -168,13 +169,14 @@ sub extract_mar {
 }
 
 sub mar_filename {
-my ($version, $os, $lang) = @_;
-"$releases_dir/$version/tor-browser-$os-${version}_$lang.mar";
+my ($appname, $version, $os, $lang) = @_;
+"$releases_dir/$version/$appname-$os-${version}_$lang.mar";
 }
 
 sub create_incremental_mar {
 my ($config, $pm, $from_version, $new_version, $os, $lang) = @_;
-my $mar_file = 
"tor-browser-$os-${from_version}-${new_version}_$lang.incremental.mar";
+my $appname = $config->{appname_marfile};
+my $mar_file = 
"$appname-$os-${from_version}-${new_version}_$lang.incremental.mar";
 print "Starting $mar_file\n";
 my $mar_file_path = "$releases_dir/$new_version/$mar_file";
 my $download_url = "$config->{download}{mars_url}/$new_version";
@@ -191,8 +193,8 @@ sub create_incremental_mar {
 };
 return if $pm->start($finished_file);
 my $tmpdir = File::Temp->newdir();
-extract_mar(mar_filename($from_version, $os, $lang), "$tmpdir/A");
-extract_mar(mar_filename($new_version, $os, $lang), "$tmpdir/B");
+extract_mar(mar_filename($appname, $from_version, $os, $lang), 
"$tmpdir/A");
+extract_mar(mar_filename($appname, $new_version, $os, $lang), "$tmpdir/B");
 my ($out, $err, $success) = capture_exec('make_incremental_update.sh',
$mar_file_path, "$tmpdir/A", "$tmpdir/B");
 if (!$success) {
@@ -246,7 +248,9 @@ sub get_buildinfos {
 foreach my $lang (keys %{$files->{$os}}) {
 next unless $files->{$os}{$lang}{complete};
 my $tmpdir = File::Temp->newdir();
-extract_mar(mar_filename($version, $os, $lang), "$tmpdir");
+extract_mar(
+mar_filename($config->{appname_marfile}, $version, $os, $lang),
+"$tmpdir");
 my $appfile = "$tmpdir/application.ini" if -f 
"$tmpdir/application.ini";

[tor-commits] [tor-browser-bundle/master] Bug 20582: move tor-browser specific strings to config.yml

2016-11-08 Thread gk

commit 7cf56c0d1732a6eccb6bdf93fe0f1fdb0749b4a2
Author: Nicolas Vigier 
Date:   Sat Nov 5 20:23:02 2016 +0100

Bug 20582: move tor-browser specific strings to config.yml
---
 tools/update-responses/config.yml   |  5 +
 tools/update-responses/update_responses | 30 +-
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/tools/update-responses/config.yml 
b/tools/update-responses/config.yml
index 8c047b5..0305733 100644
--- a/tools/update-responses/config.yml
+++ b/tools/update-responses/config.yml
@@ -1,4 +1,9 @@
 ---
+appname_marfile: tor-browser
+appname_bundle_osx: TorBrowser
+appname_bundle_linux: tor-browser
+appname_bundle_win: torbrowser-install
+appdir_osx: TorBrowser.app
 releases_dir: ../../gitian
 download:
 archive_url: https://archive.torproject.org/tor-package-archive/torbrowser
diff --git a/tools/update-responses/update_responses 
b/tools/update-responses/update_responses
index bca3386..a89a18a 100755
--- a/tools/update-responses/update_responses
+++ b/tools/update-responses/update_responses
@@ -82,13 +82,14 @@ sub get_sha512_hex_of_file {
 sub get_version_files {
 my ($config, $version) = @_;
 return if $config->{versions}{$version}{files};
+my $appname = $config->{appname_marfile};
 my $files = {};
 my $vdir = "$releases_dir/$version";
 my $download_url = "$config->{download}{mars_url}/$version";
 opendir(my $d, $vdir) or exit_error "Error opening directory $vdir";
 foreach my $file (readdir $d) {
 next unless -f "$vdir/$file";
-if ($file =~ m/^tor-browser-([^-]+)-${version}_(.+)\.mar$/) {
+if ($file =~ m/^$appname-([^-]+)-${version}_(.+)\.mar$/) {
 my ($os, $lang) = ($1, $2);
 $files->{$os}{$lang}{complete} = {
 type => 'complete',
@@ -99,7 +100,7 @@ sub get_version_files {
 };
 next;
 }
-if ($file =~ 
m/^tor-browser-([^-]+)-(.+)-${version}_(.+)\.incremental\.mar$/) {
+if ($file =~ 
m/^$appname-([^-]+)-(.+)-${version}_(.+)\.incremental\.mar$/) {
 my ($os, $from_version, $lang) = ($1, $2, $3);
 $files->{$os}{$lang}{partial}{$from_version} = {
 type => 'partial',
@@ -123,11 +124,11 @@ sub get_version_downloads {
 foreach my $file (readdir $d) {
 next unless -f "$vdir/$file";
 my ($os, $lang);
-if ($file =~ m/^TorBrowser-$version-osx64_(.+).dmg$/) {
+if ($file =~ 
m/^$config->{appname_bundle_osx}-$version-osx64_(.+).dmg$/) {
 ($os, $lang) = ('osx64', $1);
-} elsif ($file =~ 
m/^tor-browser-(linux32|linux64)-${version}_(.+).tar.xz$/) {
+} elsif ($file =~ 
m/^$config->{appname_bundle_linux}-(linux32|linux64)-${version}_(.+).tar.xz$/) {
 ($os, $lang) = ($1, $2);
-} elsif ($file =~ m/^torbrowser-install-${version}_(.+).exe$/) {
+} elsif ($file =~ 
m/^$config->{appname_bundle_win}-${version}_(.+).exe$/) {
 ($os, $lang) = ('win32', $1);
 } else {
 next;
@@ -168,13 +169,14 @@ sub extract_mar {
 }
 
 sub mar_filename {
-my ($version, $os, $lang) = @_;
-"$releases_dir/$version/tor-browser-$os-${version}_$lang.mar";
+my ($appname, $version, $os, $lang) = @_;
+"$releases_dir/$version/$appname-$os-${version}_$lang.mar";
 }
 
 sub create_incremental_mar {
 my ($config, $pm, $from_version, $new_version, $os, $lang) = @_;
-my $mar_file = 
"tor-browser-$os-${from_version}-${new_version}_$lang.incremental.mar";
+my $appname = $config->{appname_marfile};
+my $mar_file = 
"$appname-$os-${from_version}-${new_version}_$lang.incremental.mar";
 my $mar_file_path = "$releases_dir/$new_version/$mar_file";
 if ($ENV{MAR_SKIP_EXISTING} && -f $mar_file_path) {
 print "Skipping $mar_file\n";
@@ -195,11 +197,11 @@ sub create_incremental_mar {
 };
 return if $pm->start($finished_file);
 my $tmpdir = File::Temp->newdir();
-extract_mar(mar_filename($from_version, $os, $lang), "$tmpdir/A");
-extract_mar(mar_filename($new_version, $os, $lang), "$tmpdir/B");
+extract_mar(mar_filename($appname, $from_version, $os, $lang), 
"$tmpdir/A");
+extract_mar(mar_filename($appname, $new_version, $os, $lang), "$tmpdir/B");
 if ($ENV{CHECK_CODESIGNATURE_EXISTS}) {
-unless (-f 
"$tmpdir/A/TorBrowser.app/Contents/_CodeSignature/CodeResources"
-&& -f 
"$tmpdir/B/TorBrowser.app/Contents/_CodeSignature/CodeResources") {
+unless (-f 
"$tmpdir/A/$config->{appdir_osx}/Contents/_CodeSignature/CodeResources"
+&& -f 
"$tmpdir/B/$config->{appdir_osx}/Contents/_CodeSignature/CodeResources") {
 exit_error "Missing code signature while creating $mar_file";
 }
 }
@@ -256,7 +258,9 @@ sub get_buildinfos {
 foreach my $lang (keys %{$files->{$os}}) {
 next unless $files->{$os}{$lang}{complete};
 my $tmpdir =

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2016-11-08 Thread translation

commit a69f43aefcdb085c3330fae4b05019606bd16783
Author: Translation commit bot 
Date:   Tue Nov 8 10:47:04 2016 +

Update translations for torbutton-abouttorproperties
---
 lv/abouttor.properties | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lv/abouttor.properties b/lv/abouttor.properties
index b791f99..0661f05 100644
--- a/lv/abouttor.properties
+++ b/lv/abouttor.properties
@@ -21,8 +21,8 @@ aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
 aboutTor.searchDC.search.link=https://search.disconnect.me/
 
 aboutTor.donationBanner.donate=Ziedojiet tÅ«liÅ!
-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.heart=Tor ir interneta brÄ«vÄ«bas pamats
+aboutTor.donationBanner.tagline1=CilvÄku miljonu tieÅ¡saistes droÅ¡Ä«ba un 
privÄtums ir atkarÄ«gi no Tor
+aboutTor.donationBanner.tagline2=CilvÄku tÄ«kls, kas sargÄ cilvÄkus
+aboutTor.donationBanner.tagline3=Kontrole = ApspieÅ¡ana 
+aboutTor.donationBanner.tagline4=KopÅ¡ 2006. gada aizsargÄ Å¾urnÄlistus, 
aktÄ«vistus un trauksmes cÄlÄjus

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed

2016-11-08 Thread translation

commit 8e28f52f6aa50a058b7b067cfd7b7268b999c78e
Author: Translation commit bot 
Date:   Tue Nov 8 10:47:07 2016 +

Update translations for torbutton-abouttorproperties_completed
---
 lv/abouttor.properties | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/lv/abouttor.properties b/lv/abouttor.properties
index 36269de..0661f05 100644
--- a/lv/abouttor.properties
+++ b/lv/abouttor.properties
@@ -19,3 +19,10 @@ aboutTor.searchDC.privacy=MeklÄt droÅ¡i 
izmantojot 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=Ziedojiet tÅ«liÅ!
+aboutTor.donationBanner.heart=Tor ir interneta brÄ«vÄ«bas pamats
+aboutTor.donationBanner.tagline1=CilvÄku miljonu tieÅ¡saistes droÅ¡Ä«ba un 
privÄtums ir atkarÄ«gi no Tor
+aboutTor.donationBanner.tagline2=CilvÄku tÄ«kls, kas sargÄ cilvÄkus
+aboutTor.donationBanner.tagline3=Kontrole = ApspieÅ¡ana 
+aboutTor.donationBanner.tagline4=KopÅ¡ 2006. gada aizsargÄ Å¾urnÄlistus, 
aktÄ«vistus un trauksmes cÄlÄjus

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

2016-11-08 Thread translation

commit c515580cf91c84c5aaf64cac0c293770825b1dcd
Author: Translation commit bot 
Date:   Tue Nov 8 10:46:35 2016 +

Update translations for torbutton-torbuttondtd
---
 nl/torbutton.dtd | 6 +++---
 tr/torbutton.dtd | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nl/torbutton.dtd b/nl/torbutton.dtd
index 3d5ea7b..79d0113 100644
--- a/nl/torbutton.dtd
+++ b/nl/torbutton.dtd
@@ -11,9 +11,9 @@
 
 
 
-
-
-
+
+
+
 
 
 
diff --git a/tr/torbutton.dtd b/tr/torbutton.dtd
index 56fc8f8..0edfc51 100644
--- a/tr/torbutton.dtd
+++ b/tr/torbutton.dtd
@@ -11,9 +11,9 @@
 
 
 
-
-
-
+
+
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2016-11-08 Thread translation

commit 70f985e95ffbf64b65c2f0968c4b75a59eede083
Author: Translation commit bot 
Date:   Tue Nov 8 10:17:14 2016 +

Update translations for torbutton-abouttorproperties
---
 lv/abouttor.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lv/abouttor.properties b/lv/abouttor.properties
index 82ada7c..b791f99 100644
--- a/lv/abouttor.properties
+++ b/lv/abouttor.properties
@@ -20,7 +20,7 @@ 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.donate=Ziedojiet tÅ«liÅ!
 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

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

2016-11-08 Thread translation

commit ad4add95d5ad1fc87b158dedfff62f1d8ed30429
Author: Translation commit bot 
Date:   Tue Nov 8 10:16:43 2016 +

Update translations for torbutton-torbuttondtd
---
 es/torbutton.dtd| 6 +++---
 lv/torbutton.dtd| 6 +++---
 zh_CN/torbutton.dtd | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/es/torbutton.dtd b/es/torbutton.dtd
index e491973..fad96e0 100644
--- a/es/torbutton.dtd
+++ b/es/torbutton.dtd
@@ -11,9 +11,9 @@
 
 
 
-
-
-
+
+
+
 
 
 
diff --git a/lv/torbutton.dtd b/lv/torbutton.dtd
index 3a2b02d..36966e5 100644
--- a/lv/torbutton.dtd
+++ b/lv/torbutton.dtd
@@ -11,9 +11,9 @@
 
 
 
-
-
-
+
+
+
 
 
 
diff --git a/zh_CN/torbutton.dtd b/zh_CN/torbutton.dtd
index b1dd91c..d435c6f 100644
--- a/zh_CN/torbutton.dtd
+++ b/zh_CN/torbutton.dtd
@@ -11,9 +11,9 @@
 
 
 
-
-
-
+
+
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

73 matches

Mail list logo