July 2015 - tor-commits - lists.torproject.org

[webwml/staging] New wording suggested by Kate
by sebastian＠torproject.org 24 Jul '15

24 Jul '15

commit 5a4bc6828b09ab31b45ade897bf3409ad18c4493 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Jul 24 04:05:37 2015 +0200 New wording suggested by Kate --- en/index.wml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/en/index.wml b/en/index.wml index 8fda0e8..c6e3406 100644 --- a/en/index.wml +++ b/en/index.wml @@ -152,11 +152,11 @@  <div id="sidecol"> <div id="home-helpus"> - <h2>A Call for Help</h2> + <h2>A New Leader for Tor</h2> <div class="fauxhead"></div> <div class="user"> <h3> - <a href="https://blog.torproject.org/blog/tor-project-launches-world-wide-search-new…">Tor needs a new Executive Directory</a> + <a href="https://blog.torproject.org/blog/tor-project-launches-world-wide-search-new…">Help Tor Find a New Executive Director</a> </h3> </div> </div>

1 0

[webwml/staging] stray commas make the frontpage ugly
by sebastian＠torproject.org 24 Jul '15

24 Jul '15

commit 2cde25f0b00531f4e69a8803233f8c4d22aff573 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Jul 24 03:47:10 2015 +0200 stray commas make the frontpage ugly --- css/typography.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/typography.css b/css/typography.css index f004fed..ee421b5 100644 --- a/css/typography.css +++ b/css/typography.css @@ -216,7 +216,7 @@ table h2, #home-our-projects h2, #home-announcements h2, #home-users h2, -#home-helpus h2, { +#home-helpus h2 { background: url(../images/table-head.jpg) left top repeat-x; color: #f6f6ed; padding-left: 10px;

1 0

[webwml/staging] try to do it more righter
by sebastian＠torproject.org 24 Jul '15

24 Jul '15

commit 872183d34c2182ccac6af3d552a14996deb068aa Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Jul 24 03:29:52 2015 +0200 try to do it more righter --- css/layout.css | 2 +- css/typography.css | 3 ++- en/index.wml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/css/layout.css b/css/layout.css index 2da6398..54d225b 100644 --- a/css/layout.css +++ b/css/layout.css @@ -278,7 +278,7 @@ body { margin-left: 20px; } - #torusers, #helpus { margin: 0 0 27px; } + #torusers { margin: 0 0 27px; } .user { margin: 0 0 12px; height: auto; diff --git a/css/typography.css b/css/typography.css index 151e65a..f004fed 100644 --- a/css/typography.css +++ b/css/typography.css @@ -215,7 +215,8 @@ p.desc { table h2, #home-our-projects h2, #home-announcements h2, -#home-users h2 { +#home-users h2, +#home-helpus h2, { background: url(../images/table-head.jpg) left top repeat-x; color: #f6f6ed; padding-left: 10px; diff --git a/en/index.wml b/en/index.wml index 2bbd348..8fda0e8 100644 --- a/en/index.wml +++ b/en/index.wml @@ -151,7 +151,7 @@ </div>  <div id="sidecol"> - <div id="helpus"> + <div id="home-helpus"> <h2>A Call for Help</h2> <div class="fauxhead"></div> <div class="user">

1 0

[webwml/staging] add css class for call for help
by sebastian＠torproject.org 24 Jul '15

24 Jul '15

commit c41f478827afa4e4640520ed679b0c105a82188e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Jul 24 03:18:01 2015 +0200 add css class for call for help --- css/layout.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/layout.css b/css/layout.css index 54d225b..2da6398 100644 --- a/css/layout.css +++ b/css/layout.css @@ -278,7 +278,7 @@ body { margin-left: 20px; } - #torusers { margin: 0 0 27px; } + #torusers, #helpus { margin: 0 0 27px; } .user { margin: 0 0 12px; height: auto;

1 0

[webwml/staging] Rework video on press page
by sebastian＠torproject.org 24 Jul '15

24 Jul '15

commit 6c54d651013c8ceedcf9b3ec56697e50ac3edbfc Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Jul 20 17:33:44 2015 +0200 Rework video on press page --- images/tor-animation.jpg | Bin 0 -> 587656 bytes press/en/press.wml | 19 ++++++++----------- press/en/video.wml | 44 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 11 deletions(-) diff --git a/images/tor-animation.jpg b/images/tor-animation.jpg new file mode 100644 index 0000000..40ec89e Binary files /dev/null and b/images/tor-animation.jpg differ diff --git a/press/en/press.wml b/press/en/press.wml index f774b65..141f0b6 100644 --- a/press/en/press.wml +++ b/press/en/press.wml @@ -16,7 +16,8 @@ <h2>Video About Tor</h2> <p> - A two-minute video explaining what Tor is and how it works. + Click on the image below for + a two-minute video explaining what Tor is and how it works. This video is available for <a href="https://media.torproject .org/video/2015-03-animation/">download</a> and streaming both on Tor Project <a href="https://blog.torproject.org/blog/ @@ -26,22 +27,18 @@ </p> <div style="text-align:center;"> -<video width="500" height="281" controls preload="none" poster="https://people.torproject.org/~nima/03-2015-Tor-Animation/Screen-Shot.jpg"> - <source src="https://media.torproject.org/video/2015-03-animation/HQ/Tor_Animation_en.we…" type="video/webm"> - <track label="English" kind="captions" src="https://people.torproject.org/~nima/03-2015-Tor-Animation/subs/vtt/en.vtt" srclang="en" default> -</video> +<a href="<page press/video>"> + <img width="500" height="282" src="$(IMGROOT)/tor-animation.jpg" alt="The Tor Animation"> +</a> </div> <h2>Media Appearances</h2> <p>Major news organizations including the New York Times, Forbes, Al Jazeera, Washington Post, Le Monde, NPR, BBC, and more have sought out -or quoted Tor Project members due to their expertise on anonymity, -privacy, and Internet censorship issues.</p> -<p>Since Tor is widely used throughout the world, it is mentioned -regularly in the press. This list is not comprehensive, but illustrates +or quoted Tor Project members due to our expertise in anonymity, +privacy, and Internet censorship issues. A sample of such media +appearances is below. This list is not comprehensive, but illustrates some of the significant Tor-related stories that have popped up.</p> -<p>A sample of such media appearances and mentions is below in order of -newest to oldest: </p> <table width="100%" cellpadding="3" cellspacing="0"> diff --git a/press/en/video.wml b/press/en/video.wml new file mode 100644 index 0000000..62dc4d3 --- /dev/null +++ b/press/en/video.wml @@ -0,0 +1,44 @@ +## translation metadata +# Revision: $Revisions$ +# Translation-Priority: 3-low + +#include "head.wmi" TITLE="Tor Project: Tor Animation" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Home » </a> + <a href="<page press/press>">Press</a> + </div> +<div id="maincol"> +  +<h1>The Tor Animation</h1> + +<br> + +<p> + A two-minute video explaining what Tor is and how it works. + This video is available for <a href="https://media.torproject + .org/video/2015-03-animation/">download</a> and streaming + both on Tor Project <a href="https://blog.torproject.org/blog/ + releasing-tor-animation">website</a> and via <a href="https://www + .youtube.com/playlist?list=PLwyU2dZ3LJErtu3GGElIa7VyORE2B6H1H"> + YouTube</a> in many different languages. +</p> +<div style="text-align:center;"> + +<video width="500" height="281" controls preload="none" poster="$(IMGROOT)/tor-animation.jpg"> + <source src="https://media.torproject.org/video/2015-03-animation/HQ/Tor_Animation_en.we…" type="video/webm"> + <track label="English" kind="captions" src="https://people.torproject.org/~nima/03-2015-Tor-Animation/subs/vtt/en.vtt" srclang="en" default> +</video> +</div> + +</div> + +<div id = "sidecol"> +#include "side.wmi" +#include "info.wmi" + </div> +  +</div> + +#include <foot.wmi> +

1 0

[webwml/staging] Merge branch 'master' into staging
by sebastian＠torproject.org 24 Jul '15

24 Jul '15

commit 8c03c2497a62d138abc2d7889c7e678147dfc72f Merge: f594383 6c54d65 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Jul 20 18:00:47 2015 +0200 Merge branch 'master' into staging

1 0

[webwml/staging] update the tshirt page with the new pic and new instructions
by sebastian＠torproject.org 24 Jul '15

24 Jul '15

commit 3001730cfd0576f9091f4b451dd54dd763e26f1e Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Jul 22 16:28:01 2015 -0400 update the tshirt page with the new pic and new instructions --- getinvolved/en/tshirt.wml | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/getinvolved/en/tshirt.wml b/getinvolved/en/tshirt.wml index a0e2c54..29d112a 100644 --- a/getinvolved/en/tshirt.wml +++ b/getinvolved/en/tshirt.wml @@ -43,24 +43,34 @@ <p> If you get such a mail, or you've done something else cool, - email us at tshirt(a)torproject.org with the details. There's no need - to include a mailing address yet, you'll receive a link where you - can enter your shipping information. + email us at tshirt(a)torproject.org with the details. </p> <p> - You can choose between the traditional black and our conversation-starting - bright green. You can also see the shirts - <a href="<wiki>doc/TorShirt">in - action</a> — add your own photos there too. + The nice people at torservers.net + are handling the tshirt requests. They have <a + href="https://www.torservers.net/wiki/ttshirt/index">a variety of + colors, shapes, and sizes</a>, using the great new "roots" design + that Leiah Jansen made for us. </p> <div style="text-align: center"> - <a href="$(IMGROOT)/black-tor-tshirt.png"><img - src="$(IMGROOT)/black-tor-tshirt.png"></a> - <a href="$(IMGROOT)/green-tor-tshirt.png"><img - src="$(IMGROOT)/green-tor-tshirt.png"></a> + <a href="$(IMGROOT)/torshirtsob.jpg"><img + src="$(IMGROOT)/torshirtsob.jpg"></a> </div> + + <p> + In the past, you could choose between the traditional <a + href="$(IMGROOT)/black-tor-tshirt.png">black</a> and our <a + href="$(IMGROOT)/green-tor-tshirt.png">conversation-starting bright + green</a>. We'll bring those shirts back one day too. + </p> + + <p> + You can see the shirts <a href="<wiki>doc/TorShirt">in + action</a> — add your own photos there too. + </p> + </div>  <div id = "sidecol"> @@ -71,3 +81,4 @@ </div>  #include <foot.wmi> +

1 0

[webwml/staging] add our latest funder
by sebastian＠torproject.org 24 Jul '15

24 Jul '15

commit 9cf698ab151ef9a0b39682b27e82d959d03ed177 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jul 21 02:54:59 2015 -0400 add our latest funder (they're subsidizing some of the upcoming dev meeting) --- about/en/sponsors.wml | 1 + 1 file changed, 1 insertion(+) diff --git a/about/en/sponsors.wml b/about/en/sponsors.wml index 0c2cfdd..90e3f4f 100644 --- a/about/en/sponsors.wml +++ b/about/en/sponsors.wml @@ -30,6 +30,7 @@ <li><a href="http://www.rfa.org/english/">Radio Free Asia</a> (2012-2016)</li> <li><a href="http://nsf.gov/">National Science Foundation</a> joint with Georgia Tech and Princeton University (2012-2016)</li> <li><a href="http://nsf.gov/">National Science Foundation</a> via University of Minnesota (2013-2017)</li> + <li><a href="http://www.auswaertiges-amt.de/">Federal Foreign Office of Germany</a> (2015)</li> <li><a href="https://digitaldefenders.org/">Hivos/The Digital Defenders Partnership</a> (2014-2015)</li> <li><a href="http://www.sri.com/">SRI International</a> (2011-2015)</li> <li><a href="http://www.state.gov/j/drl/">US Department of State Bureau of Democracy, Human Rights, and Labor</a> (2013-2016)</li>

1 0

[webwml/staging] add a picture of the new roots tshirt
by sebastian＠torproject.org 24 Jul '15

24 Jul '15

commit 79d7486c6f574d01138081f653a9dec9b7757832 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Jul 22 16:22:30 2015 -0400 add a picture of the new roots tshirt (picture courtesy torservers.net and juris) --- images/torshirtsob.jpg | Bin 0 -> 34488 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/images/torshirtsob.jpg b/images/torshirtsob.jpg new file mode 100644 index 0000000..3735cdd Binary files /dev/null and b/images/torshirtsob.jpg differ

1 0

[webwml/staging] add a note about how we shouldn't be sending 5 shirts at once
by sebastian＠torproject.org 24 Jul '15

24 Jul '15

commit 3df5cb1f91ae90b8a302d5c08e0f82747beecc9c Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Jul 22 16:57:59 2015 -0400 add a note about how we shouldn't be sending 5 shirts at once --- getinvolved/en/tshirt.wml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/getinvolved/en/tshirt.wml b/getinvolved/en/tshirt.wml index 29d112a..0198d0d 100644 --- a/getinvolved/en/tshirt.wml +++ b/getinvolved/en/tshirt.wml @@ -37,13 +37,14 @@ The <a href="https://weather.torproject.org/">Tor Weather</a> system watches all of the relays. If you have a valid email address (lightly obfuscated is acceptable) in your ContactInfo field, - we'll automatically email you when your relay earns you a free - t-shirt. + we'll automatically email you when your relay earns you a t-shirt. </p> <p> - If you get such a mail, or you've done something else cool, - email us at tshirt(a)torproject.org with the details. + If you get such a mail, or you've done something else cool, email + us at tshirt(a)torproject.org with the details. (We want to make sure + our shirts help outreach happen all around the world, so please + understand if we can't send you 5 shirts for your 5 excellent relays.) </p> <p>

1 0