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

[webwml/staging] Add coredev job posting
by sebastian＠torproject.org 22 Nov '16

22 Nov '16

commit 48089f34a710f3a9c712292e36bd3d7e6ca8cbb5 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 23 02:16:44 2016 +0100 Add coredev job posting --- about/en/jobs-coredev.wml | 190 +++++++++++++++++++++++----------------------- about/en/jobs.wml | 1 + 2 files changed, 97 insertions(+), 94 deletions(-) diff --git a/about/en/jobs-coredev.wml b/about/en/jobs-coredev.wml index acd324b..8fd9292 100644 --- a/about/en/jobs-coredev.wml +++ b/about/en/jobs-coredev.wml @@ -10,124 +10,126 @@ <a href="<page about/jobs>">Jobs</a> </div> <div id="maincol"> -<h1>The Tor Project is looking for another dedicated core developer!</h1> -<h1>Note: we've filled this position for now, but we hope to be looking -for another core developer in the future.</h1> +<h1>The Tor Project is looking for dedicated core developer!</h1> +<h2>(Posted November 22, 2016)</h2> <p> Your job would be to work on all aspects of the main Tor network daemon and other open-source software. - -This would be a contractor position starting in 2013 (with plenty of -work to keep you busy), with the possibility of 2014 and beyond. </p> - <p> -Any candidate must: +As a core developer, your job with Tor Project will be to work on all +aspects of the main Tor network daemon and other open-source software. +This would include triaging, diagnosing, and fixing bugs; looking for +and resolving security issues; occasionally dropping everything and +scrambling to implement last-minute anticensorship schemes or deploy +urgent security updates; and working collaboratively with coworkers and +volunteers on implementing new features and protocol changes at every +stage from design to maintenance. +</p> +<p> +We are working to make our code more scalable, testable, and +maintainable. You would be reviewing other people's code and designs, +looking for ways to improve it. For an idea of the breadth and depth of +the work you'd be doing, please see ChangeLog file from the Tor source +distribution: https://gitweb.torproject.org/tor.git/tree/ChangeLog +</p> +<p> +This is a full-time remote position. Flexible salary, depending on +experience. Experience and/or passion for working with open source +communities and/or a commitment to Internet civil liberties are added +pluses for any candidate applying for this position! </p> +<h2> +Expected skills and experience: +</h2> <ul> - <li>Have extensive experience in C, and several other programming - languages. At least 5 years experience with C is probably - necessary for the level of expertise we want; most people would - need more.</li> - <li>Have a solid understanding of issues surrounding secure - C programming.</li> - <li>Be comfortable working remotely.</li> - <li>Be familiar and experienced with nonblocking, event-driven - networking programs.</li> - <li>Be comfortable and experienced with interacting with users online.</li> - <li>Be comfortable and experienced with driving the entire - lifecycle of a new feature in an existing piece of software, - from design to implementation to testing.</li> - <li>Be comfortable and experienced getting code and design - reviewed, and reviewing the code and design of others.</li> - <li>Be comfortable with transparency: as a non-profit, everything - we do is in public, including your name and pay rate.</li> +<li>5+ years’ experience in C and several other programming languages</li> +<li>Solid understanding of secure C programming issues</li> +<li>Comfort working remotely and managing your own workflow with limited +supervision</li> +<li>Experience and comfort interacting with users, coworkers, and team members +online</li> +<li>Ability to comfortably drive the entire lifecycle of a new feature in an +existing piece of software from design, to implementation, to testing, to +maintenance</li> +<li>Experience and comfort with peer review of your own code and design, and +with your reviewing of others’ code and design</li> +<li> nsparency! As a non-profit, everything Tor Project does is public, +including your name and pay rate</li> </ul> -<p> -An ideal candidate would also: -</p> +<h2> +Desired skills and experience: +</h2> <ul> - <li>Know enough of the basics of cryptography in order to - understand how to implement our protocols and discuss changes - to them. (Actually implementing block ciphers and stuff like - that isn't necessary.)</li> - <li>Know enough about networking in order to understand how to - implement our protocols and discuss changes to them.</li> - <li>Have experience with high-performance networking code.</li> - <li>Have experience with open-source software development, - including working with distributed teams across different - time-zones containing employees and volunteers of differing - skill levels over email and IRC.</li> - <li>Have basic familiarity with distributed version control - systems.</li> - <li>Have contributed significant chunks of code to multiple - open-source projects in the past.</li> - <li>Genuinely be excited about Tor and our values.</li> +<li>Knowledge of cryptography basics: be able to understand how to implement +our protocols and discuss changes to them (the ability to actually implement +block ciphers and stuff like that is not necessary)</li> +<li>Sufficient level of networking knowledge to understand how to implement +our protocols and discuss changes to them</li> +<li>Experience with high-performance networking code</li> +<li>Experience with open-source software development, including working over +email and IRC with a globally distributed teams of employees and volunteers of +varying skill levels</li> +<li>Basic familiarity with distributed version control systems</li> +<li>Familiarity and experience with non-blocking, event-driven networking +programs</li> +<li>History of significant code contributions to multiple open-source +projects</li> +<li>Genuine excitement about Tor and its values! Follow this link to view +the Tor Project social contract: +https://blog.torproject.org/blog/tor-social-contract</li> </ul> -<p> -Being a core Tor developer includes triaging, diagnosing, and -fixing bugs; looking for and resolving security issues; and working -collaboratively with coworkers and volunteers on implementing -new features and protocol changes at every stage from design to -maintenance. We'd also need help making our code more scalable, -testable, and maintainable. Sometimes, we need to drop everything -and scramble to implement last-minute anticensorship schemes, or to -deploy urgent security updates. You'd also be reviewing other people's -code and designs, and looking for ways to improve it. For an idea of -the breadth and depth of the work you'd be doing, have a look at <a -href="https://gitweb.torproject.org/tor.git/tree/ChangeLog">the -ChangeLog file from the Tor source distribution</a>. -</p> - -<p> +<h2> Other notes: -</p> +</h2> <ul> - <li>You'll need to be comfortable in this environment! We - coordinate via IRC, instant messaging, email, and bug - trackers.</li> - <li>Academic degrees are great, but not required if you have - the right experience.</li> - <li>We only write free and open source software, and we don't - believe in software patents.</li> +<li>Academic degrees are great, but not required if you have the right +experience.</li> +<li>Tor developers don't have an office; you can work from wherever you want, +so you need to be comfortable in this environment! We coordinate via IRC, +email, and bug trackers.</li> +<li>We only write free (open source) software, and we don't believe in software +patents.</li> </ul> <p> -How to apply: +The Tor Project, Inc., is a 501(c)(3) organization headquartered in Seattle +that provides the technical infrastructure for privacy protection over the +Internet. With paid staff and contractors of around 30 technologists and +operational support people, plus many volunteers all over the world who +contribute to our work, the Tor Project is funded in part by government grants +and contracts, as well as by individual, foundation, and corporate donations. +Our mission statement: “To advance human rights and freedoms by creating and +deploying free and open anonymity and privacy technologies, supporting their +unrestricted availability and use, and furthering their scientific and popular +understanding.” </p> - -<ul> - <li>Link to a sample of code you've written in the past that - you're allowed to show us.</li> - <li>Provide a CV explaining your background, experience, skills, - and other relevant qualifications.</li> - <li>List some people who can tell us more about you: these - references could be employers or coworkers, open source projects, - etc.</li> - <li>Email the above to jobs at torproject.org.</li> -</ul> - <p> -About the company:<br> - The Tor Project is a US 501(c)(3) non-profit dedicated to research, - development, and education about online anonymity and privacy. The Tor - network's 3000 volunteer relays carry 16 Gbps for upwards of half a - million daily users, including ordinary citizens who want protection - from identity theft and prying corporations, corporations who want - to look at a competitor's website in private, people around the world - whose Internet connections are censored, and even governments and law - enforcement. Tor has a staff of 14 paid developers, researchers, and - advocates, plus many dozen volunteers who help out on a daily basis. Tor - is funded in part by government research and development grants, and - in part by individual and corporate donations. +The Tor Project has a competitive benefits package, including a generous PTO +policy; 14 paid holidays per year (including the week between Christmas and New +Year's, when the office is closed); health, vision, dental, disability, and +life insurance paid in full for employee; flexible work schedule; and +occasional travel opportunities. The Tor Project, Inc., is an equal +opportunity, affirmative action employer. +</p> +<p> +To apply, please email your CV to hr(a)torproject.org with “Core Developer” in +the subject line. You should include a link to your code sample(s); more than +one sample is ideal – if we can't see how you code, we can’t tell how good you +are. Your CV should detail your background, experience, skills, and other +relevant qualifications, and should include three professional references +(co-workers, open source projects, supervisors). +</p> +<p> +Deadline for applications is December 31, 2016. We look forward to hearing from +you! </p> - </div>  <div id = "sidecol"> diff --git a/about/en/jobs.wml b/about/en/jobs.wml index edcda90..edb3547 100644 --- a/about/en/jobs.wml +++ b/about/en/jobs.wml @@ -20,6 +20,7 @@ </p> <ul> <li><a href="<page about/jobs-ooni-ux-designer>">UX Designer - OONI</a></li> +<li><a href="<page about/jobs-coredev>">Core Developer</a></li> #<li><a href="<page about/jobs-editor>">Writer/Editor</a></li> #<li><a href="<page about/jobs-admin-assistant>">Administrative Assistant</a></li> </ul>

1 0

[webwml/staging] Redirect /PT as well as /PT/
by sebastian＠torproject.org 22 Nov '16

22 Nov '16

commit 40a25260bb811f36611ac47cdacbdf36182a0e5b Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 23 02:34:19 2016 +0100 Redirect /PT as well as /PT/ Implements #20730, thanks dcf --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 3e351c3..5d0277a 100644 --- a/.htaccess +++ b/.htaccess @@ -31,7 +31,7 @@ RewriteRule ^press/index.html(.*) /press/press.html$1 [R=301,L] RewriteRule ^projects/$ /projects/projects [R=301,L] #Pluggable Transports -RewriteRule ^PT/$ /docs/pluggable-transports [R=301,L] +RewriteRule ^PT/?$ /docs/pluggable-transports [R=301,L] RewriteRule ^projects/obfsproxy-debian-instructions(.*) /docs/pluggable-transports [R=410,L] RewriteRule ^projects/obfsproxy-instructions(.*) /docs/pluggable-transports [R=410,L] RewriteRule ^projects/obfsproxy(.*) /docs/pluggable-transports [R=301,L]

1 0

[webwml/staging] Merge branch 'master' into staging
by sebastian＠torproject.org 22 Nov '16

22 Nov '16

1 0

[webwml/master] We retired tor cloud
by sebastian＠torproject.org 22 Nov '16

22 Nov '16

commit 3d4b87980c8e2bb16fb8292f9438cf87966aeb47 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 23 02:33:11 2016 +0100 We retired tor cloud fixes #20675, thanks cypherpunks --- getinvolved/en/relays.wml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/getinvolved/en/relays.wml b/getinvolved/en/relays.wml index edce858..ebe6295 100644 --- a/getinvolved/en/relays.wml +++ b/getinvolved/en/relays.wml @@ -39,12 +39,11 @@ href="https://media.torproject.org/video/2012-03-04-BuildingBridges-HD-spanish.o people who run Tor as a relay or a bridge, the faster and safer the network becomes.</p> -<h1>Three ways to join and help out</h1> +<h1>Two ways to join and help out</h1> <hr> <ul class="hlist"> -<li><a href="#diy">Run it yourself.</a></li> -<li><a href="#cloud">Run it in the cloud.</a></li> -<li class="last"><a href="#donate">Donate to others to run it for +<li><a href="#diy">Run it yourself,</a></li> +<li class="last"><a href="#donate"> or donate to others to run it for you.</a></li> </ul>

1 0

[webwml/master] Clean up unused donate pages
by sebastian＠torproject.org 22 Nov '16

22 Nov '16

commit 973ede2fb7949b812074bbe9f9ade47493684e31 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 23 02:29:29 2016 +0100 Clean up unused donate pages --- about/en/contact.wml | 2 +- donate/en/donate-amazon.wml | 42 -------- donate/en/donate-appelbaum.wml | 0 donate/en/donate-banner.wml | 0 donate/en/donate-blog-alison.wml | 0 donate/en/donate-blog-benw.wml | 0 donate/en/donate-blog-cory.wml | 0 donate/en/donate-blog-ellsberg.wml | 0 donate/en/donate-blog-landau.wml | 0 donate/en/donate-blog-molly.wml | 0 donate/en/donate-blog-nanni.wml | 0 donate/en/donate-blog-rabbirob.wml | 0 donate/en/donate-chaos.wml | 0 donate/en/donate-download.wml | 0 donate/en/donate-george-torwell.wml | 0 donate/en/donate-hardware.wml | 35 ------- donate/en/donate-hp.wml | 0 donate/en/donate-hpbanner.wml | 0 donate/en/donate-roger.wml | 0 donate/en/donate-service.wml | 45 -------- donate/en/donate-snowden.wml | 0 donate/en/donate-tbb.wml | 0 donate/en/donate-twitter.wml | 0 donate/en/donate.wml | 203 ------------------------------------ 24 files changed, 1 insertion(+), 326 deletions(-) diff --git a/about/en/contact.wml b/about/en/contact.wml index 1668cbd..055e001 100644 --- a/about/en/contact.wml +++ b/about/en/contact.wml @@ -94,7 +94,7 @@ <ul> <li><i>donations(a)torproject.org</i> is for questions and comments about <a - href="<page donate/donate>">getting money to the developers</a>. More + href="https://donate.torproject.org">getting money to the developers</a>. More donations means <a href="<page docs/faq>#Funding">more Tor</a>. We're happy to help think about creative ways for you to contribute.</li> diff --git a/donate/en/donate-amazon.wml b/donate/en/donate-amazon.wml deleted file mode 100644 index 591b97b..0000000 --- a/donate/en/donate-amazon.wml +++ /dev/null @@ -1,42 +0,0 @@ -## translation metadata -# Revision: $Revision$ -# Translation-Priority: 3-low - -#include "head.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8" -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page donate/donate>">Donate</a> - </div> -<div id="maincol"> - -<script async src="https://static-na.payments-amazon.com/OffAmazonPayments/us/js/Widgets.js"></script> -<div - data-ap-widget-type="expressDonationWidget" - data-ap-widget-theme="ap-light" - data-ap-widget-amount-presets="5,25,50,100" - data-ap-widget-default-amount="1" - data-ap-signature="%2B6UiARhqtXOPGLHP%2F6DrD3zH68ZHxmA9tBLjfjJ3jYU%3D" - data-ap-seller-id="A3KD3XX49657E7" - data-ap-access-key="AKIAISELZYVMUQ7F5M7Q" - data-ap-lwa-client-id="amzn1.application-oa2-client.b0b3efe8eb6841ed800ff2cc45b12dba" - data-ap-return-url="https://www.torproject.org/donate/thankyou" - data-ap-currency-code="USD" - data-ap-amount="0" - data-ap-note="Thank you for your donation to The Tor Project. The Tor Project is a 501c3 organization, and our federal tax ID number is 20-8096820. Your gift is tax deductible in the United States as allowed by law. The Tor Project respects the confidentiality of its supporters, and we do not lend, rent, or sell our lists of donors at any time. Your donation enables Tor developers to focus on making Tor better, including scalability, user support and better documentation, usability and incentives, and research into better privacy approaches. If you would like to keep in touch or get more involved, please visit us at www.torproject.org. Our mission is to advance human rights and freedoms by creating and deploying free and open anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding. " - data-ap-shipping-address-required="false" - data-ap-payment-action="AuthorizeAndCapture" -> -</div> - - - -</div> - <div id = "sidecol"> -#include "side-donate.wmi" -#include "info.wmi" - </div> -  - -</div> -#include <foot.wmi> diff --git a/donate/en/donate-appelbaum.wml b/donate/en/donate-appelbaum.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-banner.wml b/donate/en/donate-banner.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-blog-alison.wml b/donate/en/donate-blog-alison.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-blog-benw.wml b/donate/en/donate-blog-benw.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-blog-cory.wml b/donate/en/donate-blog-cory.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-blog-ellsberg.wml b/donate/en/donate-blog-ellsberg.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-blog-landau.wml b/donate/en/donate-blog-landau.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-blog-molly.wml b/donate/en/donate-blog-molly.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-blog-nanni.wml b/donate/en/donate-blog-nanni.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-blog-rabbirob.wml b/donate/en/donate-blog-rabbirob.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-chaos.wml b/donate/en/donate-chaos.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-download.wml b/donate/en/donate-download.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-george-torwell.wml b/donate/en/donate-george-torwell.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-hardware.wml b/donate/en/donate-hardware.wml deleted file mode 100644 index 6dbe35d..0000000 --- a/donate/en/donate-hardware.wml +++ /dev/null @@ -1,35 +0,0 @@ -## translation metadata -# Revision: $Revision$ -# Translation-Priority: 3-low - -#include "head.wmi" TITLE="Tor Project: Donate Hardware to Tor" CHARSET="UTF-8" -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page donate/donate-hardware>">Donate Hardware</a> - </div> - <div id="maincol"> - <h1>Hardware Donations</h1> - <p>We're generally looking for donated hardware and support services - that could be used to provide the infrastructure that supports - Tor's operations, including website mirrors, database servers, build - systems and legacy hardware for supporting packages on older Operating - Systems; Windows 7, Redhat, CentOS, Fedora, Debian, etc. A number of - service providers have an abundance of bandwidth capacity, but need - hardware in order to donate it to us.</p> - - <p>By donating hardware, you're joining our many <a href="<page - about/sponsors>">sponsors</a> in providing online privacy and anonymity. If - you want Tor to work on your architecture or hardware, a fine way to - do this is to donate the hardware and operating system to us. Contact - us at donations(a)torproject.org for more details.</p> - </div> -  - <div id = "sidecol"> -#include "side-donate.wmi" -#include "info.wmi" - </div> -  -</div> - -#include <foot.wmi> diff --git a/donate/en/donate-hp.wml b/donate/en/donate-hp.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-hpbanner.wml b/donate/en/donate-hpbanner.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-roger.wml b/donate/en/donate-roger.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-service.wml b/donate/en/donate-service.wml deleted file mode 100644 index 19f7f7a..0000000 --- a/donate/en/donate-service.wml +++ /dev/null @@ -1,45 +0,0 @@ -## translation metadata -# Revision: $Revision$ -# Translation-Priority: 3-low - -#include "head.wmi" TITLE="Tor Project: Donate Services to Tor" CHARSET="UTF-8" -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page donate/donate-service>">Donate Services</a> - </div> - <div id="maincol"> - <h1>Service Donations</h1> - <p>The Tor Project is always looking for services relating to - technical needs, like bandwidth, colocation, hosted services, legal - representation, or consulting. By donating services, you join our many - sponsors in providing online privacy and anonymity. We're currently - looking for scalable hosting services for reporting needs from large - data sets and reliable high-bandwidth hosting. We may have hardware - we can provide you for your service donation.</p> - - <p>Can you write code? We're always looking for smart, motivated coders - to either port Tor to new or old operating systems, or solve difficult - online anonymity problems. Take a look at our coding projects.</p> - - <p>Are you a creative person? Do you have a fantastic idea for a - campaign? Are you someone who can come up with awesome artwork? We're - always looking for new ways to promote Tor and get the word out that - everyone needs their privacy and anonymity online.</p> - - <p>Is your legal firm willing to defend Tor and its volunteers? Are - you waiting for an interesting case to defend online privacy and - anonymity?</p> - - <p>If any of the service ideas struck a nerve, contact us at - donations(a)torproject.org for more details.</p> - </div> -  - <div id = "sidecol"> -#include "side-donate.wmi" -#include "info.wmi" - </div> -  -</div> - -#include <foot.wmi> diff --git a/donate/en/donate-snowden.wml b/donate/en/donate-snowden.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-tbb.wml b/donate/en/donate-tbb.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-twitter.wml b/donate/en/donate-twitter.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate.wml b/donate/en/donate.wml index df5a331..e69de29 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -1,203 +0,0 @@ -## translation metadata -# Revision: $Revision$ -# Translation-Priority: 3-low - -#include "donatehead.wmi" TITLE="Donate to keep Tor alive!" CHARSET="UTF-8" - -<div class="donation"> - - <div class="quote-section"> - <div class="container"> - <div class="row"> - <div class="col-sm-3 img-section"> - <img src="$(IMGROOT)/shari.png" class="img-thumbnail img-responsive champion" alt="Shari Steele"> - </div> - - <div class="col-sm-9 col-xs-offset-0"> - <blockquote> -Tor is an essential part of the Internet freedom infrastructure, and I'm looking forward to working with the Tor Project to continue to grow the movement. - <footer class="pull-right source-quote"><cite title="Source Title">Shari Steele</cite></footer> - </blockquote> - </div> - - </div> - </div> - </div> - - - <div class="container"> - - <div class="row"> - <div class="col-sm-7"> - <h2 class="main-text">Your support is critical to our success</h2> - <hr> - <p style="text-align:left;">Donate $23 or more, get swag, take a picture and share it with us via <code><a href="https://twitter.com/search?q=%23SupportTor" target="_blank">#supportTor</a></code> hashtag.</p> - - <noscript class="perks"> - <h4 style="text-align:left; padding-top:10px;"><b>Perks</b></h4> - <p style="text-align:left;">Donate $23+ to get a <b>pack of stickers</b></p> - <p style="text-align:left;">Donate $100+ to get a <b>Tor supporter tshirt</b></p> - <p style="text-align:left;">Donate $500+ to get a <b>hoodie</b></p> - </noscript> - - <h4 style="text-align:left; padding-top:10px;"><b>Perks</b></h4> - <div class="col-sm-4 no-padding"><img id="stickers" class="img-responsive half-opacity" src="$(IMGROOT)/swag-stickers-lg.png" alt="stickers"></div> - <div class="col-sm-4 no-padding"><img id="tshirt" class="img-responsive half-opacity" src="$(IMGROOT)/swag-tees-lg.png" alt="tshirt"></div> - <div class="col-sm-4 no-padding"><img id="hoody" class="img-responsive half-opacity" src="$(IMGROOT)/swag-hoody-lg.png" alt="hoody"></div> - - </div> - <div class="donate-section col-sm-5"> - <form id="donate" action="https://www.paypal.com/cgi-bin/webscr" method="post"> - <div class="row col-md-offset-0 combined-input"> - <div class="left col-xs-6 btn btn-default btn-lg active"> - <label class="choiceLabel"> - <input class="sr-only" name="cmd" id="blankRadio1" type="radio" value="_donations" aria-label="one_time"checked > - <span>One-time</span> - </label> - </div> - <div class="right col-xs-6 btn btn-default btn-lg "> - <label class="choiceLabel"> - <input class="sr-only" name="cmd" id="blankRadio2" type="radio" value="_xclick-subscriptions" aria-label="monthly"> - <span>Monthly</span> - </label> - </div> - </div> - - <div class="btn-group btn-group-lg" role="group" style="margin-bottom: 30px;"> - <div style="padding-bottom:5px;" class="col-xs-6"> - <button value="10" id="amount10" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn">$10</button> - </div> - <div style="padding-bottom:5px;" class="col-xs-6"> - <button value="23" id="amount23" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn" title="You get a sticker!">$23</button> - </div> - <div style="padding-bottom:5px;" class="col-xs-6"> - <button value="100" id="amount100" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn" title="You get a tshirt!">$100</button> - </div> - <div style="padding-bottom:5px;" class="col-xs-6"> - <button value="256" id="amount256" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn" title="You get a tshirt!">$256</button> - </div> - <div style="padding-bottom:5px;" class="col-xs-6"> - <button value="500" id="amount500" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn" title="You get a hoody!">$500</button> - </div> - <div class="col-xs-6 form-group-lg"> - <label class="sr-only" for="exampleInputAmount">1</label> - <div class="input-group"> - <div class="input-group-addon">$</div> - <input type="number" min="5" step="1" name="custom_amnt" class="form-control" id="exampleInputAmount" placeholder="other amount"> - </div> - </div> - </div> - <div style="padding: 0 15px;"> - <h5 class="error-msg">The minimum donation amount is $5</h5> - <button id="donate-btn" class="btn btn-primary btn-lg btn-block donate-button" style="padding:10px;">Donate</button> - <h5>via PayPal (doesn't require an account)</h5> - <h4><a href="<page donate/donate-options>">Other Ways to Donate</a></h4> - </div> - <input type="hidden" id="amount" name="amount" value=""> - <input type="hidden" id="a3" name="a3" value="0"> - <input type="hidden" id="p3" name="p3" value="1"> - <input type="hidden" id="t3" name="t3" value="M"> - <input type="hidden" name="sra" value="1"> - <input type="hidden" name="src" value="1"> - <input type="hidden" name="no_shipping" value="1"> - <input type="hidden" name="no_note" value="1"> - <input type="hidden" name="business" value="donations(a)torproject.org"> - <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project"> - <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou"> - <input type="hidden" name="cancel_return" value="https://www.torproject.org/getinvolved/volunteer"> - - - </form> - </div> - </div> - </div> - - - - </div> - - -  - <script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js"></script> - <script type="text/javascript"> - function displayVals() { - var amount = $( this ).filter(".amnt-btn").val(); - if (amount == null) { - amount = $("#exampleInputAmount").val(); - if ($('#amount').val() == "" && !($("#exampleInputAmount").hasClass("active")) ) { - amount = 23 - $( "#amount23" ).addClass('active'); - } else if (this.id == "exampleInputAmount") { - $( "button" ).removeClass('active'); - $( this ).addClass('active'); - } - } else { - $( ".amnt-btn" ).removeClass('active'); - $( this ).addClass('active'); - $('#amount').val(amount); - } - $('#amount').val(amount); - $('#a3').val(amount); - - $("button[name='amnt']").click(function () { - $(".form-control").val(null); - $(".error-msg").css("display","none"); - }); - - if (23 <= parseInt($("#amount").val()) && parseInt($("#amount").val()) < 100) { - $("#stickers").css("opacity","1"); - $("#tshirt").css("opacity","0.5"); - $("#hoody").css("opacity","0.5"); - }else if (100 <= parseInt($("#amount").val()) && parseInt($("#amount").val()) < 500) { - $("#tshirt").css("opacity","1"); - $("#stickers").css("opacity","0.5"); - $("#hoody").css("opacity","0.5"); - }else if (500 <= parseInt($("#amount").val())) { - $("#hoody").css("opacity","1"); - $("#stickers").css("opacity","0.5"); - $("#tshirt").css("opacity","0.5"); - }else{ - $("#hoody").css("opacity","0.5"); - $("#stickers").css("opacity","0.5"); - $("#tshirt").css("opacity","0.5"); - } - - } - $( document ).ready(function() { - $("button[name='amnt']").click(displayVals); - $("#exampleInputAmount").click(displayVals); - $("#exampleInputAmount").change(displayVals); - displayVals(); - - $("#exampleInputAmount").change(function(){ - if ($("#amount").val() == "" || parseInt($("#amount").val()) < 5) { - $(".error-msg").css("display","block"); - } else{ - $(".error-msg").css("display","none"); - } - }); - - $("#donate-btn").click(function(event){ - if ($("#amount").val() == "" || parseInt($("#amount").val()) < 5) { - event.preventDefault(); - $(".error-msg").css("display","block"); - } else{ - $(".error-msg").css("display","none"); - } - }); - - $(".left").click(function(){ - $(".left").addClass('active'); - $(".right").removeClass('active'); - }); - $(".right").click(function(){ - $(".right").addClass('active'); - $(".left").removeClass('active'); - }); - - }); - - - </script> - -#include <donatefoot.wmi>

1 0

[webwml/master] Add coredev job posting
by sebastian＠torproject.org 22 Nov '16

22 Nov '16

commit 48089f34a710f3a9c712292e36bd3d7e6ca8cbb5 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 23 02:16:44 2016 +0100 Add coredev job posting --- about/en/jobs-coredev.wml | 190 +++++++++++++++++++++++----------------------- about/en/jobs.wml | 1 + 2 files changed, 97 insertions(+), 94 deletions(-) diff --git a/about/en/jobs-coredev.wml b/about/en/jobs-coredev.wml index acd324b..8fd9292 100644 --- a/about/en/jobs-coredev.wml +++ b/about/en/jobs-coredev.wml @@ -10,124 +10,126 @@ <a href="<page about/jobs>">Jobs</a> </div> <div id="maincol"> -<h1>The Tor Project is looking for another dedicated core developer!</h1> -<h1>Note: we've filled this position for now, but we hope to be looking -for another core developer in the future.</h1> +<h1>The Tor Project is looking for dedicated core developer!</h1> +<h2>(Posted November 22, 2016)</h2> <p> Your job would be to work on all aspects of the main Tor network daemon and other open-source software. - -This would be a contractor position starting in 2013 (with plenty of -work to keep you busy), with the possibility of 2014 and beyond. </p> - <p> -Any candidate must: +As a core developer, your job with Tor Project will be to work on all +aspects of the main Tor network daemon and other open-source software. +This would include triaging, diagnosing, and fixing bugs; looking for +and resolving security issues; occasionally dropping everything and +scrambling to implement last-minute anticensorship schemes or deploy +urgent security updates; and working collaboratively with coworkers and +volunteers on implementing new features and protocol changes at every +stage from design to maintenance. +</p> +<p> +We are working to make our code more scalable, testable, and +maintainable. You would be reviewing other people's code and designs, +looking for ways to improve it. For an idea of the breadth and depth of +the work you'd be doing, please see ChangeLog file from the Tor source +distribution: https://gitweb.torproject.org/tor.git/tree/ChangeLog +</p> +<p> +This is a full-time remote position. Flexible salary, depending on +experience. Experience and/or passion for working with open source +communities and/or a commitment to Internet civil liberties are added +pluses for any candidate applying for this position! </p> +<h2> +Expected skills and experience: +</h2> <ul> - <li>Have extensive experience in C, and several other programming - languages. At least 5 years experience with C is probably - necessary for the level of expertise we want; most people would - need more.</li> - <li>Have a solid understanding of issues surrounding secure - C programming.</li> - <li>Be comfortable working remotely.</li> - <li>Be familiar and experienced with nonblocking, event-driven - networking programs.</li> - <li>Be comfortable and experienced with interacting with users online.</li> - <li>Be comfortable and experienced with driving the entire - lifecycle of a new feature in an existing piece of software, - from design to implementation to testing.</li> - <li>Be comfortable and experienced getting code and design - reviewed, and reviewing the code and design of others.</li> - <li>Be comfortable with transparency: as a non-profit, everything - we do is in public, including your name and pay rate.</li> +<li>5+ years’ experience in C and several other programming languages</li> +<li>Solid understanding of secure C programming issues</li> +<li>Comfort working remotely and managing your own workflow with limited +supervision</li> +<li>Experience and comfort interacting with users, coworkers, and team members +online</li> +<li>Ability to comfortably drive the entire lifecycle of a new feature in an +existing piece of software from design, to implementation, to testing, to +maintenance</li> +<li>Experience and comfort with peer review of your own code and design, and +with your reviewing of others’ code and design</li> +<li> nsparency! As a non-profit, everything Tor Project does is public, +including your name and pay rate</li> </ul> -<p> -An ideal candidate would also: -</p> +<h2> +Desired skills and experience: +</h2> <ul> - <li>Know enough of the basics of cryptography in order to - understand how to implement our protocols and discuss changes - to them. (Actually implementing block ciphers and stuff like - that isn't necessary.)</li> - <li>Know enough about networking in order to understand how to - implement our protocols and discuss changes to them.</li> - <li>Have experience with high-performance networking code.</li> - <li>Have experience with open-source software development, - including working with distributed teams across different - time-zones containing employees and volunteers of differing - skill levels over email and IRC.</li> - <li>Have basic familiarity with distributed version control - systems.</li> - <li>Have contributed significant chunks of code to multiple - open-source projects in the past.</li> - <li>Genuinely be excited about Tor and our values.</li> +<li>Knowledge of cryptography basics: be able to understand how to implement +our protocols and discuss changes to them (the ability to actually implement +block ciphers and stuff like that is not necessary)</li> +<li>Sufficient level of networking knowledge to understand how to implement +our protocols and discuss changes to them</li> +<li>Experience with high-performance networking code</li> +<li>Experience with open-source software development, including working over +email and IRC with a globally distributed teams of employees and volunteers of +varying skill levels</li> +<li>Basic familiarity with distributed version control systems</li> +<li>Familiarity and experience with non-blocking, event-driven networking +programs</li> +<li>History of significant code contributions to multiple open-source +projects</li> +<li>Genuine excitement about Tor and its values! Follow this link to view +the Tor Project social contract: +https://blog.torproject.org/blog/tor-social-contract</li> </ul> -<p> -Being a core Tor developer includes triaging, diagnosing, and -fixing bugs; looking for and resolving security issues; and working -collaboratively with coworkers and volunteers on implementing -new features and protocol changes at every stage from design to -maintenance. We'd also need help making our code more scalable, -testable, and maintainable. Sometimes, we need to drop everything -and scramble to implement last-minute anticensorship schemes, or to -deploy urgent security updates. You'd also be reviewing other people's -code and designs, and looking for ways to improve it. For an idea of -the breadth and depth of the work you'd be doing, have a look at <a -href="https://gitweb.torproject.org/tor.git/tree/ChangeLog">the -ChangeLog file from the Tor source distribution</a>. -</p> - -<p> +<h2> Other notes: -</p> +</h2> <ul> - <li>You'll need to be comfortable in this environment! We - coordinate via IRC, instant messaging, email, and bug - trackers.</li> - <li>Academic degrees are great, but not required if you have - the right experience.</li> - <li>We only write free and open source software, and we don't - believe in software patents.</li> +<li>Academic degrees are great, but not required if you have the right +experience.</li> +<li>Tor developers don't have an office; you can work from wherever you want, +so you need to be comfortable in this environment! We coordinate via IRC, +email, and bug trackers.</li> +<li>We only write free (open source) software, and we don't believe in software +patents.</li> </ul> <p> -How to apply: +The Tor Project, Inc., is a 501(c)(3) organization headquartered in Seattle +that provides the technical infrastructure for privacy protection over the +Internet. With paid staff and contractors of around 30 technologists and +operational support people, plus many volunteers all over the world who +contribute to our work, the Tor Project is funded in part by government grants +and contracts, as well as by individual, foundation, and corporate donations. +Our mission statement: “To advance human rights and freedoms by creating and +deploying free and open anonymity and privacy technologies, supporting their +unrestricted availability and use, and furthering their scientific and popular +understanding.” </p> - -<ul> - <li>Link to a sample of code you've written in the past that - you're allowed to show us.</li> - <li>Provide a CV explaining your background, experience, skills, - and other relevant qualifications.</li> - <li>List some people who can tell us more about you: these - references could be employers or coworkers, open source projects, - etc.</li> - <li>Email the above to jobs at torproject.org.</li> -</ul> - <p> -About the company:<br> - The Tor Project is a US 501(c)(3) non-profit dedicated to research, - development, and education about online anonymity and privacy. The Tor - network's 3000 volunteer relays carry 16 Gbps for upwards of half a - million daily users, including ordinary citizens who want protection - from identity theft and prying corporations, corporations who want - to look at a competitor's website in private, people around the world - whose Internet connections are censored, and even governments and law - enforcement. Tor has a staff of 14 paid developers, researchers, and - advocates, plus many dozen volunteers who help out on a daily basis. Tor - is funded in part by government research and development grants, and - in part by individual and corporate donations. +The Tor Project has a competitive benefits package, including a generous PTO +policy; 14 paid holidays per year (including the week between Christmas and New +Year's, when the office is closed); health, vision, dental, disability, and +life insurance paid in full for employee; flexible work schedule; and +occasional travel opportunities. The Tor Project, Inc., is an equal +opportunity, affirmative action employer. +</p> +<p> +To apply, please email your CV to hr(a)torproject.org with “Core Developer” in +the subject line. You should include a link to your code sample(s); more than +one sample is ideal – if we can't see how you code, we can’t tell how good you +are. Your CV should detail your background, experience, skills, and other +relevant qualifications, and should include three professional references +(co-workers, open source projects, supervisors). +</p> +<p> +Deadline for applications is December 31, 2016. We look forward to hearing from +you! </p> - </div>  <div id = "sidecol"> diff --git a/about/en/jobs.wml b/about/en/jobs.wml index edcda90..edb3547 100644 --- a/about/en/jobs.wml +++ b/about/en/jobs.wml @@ -20,6 +20,7 @@ </p> <ul> <li><a href="<page about/jobs-ooni-ux-designer>">UX Designer - OONI</a></li> +<li><a href="<page about/jobs-coredev>">Core Developer</a></li> #<li><a href="<page about/jobs-editor>">Writer/Editor</a></li> #<li><a href="<page about/jobs-admin-assistant>">Administrative Assistant</a></li> </ul>

1 0

[webwml/master] Couple of rewrite rule tweaks
by sebastian＠torproject.org 22 Nov '16

22 Nov '16

commit ff26816eed7e4968e320684d481a383c77b47466 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 23 02:12:41 2016 +0100 Couple of rewrite rule tweaks --- .htaccess | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.htaccess b/.htaccess index 61f5152..3e351c3 100644 --- a/.htaccess +++ b/.htaccess @@ -46,7 +46,7 @@ RewriteRule ^getinvolved/research(.*) https://research.torproject.org/ [R=301,L] # other (feel free to categorize) RewriteRule ^people(.*) /about/corepeople$1 [R=301,L] -RewriteRule ^donate/$ /donate/donate [R=301,L] +RewriteRule ^donate/$ https://donate.torproject.org [R=302,L] RewriteRule ^contact(.*) /about/contact$1 [R=301,L] # Download websites @@ -74,6 +74,6 @@ RewriteRule ^js/$ / [R=301,L] RewriteRule ^donate/donate-options(.*) /donate/donate-options$1 [END] RewriteRule ^donate/donate(.*) https://donate.torproject.org [R=302,L] RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq.html [R=302,L] -RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/donor-privacy-policy.html [R=302,L] +RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy.html [R=302,L]

1 0

[webwml/master] Bug 20415: 2016 Donation banner
by sebastian＠torproject.org 22 Nov '16

22 Nov '16

commit c27d7dd8d7a192ce0e99bc9bb217469a3ab2916d Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Nov 15 02:05:59 2016 -0500 Bug 20415: 2016 Donation banner --- css/layout.css | 158 ++++++++++++++++++++++++++++++++++++++++++++++ en/index.wml | 32 ++++++++++ images/onion-heart.png | Bin 0 -> 10592 bytes images/tor-roots-only.png | Bin 0 -> 119059 bytes js/donation_banner.js | 36 +++++++++++ 5 files changed, 226 insertions(+) diff --git a/css/layout.css b/css/layout.css index 8a79d9d..87f6b5c 100644 --- a/css/layout.css +++ b/css/layout.css @@ -1296,3 +1296,161 @@ p.blogDate { } /* End hide from IE-mac */ +#banner-container { + -khtml-user-select: none; /* Konqueror */ + -moz-user-select: none; /* Firefox */ + -ms-user-select: none; /* Internet Explorer/Edge */ + -webkit-touch-callout: none; /* iOS Safari */ + -webkit-user-select: none; /* Chrome/Safari/Opera */ + background-color: #406; + background-opacity: 10%; + background-size: cover; + background: radial-gradient(circle, #406 90%, #203 100%); + border-bottom: 6px solid #305; + border-top: 5px solid #305; + display: flex; + height: 120px; + justify-content: center; + left: 0px; + margin-top: 36px; + min-width: 900px; + opacity: 1; + position: absolute; + user-select: none; + width: 100%; + z-index: 1; +} +#banner-container:before { + background-image: url('../images/tor-roots-only.png'); + background-position: 50% 50%; + background-repeat: no-repeat; + background-size: cover; + content: ' '; + display: block; + height: 100%; + left: 0; + opacity: 0.20; + position: absolute; + top: 0; + width: 100%; +} +#banner-contents-container { + align-items: center; + display: flex; + flex-direction: row; + height: 100%; + max-width: 700px; + position: relative; + width: 700px; +} +#banner-text { + align-self: stretch; + color: white; + display: flex; + flex-direction: column; + flex: 1 1 auto; + font-family: sans-serif; + font-size: 24px; + margin: 10px 20px 10px 20px; + max-height: 100%; + padding: 0px; +} +#banner-tagline { + align-items: center; + display: flex; + flex: 2 2 67%; + font-weight: bold; + justify-content: center; + max-width: 469px; + text-align: center; +} +#banner-heart { + align-items: center; + color: #f8f8a0; + display: flex; + flex: 1 1 33%; + justify-content: center; + text-align: center; + white-space: nowrap; +} +#banner-logo-container { + display: inline-block; + flex: 0 0 auto; + margin: 0px; + position: relative; +} +#banner-logo { + height: 155px; + position: relative; + padding-bottom: 40px; + width: 108px; +} +#banner-donate-button-container { + background-color: #FFD; + border: 4px solid #204; + color: #A20; + display: block; + flex-grow: 0.0; + flex: 0; + height: 50px; + letter-spacing: -0.00em; + opacity: 100%; + padding-bottom: 5px; + padding-left: 5px; + padding-right: 5px; + padding-top: 5px; + width: 100px; +} +#banner-donate-button-container:hover { + border-color: #610; +} +#banner-donate-button-container:active { + border-color: #A20; +} +#banner-donate-button { + align-items: center; + display: flex; + flex-direction: column; + font-family: sans-serif; + font-size: 18px; + font-weight: bold; + height: 100%; + text-align: center; + width: 100%; +} +#banner-donate-button-text { + align-self: stretch; + align-items: center; + display: flex; + justify-content: center; + flex: 2 2 67%; +} +#banner-donate-button-arrow { + flex: 1 1 33%; + font-size: 14px; + line-height: 14px; +} +#banner-donate-button-arrow:-moz-dir(rtl) { + transform: scaleX(-1); +} +#banner-donate-button-link { + flex: 0 0 auto; + text-decoration: none; +} +#banner-donate-button-link:link { + color: #A20; +} +#banner-donate-button-link:hover { + color: #C40; +} +#banner-donate-button-link:visited { + color: #408; +} +#banner-donate-button-linka:active { + color: black; +} +#banner-spacer { + height: 180px; + position: relative; + top: 0; +} diff --git a/en/index.wml b/en/index.wml index 836d3b0..4b9a92a 100644 --- a/en/index.wml +++ b/en/index.wml @@ -2,6 +2,38 @@ # Revision: $Revision$ # Translation-Priority: 1-high + <div id="banner-container" class="onions-bg"> + <div id="banner-contents-container"> + <div id="banner-logo-container"> + <img id="banner-logo" alt="Tor Onion-Heart Logo" + src="images/onion-heart.png"/> + </div> + <div id="banner-text"> + <div id="banner-tagline"> + <span> + <noscript>Protecting Journalists, Activists & Whistleblowers Since 2006</noscript> + </span></div> + <div id="banner-heart"> + <span> + Tor is at the heart of Internet freedom + </span> + </div> + </div> + <a id="banner-donate-button-link" + href="./donate/donate-homepage-en"> + <div id="banner-donate-button-container"> + <div id="banner-donate-button"> + <div id="banner-donate-button-text"> + <span>Donate Now! »</span> + </div> + </div> + </div> + </a> + </div> + </div> + <div id="banner-spacer"></div> + <script src="js/donation_banner.js"></script> + #include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8" <div id="home"> diff --git a/images/onion-heart.png b/images/onion-heart.png new file mode 100644 index 0000000..e1c0bdf Binary files /dev/null and b/images/onion-heart.png differ diff --git a/images/tor-roots-only.png b/images/tor-roots-only.png new file mode 100644 index 0000000..db92ab4 Binary files /dev/null and b/images/tor-roots-only.png differ diff --git a/js/donation_banner.js b/js/donation_banner.js new file mode 100644 index 0000000..35823db --- /dev/null +++ b/js/donation_banner.js @@ -0,0 +1,36 @@ +/* jshint esnext:true */ + +var kTaglines = [ + "Millions of People Depend on Tor for Online Security & Privacy", + "A Network of People Protecting People", + "Surveillance = Oppression", + "Protecting Journalists, Activists & Whistleblowers Since 2006", +]; + +var kTaglineSizes = [ + 26, + 32, + 32, + 26, +]; + +var sel = function (selector) { + return document.querySelector(selector) +}; + +// Returns a random integer x, such that 0 <= x < max +var randomInteger = function (max) { + return Math.floor(max * Math.random()); +}; + +// The main donation banner function. +var runDonationBanner = function () { + // Load random tag line once page is loaded + var index = randomInteger(4); + var taglineElement = sel("#banner-tagline span"); + taglineElement.innerText = kTaglines[index]; + taglineElement.style.fontSize = kTaglineSizes[index]; +}; + +// Run banner code on load. +window.addEventListener("load", runDonationBanner);

1 0

[webwml/master] Bug 20734: Fix links and redirects for new donation site
by sebastian＠torproject.org 22 Nov '16

22 Nov '16

commit ec139b4def237b41e1176587507aee78f14b379e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Nov 22 01:02:06 2016 -0500 Bug 20734: Fix links and redirects for new donation site --- .htaccess | 7 +++-- css/layout.css | 1 + donate/en/donate-foot.wml | 0 donate/en/donate-options.wml | 2 +- download/en/download-easy.wml | 56 +----------------------------------- download/en/download-unix.wml | 2 +- download/en/download.wml | 66 +------------------------------------------ include/foot.wmi | 2 +- include/navigation.wmi | 2 +- projects/en/torbrowser.wml | 2 +- 10 files changed, 13 insertions(+), 127 deletions(-) diff --git a/.htaccess b/.htaccess index 8f54d2d..3608c30 100644 --- a/.htaccess +++ b/.htaccess @@ -88,13 +88,16 @@ RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L] RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L] RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L] RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-button(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-download(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-foot(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate.html.en https://donate.torproject.org [R=302,L] # 2015 RewriteRule ^donate/donate-twitter(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-tbb(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-banner(.*) /donate/donate$1 [R=302,L] -RewriteRule ^donate/donate-download(.*) /donate/donate$1 [R=302,L] -RewriteRule ^donate/donate-button(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/giving-tue-blog(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-roger(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-george-torwell(.*) /donate/donate$1 [R=302,L] diff --git a/css/layout.css b/css/layout.css index 8a79d9d..45b4513 100644 --- a/css/layout.css +++ b/css/layout.css @@ -276,6 +276,7 @@ body { float: right; width: 230px; margin-left: 20px; + padding-top: 100px; } #torusers { margin: 0 0 27px; } diff --git a/donate/en/donate-foot.wml b/donate/en/donate-foot.wml new file mode 100644 index 0000000..e69de29 diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 6596d87..144cff9 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -13,7 +13,7 @@ form#makeDonation { <div id="content" class="container" style="padding-bottom: 85px"> <div id="maincol"> <h1>More Ways to Donate to Tor</h1> - <p><b>Note: if you wish to donate to The Tor Project by <a href="donate.html.en">credit card or PayPal, please click here</a>.</b></p> + <p><b>Note: if you wish to donate to The Tor Project by <a href="<page donate/donate>">credit card or PayPal, please click here</a>.</b></p> <p>The Tor Project also offers the following alternative donation methods (If you would like to receive a Thank-You Gift after making a donation with one of the methods below, please email giving(a)torproject.org.)</p> <ul class="hlist"> <li><a href="#bitcoin">Bitcoin</a></li> diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml index 6fd6e71..98de49f 100644 --- a/download/en/download-easy.wml +++ b/download/en/download-easy.wml @@ -144,61 +144,7 @@ <div id="dow-don-right"> - - - <script async type="text/javascript"> - function displayVals() { - var t3 = $("#t3").val(); - var amount = $("#amount").val(); - if(t3 != 0){ - $('#a3').val(amount); - $('#p3').val(1); - $('#cmd').val('_xclick-subscriptions'); - $('#item_name').val('Tor Project Membership'); - $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>'); - }else{ - $('#a3').val(0); - $('#p3').val(0); - $('#cmd').val('_donations'); - $('#item_name').val('Donation to the Tor Project'); - $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); - } - if( !t3 ) { - $('#cmd').val('_donations'); - $('#item_name').val('Donation to the Tor Project'); - $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); - } - } - $(function(){ - $("#amount").change(displayVals); - $("#t3").change(displayVals); - displayVals(); - }); - </script> -<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post"> - <h2><big style="font-weight: bold; font-size: 1.2em;">Help</big><small style="font-size: 0.9em;" > Create more </small><big style="font-weight: bold; font-size: 1.2em;">Tor</big><big style="font-size: 1.2em;">!</big></h2> - <p> - <input type="hidden" name="currency_code" class="cur" value="USD"> - <input type="hidden" id="a3" name="a3" value="0"> - <input type="hidden" id="t3" name="t3" value="0"> - <input type="hidden" id="amount" class="amount" name="amount" value="10" size="10"> - <input type="hidden" id="p3" name="p3" value="1"> - <input type="hidden" name="sra" value="1"> - <input type="hidden" name="src" value="1"> - <input type="hidden" name="no_shipping" value="1"> - <input type="hidden" name="no_note" value="1"> - <input type="hidden" id="cmd" name="cmd" value="_donations"> - <input type="hidden" name="business" value="donations(a)torproject.org"> - <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project"> - <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou"> - <input type="hidden" name="cancel_return" value="https://www.torproject.org/download/download-easy"> - </p> - <h6 id="ppinfo" style="height:0px;"></h6> - <p> - <input class="donate-btn" type="submit" name="donate" value="Donate"> - </p> - <p><a href="<page donate/donate>">Other donation options...</a></p> -</form>  +<a href="<page donate/donate-download>"><img src="../images/btn_donateCC_LG.gif"></a> </div>  diff --git a/download/en/download-unix.wml b/download/en/download-unix.wml index be152ba..1993b47 100644 --- a/download/en/download-unix.wml +++ b/download/en/download-unix.wml @@ -116,7 +116,7 @@ under the <a href="<gitblob>LICENSE">3-clause BSD license</a>. <p> There is no fee for installing Tor, or using the Tor network, but if you want Tor to become faster and more usable please consider -<a href="<page donate/donate>">making a tax-deductible donation to The Tor Project</a>. +<a href="<page donate/donate-download>">making a tax-deductible donation to The Tor Project</a>. </p> </div> diff --git a/download/en/download.wml b/download/en/download.wml index c111ee2..482850a 100644 --- a/download/en/download.wml +++ b/download/en/download.wml @@ -356,71 +356,7 @@ Code</a></li> </div> </div>  - <script async type="text/javascript"> - function displayVals() { - var t3 = $("#t3").val(); - var amount = $("#amount").val(); - if(t3 != 0){ - $('#a3').val(amount); - $('#p3').val(1); - $('#cmd').val('_xclick-subscriptions'); - $('#item_name').val('Tor Project Membership'); - $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>'); - }else{ - $('#a3').val(0); - $('#p3').val(0); - $('#cmd').val('_donations'); - $('#item_name').val('Donation to the Tor Project'); - $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); - } - if( !t3 ) { - $('#cmd').val('_donations'); - $('#item_name').val('Donation to the Tor Project'); - $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); - } - } - $(function(){ - $("#amount").change(displayVals); - $("#t3").change(displayVals); - displayVals(); - }); - </script> -<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post" style="float:left; margin-bottom:10px;"> - <h2>Donate to Tor</h2> - <p> - <select name="currency_code" class="cur"> - <option value="USD" selected="selected">$</option> - <option value="EUR">€</option> - <option value="GBP">£</option> - <option value="YEN">¥</option> - </select> - <input type="text" id="amount" class="amount" name="amount" value="5" size="10"> - </p> - <p> - <input type="hidden" id="a3" name="a3" value="0"> - <select id="t3" name="t3"> - <option value="0">One-time Donation</option> - <option value="M">Monthly Subscription</option> - </select> - </p> - <p> - <input type="hidden" id="p3" name="p3" value="1"> - <input type="hidden" name="sra" value="1"> - <input type="hidden" name="src" value="1"> - <input type="hidden" name="no_shipping" value="1"> - <input type="hidden" name="no_note" value="1"> - <input type="hidden" id="cmd" name="cmd" value="_donations"> - <input type="hidden" name="business" value="donations(a)torproject.org"> - <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project"> - <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou.html"> - <input type="hidden" name="cancel_return" value="https://www.torproject.org/download/download.html"> - </p> - <h6 id="ppinfo" style="height:0px;"></h6> - <p> - <input class="donate-btn" type="submit" name="donate" value="Donate"> - </p> - <p><a href="<page donate/donate>">Other donation options...</a></p> -</form> +<a href="<page donate/donate-download>"><img src="../images/btn_donateCC_LG.gif"></a>   <div class="img-shadow"> diff --git a/include/foot.wmi b/include/foot.wmi index 5e6cb4e..c7e97aa 100644 --- a/include/foot.wmi +++ b/include/foot.wmi @@ -43,7 +43,7 @@ <div class="col"> <h4>Get Involved</h4> <ul> - <li><a href="<page donate/donate>">Donate</a></li> + <li><a href="<page donate/donate-foot>">Donate</a></li> <li><a href="<page docs/documentation>#MailingLists">Mailing Lists</a></li> <li><a href="<page docs/hidden-services>">Hidden Services</a></li> <li><a href="<page getinvolved/translation>">Translations</a></li> diff --git a/include/navigation.wmi b/include/navigation.wmi index 3cfec53..36b985b 100644 --- a/include/navigation.wmi +++ b/include/navigation.wmi @@ -22,7 +22,7 @@ my @calltoaction = ( 'download/download-easy' , 'Download', 'getinvolved/volunteer' , 'Get Involved', - 'donate/donate' , 'Donate', + 'donate/donate-button' , 'Donate', ); :> diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index c94a298..19f12e2 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -30,7 +30,7 @@ It can run off a USB flash drive, comes with a pre-configured web browser to protect your anonymity, and is self-contained (portable).</p> - <p style="padding-top:10px;"><a href="<page donate/donate>">Do you like what we do? Please consider making a donation »</a></p> + <p style="padding-top:10px;"><a href="<page donate/donate-download>">Do you like what we do? Please consider making a donation »</a></p> </div> <div class="pjsplash"> <a class="button" href="#downloads">

1 0

[webwml/master] Merge remote-tracking branch 'arthuredelstein/20415'
by sebastian＠torproject.org 22 Nov '16

22 Nov '16

commit 42d36dce3b3aecf8d0d49f847e77feb2d2d389e4 Merge: ec139b4 c27d7dd Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Nov 22 23:36:13 2016 +0100 Merge remote-tracking branch 'arthuredelstein/20415' css/layout.css | 158 ++++++++++++++++++++++++++++++++++++++++++++++ en/index.wml | 32 ++++++++++ images/onion-heart.png | Bin 0 -> 10592 bytes images/tor-roots-only.png | Bin 0 -> 119059 bytes js/donation_banner.js | 36 +++++++++++ 5 files changed, 226 insertions(+)

1 0