date:20190306

[tor-commits] [tpo/staging] https links

2019-03-06 Thread emmapeel

commit ebf0dadb7bf73a3606811b1bfcd657ec94d8c770
Author: emma peel 
Date:   Thu Mar 7 08:58:23 2019 +0100

https links
---
 content/about/sponsors/google/contents.lr   | 2 +-
 content/about/sponsors/shinjiru/contents.lr | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/about/sponsors/google/contents.lr 
b/content/about/sponsors/google/contents.lr
index 6b0483b..6d2aa90 100644
--- a/content/about/sponsors/google/contents.lr
+++ b/content/about/sponsors/google/contents.lr
@@ -6,4 +6,4 @@ time: 2008 - 2009
 ---
 name: Google
 ---
-link: http://code.google.com/opensource/
+link: https://code.google.com/opensource/
diff --git a/content/about/sponsors/shinjiru/contents.lr 
b/content/about/sponsors/shinjiru/contents.lr
index 3a5542b..ec819eb 100644
--- a/content/about/sponsors/shinjiru/contents.lr
+++ b/content/about/sponsors/shinjiru/contents.lr
@@ -6,4 +6,4 @@ time: 2009 - 2011
 ---
 name: Shinjiru Technology
 ---
-link: http://www.shinjiru.com/
+link: https://www.shinjiru.com/

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

[tor-commits] [tpo/staging] take html link out, and replace it with https link

2019-03-06 Thread emmapeel

commit 7591d2f5108220754f37c14647f3defebaefecb5
Author: emma peel 
Date:   Thu Mar 7 08:27:27 2019 +0100

take html link out, and replace it with https link
---
 content/about/people/ssteele/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/about/people/ssteele/contents.lr 
b/content/about/people/ssteele/contents.lr
index 6ce2b87..a31299e 100644
--- a/content/about/people/ssteele/contents.lr
+++ b/content/about/people/ssteele/contents.lr
@@ -12,4 +12,4 @@ description:
 
 Shari Steele was the Executive Director of the Tor Project from December 2015 
through December 2018. She came to Tor after serving as Executive Director of 
the Electronic Frontier Foundation (EFF) for 15 years.
 From 1992 to 2000, Shari worked as an attorney and then legal director at EFF, 
where she spoke widely about civil liberties law in newly emerging technologies.
-A graduate of Widener University School of Law, Shari later served as a 
teaching fellow at Georgetown University Law Center 
, where she earned an LL.M. degree in Advocacy. 
Shari has been on EFFâs Board of Directors since 2000 and the Tor Project 
Board of Directors since January 2019.
+A graduate of Widener University School of Law, Shari later served as a 
teaching fellow at [Georgetown University Law 
Center](https://www.law.georgetown.edu/), where she earned an LL.M. degree in 
Advocacy. Shari has been on EFFâs Board of Directors since 2000 and the Tor 
Project Board of Directors since January 2019.

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

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

2019-03-06 Thread nickm

commit 0c9cd7c487ac75d9505f46e5ff42087d383eb1b4
Merge: 76b55fde8 2e74edb53
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:29 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0

2019-03-06 Thread nickm

commit 9b4ecbaa7d5a19c2ddbb5e2c442e19c248930a7b
Merge: a999cb43d d6f77b99d
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:43 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.4.0] Merge branch 'maint-0.4.0' into release-0.4.0

2019-03-06 Thread nickm

commit 5c78bd32246fb4c3cb966474b135ddb2dc1ad57f
Merge: ea1de8443 9b4ecbaa7
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:45 2019 -0500

Merge branch 'maint-0.4.0' into release-0.4.0

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

2019-03-06 Thread nickm

commit ebb71fcff627d10789b2c67d10d9ac7a45aa265f
Merge: 64afe068f d6f77b99d
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:41 2019 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5

2019-03-06 Thread nickm

commit d6f77b99dac1a368514cfcfc1d6c5908ef6dd74a
Merge: 1c248fa27 155b0f552
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:38 2019 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.4.0] Merge branch 'maint-0.3.3' into maint-0.3.4

2019-03-06 Thread nickm

commit 155b0f5521b12c17d7e5b500c6aa7ed20fcacc12
Merge: f56645917 0c9cd7c48
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:33 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.4.0] Merge branch 'maint-0.3.4' into maint-0.3.5

2019-03-06 Thread nickm

commit d6f77b99dac1a368514cfcfc1d6c5908ef6dd74a
Merge: 1c248fa27 155b0f552
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:38 2019 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.3.4] Merge branch 'maint-0.2.9' into maint-0.3.3

2019-03-06 Thread nickm

commit 0c9cd7c487ac75d9505f46e5ff42087d383eb1b4
Merge: 76b55fde8 2e74edb53
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:29 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4

2019-03-06 Thread nickm

commit 155b0f5521b12c17d7e5b500c6aa7ed20fcacc12
Merge: f56645917 0c9cd7c48
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:33 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.3.4] Merge branch 'maint-0.3.4' into release-0.3.4

2019-03-06 Thread nickm

commit 6a342154607e6267b2cd5507f72843238846e543
Merge: 27c55d887 155b0f552
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:36 2019 -0500

Merge branch 'maint-0.3.4' into release-0.3.4

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3

2019-03-06 Thread nickm

commit 0c9cd7c487ac75d9505f46e5ff42087d383eb1b4
Merge: 76b55fde8 2e74edb53
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:29 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4

2019-03-06 Thread nickm

commit 155b0f5521b12c17d7e5b500c6aa7ed20fcacc12
Merge: f56645917 0c9cd7c48
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:33 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.3.3] Merge branch 'maint-0.2.9' into maint-0.3.3

2019-03-06 Thread nickm

commit 0c9cd7c487ac75d9505f46e5ff42087d383eb1b4
Merge: 76b55fde8 2e74edb53
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:29 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

2019-03-06 Thread nickm

commit 0e74894c5db305a75914bea769d5b1db00d8f792
Merge: 6d26fcfe8 0c9cd7c48
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:31 2019 -0500

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.3.5] Merge branch 'maint-0.2.9' into maint-0.3.3

2019-03-06 Thread nickm

commit 0c9cd7c487ac75d9505f46e5ff42087d383eb1b4
Merge: 76b55fde8 2e74edb53
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:29 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.4.0] Merge branch 'maint-0.3.4' into maint-0.3.5

2019-03-06 Thread nickm

commit d6f77b99dac1a368514cfcfc1d6c5908ef6dd74a
Merge: 1c248fa27 155b0f552
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:38 2019 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.3.3' into maint-0.3.4

2019-03-06 Thread nickm

commit 155b0f5521b12c17d7e5b500c6aa7ed20fcacc12
Merge: f56645917 0c9cd7c48
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:33 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.4.0'

2019-03-06 Thread nickm

commit 918bda25adb0e81608bb9c0caeed7eaf4345d263
Merge: db2e916af 9b4ecbaa7
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:48 2019 -0500

Merge branch 'maint-0.4.0'

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0

2019-03-06 Thread nickm

commit 9b4ecbaa7d5a19c2ddbb5e2c442e19c248930a7b
Merge: a999cb43d d6f77b99d
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:43 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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

2019-03-06 Thread nickm

commit 8cdb8f97ae4ecc11f2eb203382a32b777fbe2d36
Merge: f89eb4a02 2e74edb53
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:26 2019 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.3.4' into maint-0.3.5

2019-03-06 Thread nickm

commit d6f77b99dac1a368514cfcfc1d6c5908ef6dd74a
Merge: 1c248fa27 155b0f552
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:38 2019 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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' into maint-0.3.3

2019-03-06 Thread nickm

commit 0c9cd7c487ac75d9505f46e5ff42087d383eb1b4
Merge: 76b55fde8 2e74edb53
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:29 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.4.0] Merge branch 'maint-0.2.9' into maint-0.3.3

2019-03-06 Thread nickm

commit 0c9cd7c487ac75d9505f46e5ff42087d383eb1b4
Merge: 76b55fde8 2e74edb53
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:29 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.3.5' into maint-0.4.0

2019-03-06 Thread nickm

commit 9b4ecbaa7d5a19c2ddbb5e2c442e19c248930a7b
Merge: a999cb43d d6f77b99d
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:43 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.3.3] Merge branch 'maint-0.2.9' into maint-0.3.3

2019-03-06 Thread nickm

commit 0c9cd7c487ac75d9505f46e5ff42087d383eb1b4
Merge: 76b55fde8 2e74edb53
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:29 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5

2019-03-06 Thread nickm

commit d6f77b99dac1a368514cfcfc1d6c5908ef6dd74a
Merge: 1c248fa27 155b0f552
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:38 2019 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.4.0] Merge branch 'maint-0.3.3' into maint-0.3.4

2019-03-06 Thread nickm

commit 155b0f5521b12c17d7e5b500c6aa7ed20fcacc12
Merge: f56645917 0c9cd7c48
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:33 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4

2019-03-06 Thread nickm

commit 155b0f5521b12c17d7e5b500c6aa7ed20fcacc12
Merge: f56645917 0c9cd7c48
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:33 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4

2019-03-06 Thread nickm

commit 155b0f5521b12c17d7e5b500c6aa7ed20fcacc12
Merge: f56645917 0c9cd7c48
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:33 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 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.3.4] Merge branch 'maint-0.2.9' into maint-0.3.3

2019-03-06 Thread nickm

commit 0c9cd7c487ac75d9505f46e5ff42087d383eb1b4
Merge: 76b55fde8 2e74edb53
Author: Nick Mathewson 
Date:   Wed Mar 6 14:29:29 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/geoip-2019-03-04 | 4 +
 src/config/geoip | 12163 -
 src/config/geoip6|  2251 ++---
 3 files changed, 8221 insertions(+), 6197 deletions(-)



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

[tor-commits] [translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed

2019-03-06 Thread translation

commit 794242a2f38359416aa7e3b52ec2dce6ea801073
Author: Translation commit bot 
Date:   Wed Mar 6 15:15:44 2019 +

Update translations for donatepages-messagespot_completed
---
 locale/fr/LC_MESSAGES/messages.po | 33 -
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index af8136208..3813b7085 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -128,7 +128,7 @@ msgstr ""
 "Si vous faites un don supÃ©rieur Ã  5Â 000Â $ et que nous connaissons vos nom 
et"
 " adresse, nous sommes tenus de les dÃ©clarer Ã  lâagence du revenu des 
Ãtats-"
 "Unis dans https://www.irs.gov/pub/irs-pdf/f990ezb.pdf\;> lâannexe B du "
+"href=\"https://www.irs.gov/pub/irs-pdf/f990ezb.pdf\;>lâannexe B du "
 "formulaireÂ 990."
 
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:89
@@ -181,7 +181,7 @@ msgstr ""
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:113
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:656
 msgid "Back to Donate Page"
-msgstr "Retour vers la page Dons"
+msgstr "Retour vers la page de don"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:35
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:35
@@ -737,7 +737,7 @@ msgstr ""
 "progresser les droits de la personne et les libertÃ©s en crÃ©ant et en "
 "dÃ©ployant des technologies dâanonymat et de confidentialitÃ© gratuites et 
Ã  "
 "code source ouvert. Nous soutenons leur disponibilitÃ© et leur utilisation "
-"sans restriction, et promouvons une meilleure comprÃ©hension scientifique et "
+"sans restriction et promouvons une meilleure comprÃ©hension scientifique et "
 "populaire."
 
 #: 
tmp/cache_locale/50/50777d283fdd4725b4b51b066a1fa065079d875050e04874af7ad8d37f823d3f.php:31
@@ -1030,7 +1030,7 @@ msgid ""
 msgstr ""
 "https://www.torproject.org/docs/faq.html.en\;>Cette FAQ du ProjetÂ "
-"Tor connait les rÃ©ponses Ã  toutes ces questions et plus encore."
+"Tor connaÃ®t les rÃ©ponses Ã  toutes ces questions et plus encore."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:164
 msgid "Does the Tor software work?"
@@ -1259,7 +1259,7 @@ msgid ""
 "  Phone number: 206-420-3136\n"
 "  Contact person: Isabela Bagueros, Executive Director"
 msgstr ""
-"NumÃ©ro dâidentification fiscale du ProjetÂ Tor (no EIN)Â : 
20-8096820\n"
+"NumÃ©ro de taxe fÃ©dÃ©ral du ProjetÂ Tor (no EIN)Â : 20-8096820\n"
 "  AdresseÂ :\n"
 "  The Tor Project, Inc.\n"
 "  217 First Avenue South #4903\n"
@@ -1391,7 +1391,8 @@ msgstr ""
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:324
 msgid "Why do you ask for my address and similar information?"
 msgstr ""
-"Pourquoi me demandez-vous mon adresse et autres renseignements semblablesâ?"
+"Pourquoi me demandez-vous mon adresse et dâautres renseignements 
semblablesâ"
+"?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:328
 msgid ""
@@ -1487,7 +1488,7 @@ msgid ""
 "href=\"https://www.torproject.org/donate/donate-;
 "options.html.en#cash\">sending us a postal money order."
 msgstr ""
-"Vous pouvez faire un don enhttps://www.torproject.org/donate/donate-options.html.en#cash\;>nous "
 "envoyant un mandat-poste."
 
@@ -1736,10 +1737,7 @@ msgid ""
 "Seattle WA 98194, USA"
 msgstr ""
 "Notre adresse postale estÂ :\n"
-"The Tor Project\n"
-"217 First Avenue South #4903\n"
-"Seattle WAÂ 98194\n"
-"Ãtats-Unis dâAmÃ©rique"
+"The Tor Project, 217 First Avenue South #4903, Seattle WAÂ 98194, Ãtats-Unis 
dâAmÃ©rique"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:486
 msgid "Do you accept cash donations?"
@@ -1760,8 +1758,8 @@ msgid ""
 "by their employees."
 msgstr ""
 "Ouiâ! De nombreuses entreprises telles que Google, Microsoft, eBay, PayPal, 
"
-"Apple, Verizon, Red Hat, de nombreuses universitÃ©s et dâautres, Ã©galeront 
"
-"les dons faits par leurs employÃ©s."
+"Apple, Verizon, Red Hat, de nombreuses universitÃ©s et dâautres Ã©galeront 
les"
+" dons faits par leurs employÃ©s."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:502
 msgid ""
@@ -1816,11 +1814,11 @@ msgstr ""
 "Si vous souhaitez vous impliquer dans le ProjetÂ Tor, https://www.torproject.org/getinvolved/volunteer.html.en\;>voici un "
-"bon endroit oÃ¹ commencer.."
+"bon endroit oÃ¹ commencer."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:524
 msgid "How can I get a Tor t-shirt or stickers?"
-msgstr "Comment puis-je obtenir un tee-shirt ou des autocollants Torâ?"

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-03-06 Thread translation

commit 33c50bda93bf6010ed964eab7a824a0c46c2822c
Author: Translation commit bot 
Date:   Wed Mar 6 15:15:36 2019 +

Update translations for donatepages-messagespot
---
 locale/fr/LC_MESSAGES/messages.po | 33 -
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index af8136208..3813b7085 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -128,7 +128,7 @@ msgstr ""
 "Si vous faites un don supÃ©rieur Ã  5Â 000Â $ et que nous connaissons vos nom 
et"
 " adresse, nous sommes tenus de les dÃ©clarer Ã  lâagence du revenu des 
Ãtats-"
 "Unis dans https://www.irs.gov/pub/irs-pdf/f990ezb.pdf\;> lâannexe B du "
+"href=\"https://www.irs.gov/pub/irs-pdf/f990ezb.pdf\;>lâannexe B du "
 "formulaireÂ 990."
 
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:89
@@ -181,7 +181,7 @@ msgstr ""
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:113
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:656
 msgid "Back to Donate Page"
-msgstr "Retour vers la page Dons"
+msgstr "Retour vers la page de don"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:35
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:35
@@ -737,7 +737,7 @@ msgstr ""
 "progresser les droits de la personne et les libertÃ©s en crÃ©ant et en "
 "dÃ©ployant des technologies dâanonymat et de confidentialitÃ© gratuites et 
Ã  "
 "code source ouvert. Nous soutenons leur disponibilitÃ© et leur utilisation "
-"sans restriction, et promouvons une meilleure comprÃ©hension scientifique et "
+"sans restriction et promouvons une meilleure comprÃ©hension scientifique et "
 "populaire."
 
 #: 
tmp/cache_locale/50/50777d283fdd4725b4b51b066a1fa065079d875050e04874af7ad8d37f823d3f.php:31
@@ -1030,7 +1030,7 @@ msgid ""
 msgstr ""
 "https://www.torproject.org/docs/faq.html.en\;>Cette FAQ du ProjetÂ "
-"Tor connait les rÃ©ponses Ã  toutes ces questions et plus encore."
+"Tor connaÃ®t les rÃ©ponses Ã  toutes ces questions et plus encore."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:164
 msgid "Does the Tor software work?"
@@ -1259,7 +1259,7 @@ msgid ""
 "  Phone number: 206-420-3136\n"
 "  Contact person: Isabela Bagueros, Executive Director"
 msgstr ""
-"NumÃ©ro dâidentification fiscale du ProjetÂ Tor (no EIN)Â : 
20-8096820\n"
+"NumÃ©ro de taxe fÃ©dÃ©ral du ProjetÂ Tor (no EIN)Â : 20-8096820\n"
 "  AdresseÂ :\n"
 "  The Tor Project, Inc.\n"
 "  217 First Avenue South #4903\n"
@@ -1391,7 +1391,8 @@ msgstr ""
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:324
 msgid "Why do you ask for my address and similar information?"
 msgstr ""
-"Pourquoi me demandez-vous mon adresse et autres renseignements semblablesâ?"
+"Pourquoi me demandez-vous mon adresse et dâautres renseignements 
semblablesâ"
+"?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:328
 msgid ""
@@ -1487,7 +1488,7 @@ msgid ""
 "href=\"https://www.torproject.org/donate/donate-;
 "options.html.en#cash\">sending us a postal money order."
 msgstr ""
-"Vous pouvez faire un don enhttps://www.torproject.org/donate/donate-options.html.en#cash\;>nous "
 "envoyant un mandat-poste."
 
@@ -1736,10 +1737,7 @@ msgid ""
 "Seattle WA 98194, USA"
 msgstr ""
 "Notre adresse postale estÂ :\n"
-"The Tor Project\n"
-"217 First Avenue South #4903\n"
-"Seattle WAÂ 98194\n"
-"Ãtats-Unis dâAmÃ©rique"
+"The Tor Project, 217 First Avenue South #4903, Seattle WAÂ 98194, Ãtats-Unis 
dâAmÃ©rique"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:486
 msgid "Do you accept cash donations?"
@@ -1760,8 +1758,8 @@ msgid ""
 "by their employees."
 msgstr ""
 "Ouiâ! De nombreuses entreprises telles que Google, Microsoft, eBay, PayPal, 
"
-"Apple, Verizon, Red Hat, de nombreuses universitÃ©s et dâautres, Ã©galeront 
"
-"les dons faits par leurs employÃ©s."
+"Apple, Verizon, Red Hat, de nombreuses universitÃ©s et dâautres Ã©galeront 
les"
+" dons faits par leurs employÃ©s."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:502
 msgid ""
@@ -1816,11 +1814,11 @@ msgstr ""
 "Si vous souhaitez vous impliquer dans le ProjetÂ Tor, https://www.torproject.org/getinvolved/volunteer.html.en\;>voici un "
-"bon endroit oÃ¹ commencer.."
+"bon endroit oÃ¹ commencer."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:524
 msgid "How can I get a Tor t-shirt or stickers?"
-msgstr "Comment puis-je obtenir un tee-shirt ou des autocollants Torâ?"
+msgstr

[tor-commits] [translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed

2019-03-06 Thread translation

commit 6bf12026062ad45209552b546301038ba5035acd
Author: Translation commit bot 
Date:   Wed Mar 6 14:45:43 2019 +

Update translations for donatepages-messagespot_completed
---
 locale/fr/LC_MESSAGES/messages.po | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index c5a79526a..af8136208 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -269,7 +269,7 @@ msgstr "faire un don"
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:172
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:172
 msgid "once"
-msgstr "une fois"
+msgstr "unique"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:178
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:178
@@ -351,7 +351,9 @@ msgstr ""
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:278
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:272
 msgid "t-shirt pack"
-msgstr "paquet de tee-shirts"
+msgstr ""
+"paquet de 2\n"
+"tee-shirts"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:288
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:282
@@ -603,7 +605,7 @@ msgid ""
 " Tor robust and secure."
 msgstr ""
 "DÃ©fendez les droits universels de la personne Ã  la vie privÃ©e et Ã  la "
-"libertÃ©, et aidez Ã  assurer la robustesse et la sÃ©curitÃ© de Tor."
+"libertÃ©, et aidez-nous Ã  assurer la robustesse et la sÃ©curitÃ© de Tor."
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:656
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:663
@@ -2096,4 +2098,6 @@ msgstr "Paquet dâautocollants"
 
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:512
 msgid "T-Shirt Pack"
-msgstr "Paquet de tee-shirts"
+msgstr ""
+"Paquet de 2\n"
+"tee-shirts"

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

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-03-06 Thread translation

commit 46060cdebae6e5934996ff4ee35b894eb59f071a
Author: Translation commit bot 
Date:   Wed Mar 6 14:45:35 2019 +

Update translations for donatepages-messagespot
---
 locale/fr/LC_MESSAGES/messages.po | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index c5a79526a..af8136208 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -269,7 +269,7 @@ msgstr "faire un don"
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:172
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:172
 msgid "once"
-msgstr "une fois"
+msgstr "unique"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:178
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:178
@@ -351,7 +351,9 @@ msgstr ""
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:278
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:272
 msgid "t-shirt pack"
-msgstr "paquet de tee-shirts"
+msgstr ""
+"paquet de 2\n"
+"tee-shirts"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:288
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:282
@@ -603,7 +605,7 @@ msgid ""
 " Tor robust and secure."
 msgstr ""
 "DÃ©fendez les droits universels de la personne Ã  la vie privÃ©e et Ã  la "
-"libertÃ©, et aidez Ã  assurer la robustesse et la sÃ©curitÃ© de Tor."
+"libertÃ©, et aidez-nous Ã  assurer la robustesse et la sÃ©curitÃ© de Tor."
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:656
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:663
@@ -2096,4 +2098,6 @@ msgstr "Paquet dâautocollants"
 
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:512
 msgid "T-Shirt Pack"
-msgstr "Paquet de tee-shirts"
+msgstr ""
+"Paquet de 2\n"
+"tee-shirts"

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

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2019-03-06 Thread translation

commit be1e8fa2577f2fde783dbc072e058b1126b1573d
Author: Translation commit bot 
Date:   Wed Mar 6 14:16:28 2019 +

Update translations for liveusb-creator
---
 kk/kk.po | 32 
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/kk/kk.po b/kk/kk.po
index 71454f5e7..e30593941 100644
--- a/kk/kk.po
+++ b/kk/kk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-23 13:30+0100\n"
-"PO-Revision-Date: 2019-02-23 19:05+\n"
+"POT-Creation-Date: 2019-02-24 07:24+0100\n"
+"PO-Revision-Date: 2019-03-06 13:53+\n"
 "Last-Translator: Dinmuhamed Esengeldi \n"
 "Language-Team: Kazakh 
(http://www.transifex.com/otf/torproject/language/kk/)\n"
 "MIME-Version: 1.0\n"
@@ -54,33 +54,33 @@ msgstr "ÒÐ°ÑÐµ: Live CD Ð´Ð¸ÑÐºÑÐ½ÑÒ£ SHA1 
Ð¶Ð°ÑÐ°Ð¼ÑÑÐ·. ÐÒ±Ð» Ð±Ð°Ò
 
 #: ../tails_installer/creator.py:341
 msgid "Unknown ISO, skipping checksum verification"
-msgstr ""
+msgstr "ISO Ð±ÐµÐ»Ð³ÑÑÑÐ·, ÑÐµÐºÑÐµÑÑ ÑÐ¾Ð¼Ð°ÑÑÐ½ ÑÐµÐºÑÐµÑÑ"
 
 #: ../tails_installer/creator.py:353
 #, python-format
 msgid ""
 "Not enough free space on device.\n"
 "%dMB ISO + %dMB overlay > %dMB free space"
-msgstr ""
+msgstr "ÒÒ±ÑÑÐ»ÒÑÐ´Ð° Ð±Ð¾Ñ Ð¾ÑÑÐ½ Ð¶ÐµÑÐºÑÐ»ÑÐºÑÑÐ·.\n%dMB ISO + 
%dMB ÒÐ°Ð±Ð°ÑÑÐ°ÑÑÑÑÑ>%dMB Ð±Ð¾Ñ Ð¾ÑÑÐ½"
 
 #: ../tails_installer/creator.py:360
 #, python-format
 msgid "Creating %sMB persistent overlay"
-msgstr ""
+msgstr "ÐÐ ÑÒ±ÑÐ°ÒÑÑ ÑÑÐ³ÑÐ½ÐµÐ½ %sÒÒ±ÑÑ"
 
 #: ../tails_installer/creator.py:421
 #, python-format
 msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s"
-msgstr ""
+msgstr "ÐÓ©ÑÑÑÑ Ð¼Ò¯Ð¼ÐºÑÐ½ ÐµÐ¼ÐµÑ%(infile)sÐ´ÐµÐ¹ÑÐ½ 
%(outfile)s:%(message)s"
 
 #: ../tails_installer/creator.py:435
 msgid "Removing existing Live OS"
-msgstr ""
+msgstr "ÐÐ°Ñ Live OS Ð¶Ð¾Ñ"
 
 #: ../tails_installer/creator.py:444 ../tails_installer/creator.py:457
 #, python-format
 msgid "Unable to chmod %(file)s: %(message)s"
-msgstr ""
+msgstr "Chmod Ð¼Ò¯Ð¼ÐºÑÐ½ ÐµÐ¼ÐµÑ%(file)s:%(message)s"
 
 #: ../tails_installer/creator.py:450
 #, python-format
@@ -478,16 +478,16 @@ msgstr ""
 msgid "%(filename)s selected"
 msgstr ""
 
-#: ../tails_installer/source.py:28
+#: ../tails_installer/source.py:29
 msgid "Unable to find LiveOS on ISO"
 msgstr ""
 
-#: ../tails_installer/source.py:34
+#: ../tails_installer/source.py:35
 #, python-format
 msgid "Could not guess underlying block device: %s"
 msgstr ""
 
-#: ../tails_installer/source.py:49
+#: ../tails_installer/source.py:50
 #, python-format
 msgid ""
 "There was a problem executing `%s`.\n"
@@ -495,29 +495,29 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../tails_installer/source.py:63
+#: ../tails_installer/source.py:64
 #, python-format
 msgid "'%s' does not exist"
 msgstr ""
 
-#: ../tails_installer/source.py:65
+#: ../tails_installer/source.py:66
 #, python-format
 msgid "'%s' is not a directory"
 msgstr ""
 
-#: ../tails_installer/source.py:75
+#: ../tails_installer/source.py:76
 #, python-format
 msgid "Skipping '%(filename)s'"
 msgstr ""
 
-#: ../tails_installer/utils.py:44
+#: ../tails_installer/utils.py:55
 #, python-format
 msgid ""
 "There was a problem executing `%s`.%s\n"
 "%s"
 msgstr ""
 
-#: ../tails_installer/utils.py:124
+#: ../tails_installer/utils.py:135
 msgid "Could not open device for writing."
 msgstr ""
 

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

[tor-commits] [translation/tpo-web_completed] Update translations for tpo-web_completed

2019-03-06 Thread translation

commit c44110dfd378240a71b52788af22bf7b1d751769
Author: Translation commit bot 
Date:   Wed Mar 6 12:21:11 2019 +

Update translations for tpo-web_completed
---
 contents.pot | 1209 +-
 1 file changed, 611 insertions(+), 598 deletions(-)

diff --git a/contents.pot b/contents.pot
index ca1ad35d0..4bd221d26 100644
--- a/contents.pot
+++ b/contents.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-20 15:26+CET\n"
+"POT-Creation-Date: 2019-03-06 11:28+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -145,6 +145,8 @@ msgstr ""
 "Now](https://donate.torproject.org/)"
 
 #: https//torproject.org/about/ (content/about/contents+en.lrpage.body)
+#: https//torproject.org/about/history/
+#: (content/about/history/contents+en.lrpage.body)
 msgid ""
 "The Tor Project, Inc, became a 501(c)3 nonprofit in 2006, but the idea of "
 "âonion routingâ began in the mid 1990s."
@@ -217,106 +219,98 @@ msgstr "History"
 #: https//torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
 msgid ""
-"In the 1990s, the lack of security on the internet and its ability to be "
-"used for tracking and surveillance was becoming clear, and in 1994, the Navy"
-" Research Lab (NRL), funded by the office of Naval Research (ONR) started "
-"researching a way to communicate privately and securely online."
+"**Just like Tor users, the developers, researchers, and funders whoâve made 
"
+"Tor possible are a diverse group of people. But all of the people who have "
+"been involved in Tor are united by a common belief: internet users should "
+"have private access to an uncensored web.**"
 msgstr ""
-"In the 1990s, the lack of security on the internet and its ability to be "
-"used for tracking and surveillance was becoming clear, and in 1994, the Navy"
-" Research Lab (NRL), funded by the office of Naval Research (ONR) started "
-"researching a way to communicate privately and securely online."
+"**Just like Tor users, the developers, researchers, and funders whoâve made 
"
+"Tor possible are a diverse group of people. But all of the people who have "
+"been involved in Tor are united by a common belief: internet users should "
+"have private access to an uncensored web.**"
 
 #: https//torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
-msgid "They created the first research design and prototype of onion routing."
+msgid ""
+"In the 1990s, the lack of security on the internet and its ability to be "
+"used for tracking and surveillance was becoming clear, and in 1995, David "
+"Goldschlag, Mike Reed, and Paul Syverson at the U.S. Naval Research Lab "
+"(NRL), asked themselves if there was a way to create internet connections "
+"that donât reveal who is talking to whom, even to someone monitoring the "
+"network. Their answer was to create and deploy the first research designs "
+"and prototypes of onion routing."
 msgstr ""
-"They created the first research design and prototype of onion routing."
+"In the 1990s, the lack of security on the internet and its ability to be "
+"used for tracking and surveillance was becoming clear, and in 1995, David "
+"Goldschlag, Mike Reed, and Paul Syverson at the U.S. Naval Research Lab "
+"(NRL), asked themselves if there was a way to create internet connections "
+"that donât reveal who is talking to whom, even to someone monitoring the "
+"network. Their answer was to create and deploy the first research designs "
+"and prototypes of onion routing."
 
 #: https//torproject.org/about/history/
 #: (content/about/history/contents+en.lrpage.body)
 msgid ""
 "The goal of onion routing was to have a way to use the internet with as much"
 " privacy as possible, and the idea was to route traffic through multiple "
-"servers and encrypt it each step of the way."
+"servers and encrypt it each step of the way. This is still a simple "
+"explanation for how Tor works today."
 msgstr ""
 "The goal of onion routing was to have a way to use the internet with as much"
 " privacy as possible, and the idea was to route traffic through multiple "
-"servers and encrypt it each step of the way."
-
-#: https//torproject.org/about/history/
-#: (content/about/history/contents+en.lrpage.body)
-msgid "This is still a simple explanation for how Tor works today."
-msgstr "This is still a simple explanation for how Tor works today."
-
-#: https//torproject.org/about/history/
-#: (content/about/history/contents+en.lrpage.body)
-msgid ""
-"In 2001, Roger Dingledine, then a student at MIT, adapted code from an "
-"undergraduate Cambridge studentâs thesis and began referring to the project 
"
-"as Tor, which stood for The Onion Router."
-msgstr ""
-"In 2001, Roger Dingledine, then a student at MIT, adapted code from an "
-"undergraduate Cambridge studentâs

[tor-commits] [metrics-web/master] Make very thin ribbons more visible.

2019-03-06 Thread karsten

commit 24aa37f07397bd1ba5022842eb5b2ce10d6ce6dd
Author: Karsten Loesing 
Date:   Wed Mar 6 11:13:48 2019 +0100

Make very thin ribbons more visible.

Fixes #29655.
---
 src/main/R/rserver/rserve-init.R | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/R/rserver/rserve-init.R b/src/main/R/rserver/rserve-init.R
index 57e14f5..c412e4c 100644
--- a/src/main/R/rserver/rserve-init.R
+++ b/src/main/R/rserver/rserve-init.R
@@ -1029,7 +1029,7 @@ plot_userstats_bridge_combined <- function(start_p, 
end_p, country_p, path_p) {
 title <- paste("Bridge users by transport from ",
countryname(country_p), sep = "")
 ggplot(u, aes(x = as.Date(date), ymin = low, ymax = high,
-  fill = transport)) +
+  fill = transport, colour = transport)) +
 geom_ribbon(alpha = 0.5, size = 0.5) +
 scale_x_date(name = "", breaks = custom_breaks,
   labels = custom_labels, minor_breaks = custom_minor_breaks) +

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

[tor-commits] [sbws/master] Release v1.0.4

2019-03-06 Thread juga

commit 1bb248b84c54bfbd8a15c208d04e315356730916
Author: juga0 
Date:   Wed Mar 6 09:04:35 2019 +

Release v1.0.4

because there was a commit missing between `1.0.3` and `1.0.4-dev0`
and what is released as `1.0.3` has version `1.0.4-dev0` and it
can not be fixed now.
---
 sbws/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sbws/__init__.py b/sbws/__init__.py
index f8f55c8..9b3b7f5 100644
--- a/sbws/__init__.py
+++ b/sbws/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '1.0.4-dev0'
+__version__ = '1.0.3'
 
 import threading  # noqa
 

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

40 matches

Mail list logo