- tor-commits - lists.torproject.org

[webwml/staging] change links to use our page macro
by arma＠torproject.org 15 Dec '15

15 Dec '15

commit 3e47ef0a88243410d079735f115959d916c4852e Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Dec 9 18:21:02 2015 -0500 change links to use our page macro --- donate/en/donor-faq.wml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/donate/en/donor-faq.wml b/donate/en/donor-faq.wml index 1a1aba5..c6816ad 100644 --- a/donate/en/donor-faq.wml +++ b/donate/en/donor-faq.wml @@ -33,7 +33,7 @@ by the Tor Project. The paid staff of the Tor Project is very small: about 20 people in total. You can read about the core contributors to the Tor Project on our <a - href="https://www.torproject.org/about/corepeople.html.en" + href="<page about/corepeople>" target="_blank">Core People page</a>.</p> </li> <li> @@ -48,14 +48,14 @@ <p><strong>Can anyone use Tor?</strong></p> <p>Yes! Tor is free, and anyone can use it. To get started, you will need to <a - href="https://www.torproject.org/projects/torbrowser.html.en" + href="<page projects/torbrowser>" target="_blank">download the Tor browser</a>. We offer instructions on how to download for <a - href="https://www.torproject.org/projects/torbrowser.html.en#windows" + href="<page projects/torbrowser>#windows" target="_blank">Windows</a>, <a - href="https://www.torproject.org/projects/torbrowser.html.en#macosx" + href="<page projects/torbrowser>#macosx" target="_blank">Mac OS X</a> and <a - href="https://www.torproject.org/projects/torbrowser.html.en#linux" + href="<page projects/torbrowser>#linux" target="_blank">Linux</a>.</p> </li> <li> @@ -83,13 +83,13 @@ from finding out what sites you are visiting. It also prevents sites you visit from finding out where you're located. You can read more about how Tor works on our <a - href="https://www.torproject.org/about/overview.html.en" + href="<page about/overview>" target="_blank">overview page</a>.</p> </li> <li> <p><strong>I would like to know more about how Tor works, what hidden services are, or how to run a relay.</strong></p> - <p><a href="https://www.torproject.org/docs/faq.html.en" + <p><a href="<page docs/faq>" target="_blank">This Tor Project FAQ</a> has answers to all those questions, and more.</p> </li> @@ -127,7 +127,7 @@ <p><strong>Where can I find out more about the Tor Project, especially financial information?</strong></p> <p>Here are the Tor Project's <a - href="https://www.torproject.org/about/financials.html.en" + href="<page about/financials>" target="_blank">financial statements, and its Form 990</a>.</p> </li> @@ -140,8 +140,8 @@ from people like you. The exact percentage varies by year, but in any given year, 80-90% of the Tor Project's funding comes from United States government funding sources. See - <a href="https://www.torproject.org/about/sponsors.html.en" - target="_blank">https://www.torproject.org/about/sponsors.html.en</a> + <a href="<page about/sponsors>" + target="_blank">https://www.torproject.org/about/sponsors</a> for more.</p> </li> <li> @@ -252,7 +252,7 @@ <li> <p><strong>Can I donate via bitcoin?</strong></p> <p>Yes! We accept <a - href="https://www.torproject.org/donate/donate-options.html.en" + href="<page donate/donate-options>" target="_blank">bitcoin via BitPay</a>.</p> </li> <li> @@ -305,7 +305,7 @@ in a different country, let us know and we will try to offer tax-deductibility in your country in future. Or, if you are in Germany, France or Sweden, <a - href="https://www.torproject.org/docs/faq.html.en#RelayDonations" + href="<page docs/faq>#RelayDonations" target="_blank">these organizations support the Tor network</a> and may be able to offer you tax-deductibility for your donation.</p> @@ -314,13 +314,13 @@ <p><strong>What if I don't want to use PayPal? Is there another way I can donate? </strong></p> <p>Yes! Here is a list of <a - href="https://www.torproject.org/donate/donate-options.html.en" + href="<page donate/donate-options>" target="_blank">other ways you can donate</a>.</p> </li> <li> <p><strong>What is your donor privacy policy?</strong></p> <p>Here is the Tor Project <a - href="donor-privacy-policy.html.en" target="_blank">donor + href="<page donate/donor-privacy-policy>" target="_blank">donor privacy policy</a>.</p> </li> <li> @@ -406,7 +406,7 @@ <li> <p><strong>Can I donate my time?</strong></p> <p>Yes. Here's a <a - href="https://www.torproject.org/getinvolved/volunteer.html.en" + href="<page getinvolved/volunteer>" target="_blank">list of areas where we would love your help</a>.</p> </li> @@ -418,7 +418,7 @@ company may operate a corporate foundation that gives out grants, and if so, you should encourage it to fund us. Maybe your company would be willing to <a - href="https://www.torproject.org/docs/faq.html.en#HowDoIDecide" + href="<page docs/faq>#HowDoIDecide" target="_blank">operate a Tor relay</a>. If your company sells cloud services, perhaps it could donate these to Tor: We use them in some anti-censorship projects.</p>

1 0

[webwml/staging] Revert "New wording suggested by Kate"
by arma＠torproject.org 15 Dec '15

15 Dec '15

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

1 0

[webwml/staging] Revert "try to do it more righter"
by arma＠torproject.org 15 Dec '15

15 Dec '15

commit 754b7f59addd05e63c86b915e9255753539f3a9e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Dec 10 09:45:52 2015 +0100 Revert "try to do it more righter" This reverts commit 872183d34c2182ccac6af3d552a14996deb068aa. --- css/layout.css | 2 +- css/typography.css | 3 +-- en/index.wml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/css/layout.css b/css/layout.css index 4908ee0..89f835f 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; diff --git a/css/typography.css b/css/typography.css index f004fed..151e65a 100644 --- a/css/typography.css +++ b/css/typography.css @@ -215,8 +215,7 @@ p.desc { table h2, #home-our-projects h2, #home-announcements h2, -#home-users h2, -#home-helpus h2, { +#home-users 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 8fda0e8..2bbd348 100644 --- a/en/index.wml +++ b/en/index.wml @@ -151,7 +151,7 @@ </div>  <div id="sidecol"> - <div id="home-helpus"> + <div id="helpus"> <h2>A Call for Help</h2> <div class="fauxhead"></div> <div class="user">

1 0

[webwml/staging] Revert "smaller font for new ED text"
by arma＠torproject.org 15 Dec '15

15 Dec '15

commit 4d4819580b9374d51e7593d74bd566863e9130fb Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Dec 10 09:45:30 2015 +0100 Revert "smaller font for new ED text" This reverts commit 591edd55105f8e01da6306127568a7501fbc4877. --- en/index.wml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/en/index.wml b/en/index.wml index c44ced1..c6e3406 100644 --- a/en/index.wml +++ b/en/index.wml @@ -155,9 +155,9 @@ <h2>A New Leader for Tor</h2> <div class="fauxhead"></div> <div class="user"> - <h4> + <h3> <a href="https://blog.torproject.org/blog/tor-project-launches-world-wide-search-new…">Help Tor Find a New Executive Director</a> - </h4> + </h3> </div> </div>

1 0

[webwml/staging] Revert "stray commas make the frontpage ugly"
by arma＠torproject.org 15 Dec '15

15 Dec '15

commit 18d67631606daf87ef19c69fefa86c3d108d6c53 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Dec 10 09:45:44 2015 +0100 Revert "stray commas make the frontpage ugly" This reverts commit 2cde25f0b00531f4e69a8803233f8c4d22aff573. --- css/typography.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/typography.css b/css/typography.css index ee421b5..f004fed 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] Revert "Add call for help for new director"
by arma＠torproject.org 15 Dec '15

15 Dec '15

commit d1abd273d22c359d137f1426ccae4e42fd020654 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Dec 10 09:46:05 2015 +0100 Revert "Add call for help for new director" This reverts commit 6572a524db44acc189c33481eb13f613ecf7c9e6. --- en/index.wml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/en/index.wml b/en/index.wml index 2bbd348..fededd4 100644 --- a/en/index.wml +++ b/en/index.wml @@ -151,15 +151,6 @@ </div>  <div id="sidecol"> - <div id="helpus"> - <h2>A Call for Help</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> - </h3> - </div> - </div>  #include <blog-recent.wmi>

1 0

[webwml/staging] Revert "add css class for call for help"
by arma＠torproject.org 15 Dec '15

15 Dec '15

commit 7b9829996bef44709bf1e55799dab20a1a614d45 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Dec 10 09:45:58 2015 +0100 Revert "add css class for call for help" This reverts commit c41f478827afa4e4640520ed679b0c105a82188e. --- css/layout.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/layout.css b/css/layout.css index 89f835f..4908ee0 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;

1 0

[webwml/staging] fix the 'about' and 'contact' links from the donate page
by arma＠torproject.org 15 Dec '15

15 Dec '15

commit 0c76ed024e7b8a284592ce7055c8f67319bfe3ee Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Dec 11 02:15:54 2015 -0500 fix the 'about' and 'contact' links from the donate page should address ticket #17814 --- include/donatehead.wmi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/donatehead.wmi b/include/donatehead.wmi index 29145f5..04a5bf1 100644 --- a/include/donatehead.wmi +++ b/include/donatehead.wmi @@ -34,8 +34,8 @@ </div> <ul id="navbar" class="nav navbar-nav navbar-right"> <li><a href="<page index>">Home</a></li> - <li><a href="<page index>/about">About</a></li> - <li><a href="<page index>/contact">Contact</a></li> + <li><a href="<page about/overview>">About</a></li> + <li><a href="<page about/contact>">Contact</a></li> </ul> </div> </nav>

1 0

[webwml/staging] Welcome, Shari!
by arma＠torproject.org 15 Dec '15

15 Dec '15

commit 7eb70a51ac3fac14ddc652929b3136290d3f3898 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 11 08:26:09 2015 -0500 Welcome, Shari! (My plan is that we'll put this entry into the alphabetical order in a month or two.) --- about/en/corepeople.wml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index b155c6b..4873932 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -26,6 +26,16 @@ <h1>Core Tor People</h1> <dl> + <dt>Shari Steele, Executive Director</dt> + <dd>Shari comes to the Tor Project with more than 22 years + of experience fighting for Internet freedom at the + <a href="https://www.eff.org/">Electronic Frontier + Foundation</a> (EFF), a nonprofit civil liberties + organization working for digital rights. Shari started out + as a staff attorney at EFF and worked her way up to the + executive director job. She currently serves on EFF's board. + </dd> + <dt>Sherief Alaa, Support</dt> <dd>Arabic translator, worked on videos and documentation and helps respond to users who contacted the support desk.</dd>

1 0

[webwml/staging] bump stable version to 0.2.7.6
by arma＠torproject.org 15 Dec '15

15 Dec '15

commit 22f13c93a878f2c7c7b9db102b26403b9f25b991 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 10 19:27:15 2015 -0500 bump stable version to 0.2.7.6 --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7897228..2b681f0 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # website component, and set it to needs_review. export STABLETAG=tor-0.2.6.10 -export DEVTAG=tor-0.2.7.5 +export DEVTAG=tor-0.2.7.6 WMLBASE=. diff --git a/include/versions.wmi b/include/versions.wmi index e05d00c..3832e40 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.6.10</define-tag> -<define-tag version-alpha whitespace=delete>0.2.7.5</define-tag> +<define-tag version-alpha whitespace=delete>0.2.7.6</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.6.10</define-tag>

1 0