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

[webwml/staging] Bug 20465: Call it 'Tor Browser', not 'The Tor Browser'
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit 5bd3add63c57f92dfa36653f8b4e01a948c01981 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 25 16:33:02 2016 -0400 Bug 20465: Call it 'Tor Browser', not 'The Tor Browser' --- about/en/corepeople.wml | 2 +- docs/en/faq.wml | 16 ++++++++-------- docs/en/tor-doc-osx.wml | 4 ++-- docs/en/verifying-signatures.wml | 6 +++--- donate/en/donor-faq.wml | 2 +- download/en/download-easy.wml | 12 ++++++------ download/en/download.wml | 12 ++++++------ include/head.wmi | 2 +- projects/en/projects.wml | 2 +- projects/en/torbrowser.wml | 12 ++++++------ 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 9ece58b..7df9e2a 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -255,7 +255,7 @@ <dd>Researcher at University College London who works on security, performance, and usability of Tor. Original creator of the <a href="<page projects/torbrowser>">Tor Browser - Bundle</a> (now just called the Tor Browser). You can find + Bundle</a> (now just called Tor Browser). You can find out more about his work on his <a href="http://www.cs.ucl.ac.uk/staff/s.murdoch/">professional website</a>.</dd> diff --git a/docs/en/faq.wml b/docs/en/faq.wml index 301b6a4..5f89bcc 100644 --- a/docs/en/faq.wml +++ b/docs/en/faq.wml @@ -873,8 +873,8 @@ executive <p>No, it doesn't. You need to use a separate program that understands your application and protocol and knows how to clean or "scrub" the data - it sends. The Tor Browser tries to keep application-level data, - like the user-agent string, uniform for all users. The Tor Browser can't + it sends. Tor Browser tries to keep application-level data, + like the user-agent string, uniform for all users. Tor Browser can't do anything about text that you type into forms, though. <a href="<page download/download-easy>#warning">Be careful and be smart.</a> @@ -1060,7 +1060,7 @@ from the graphical interface. Open "Files" (Unity's explorer), open Preferences-> Behavior Tab -> Set "Run executable text files when they are opened" to "Ask every time", then OK. </p> -<p>You can also start the Tor Browser from the command line by running </p> +<p>You can also start Tor Browser from the command line by running </p> <pre>./start-tor-browser</pre> <p> from inside the Tor Browser directory. @@ -1104,7 +1104,7 @@ issue. Firefox extensions?</a></h3> <p> -The Tor Browser is free software, so there is nothing preventing you from +Tor Browser is free software, so there is nothing preventing you from modifying it any way you like. However, we do not recommend installing any additional Firefox add-ons with Tor Browser. Add-ons can break your anonymity in a number of ways, including browser fingerprinting and @@ -1112,7 +1112,7 @@ bypassing proxy settings. </p> <p> Some people have suggested we include ad-blocking software or -anti-tracking software with the Tor Browser. Right now, we do not +anti-tracking software with Tor Browser. Right now, we do not think that's such a good idea. Tor Browser aims to provide sufficient privacy that additional add-ons to stop ads and trackers are not necessary. Using add-ons like these may cause some sites to break, which @@ -1185,7 +1185,7 @@ really bad idea. Our efforts to work with the Chrome team to <a href="https://blog.torproject.org/blog/google-chrome-incognito-mode-tor-and-finge…">add missing APIs</a> were unsuccessful, unfortunately. Currently, it is impossible -to use other browsers and get the same level of protections as when using the +to use other browsers and get the same level of protections as when using Tor Browser. </p> @@ -3375,9 +3375,9 @@ diversity, a web browser that is preconfigured to help you control the risks to your privacy and anonymity while browsing the Internet. Not only are the above technologies disabled to prevent - identity leaks, the Tor Browser also includes browser extensions like + identity leaks, Tor Browser also includes browser extensions like NoScript and Torbutton, as well as patches to the Firefox source - code. The full design of the Tor Browser can be read <a + code. The full design of Tor Browser can be read <a href="https://www.torproject.org/projects/torbrowser/design/">here</a>. In designing a safe, secure solution for browsing the web with Tor, we've discovered that configuring <a href="#TBBOtherBrowser">other diff --git a/docs/en/tor-doc-osx.wml b/docs/en/tor-doc-osx.wml index 6840b4b..454efa9 100644 --- a/docs/en/tor-doc-osx.wml +++ b/docs/en/tor-doc-osx.wml @@ -19,8 +19,8 @@ are done. </h2> - <p>Even though the Tor Browser comes with a regular Tor, it will only run - as long as you keep the Tor Browser open. The following instructions will + <p>Even though Tor Browser comes with a regular Tor, it will only run + as long as you keep Tor Browser open. The following instructions will set up Tor without graphical interface or a browser. Many people prefer this over TBB when they host hidden services or relay traffic for other Tor users. <hr> diff --git a/docs/en/verifying-signatures.wml b/docs/en/verifying-signatures.wml index 94ad398..12678b0 100644 --- a/docs/en/verifying-signatures.wml +++ b/docs/en/verifying-signatures.wml @@ -67,7 +67,7 @@ you will need to tell Windows the full path to the GnuPG program. If you installed GnuPG with the default values, the path should be something like this: <i>C:\Program Files\Gnu\GnuPg\gpg.exe</i>.</p> - <p>The Tor Browser team signs the Tor Browsers. Import its key + <p>The Tor Browser team signs Tor Browser releases. Import its key (0x4E2C6E8793298290) by starting <i>cmd.exe</i> and typing:</p> <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --keyserver pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290</pre> <p>After importing the key, you can verify that the fingerprint @@ -116,7 +116,7 @@ </p> <p>The next step is to use GnuPG to import the key that signed - your package. The Tor Browser team signs the Tor Browsers. Import its + your package. The Tor Browser team signs Tor Browser releases. Import its key (0x4E2C6E8793298290) by starting the terminal (under "Applications" in Mac OS X) and typing:</p> @@ -189,7 +189,7 @@ property</a> of Tor Browser 3.0 and later. Anyone can build Tor Browser on their own machine and produce a binary that is bit-for-bit identical to the binary we offer on the download page. - Fortunately, it is not necessary for everyone to build the Tor Browser + Fortunately, it is not necessary for everyone to build Tor Browser locally to get this security. Verifying and comparing the signed list of <a href="https://en.wikipedia.org/wiki/Cryptographic_hash">hashes</a> will confirm that multiple people have built Tor Browsers diff --git a/donate/en/donor-faq.wml b/donate/en/donor-faq.wml index 701e4de..59a7d8c 100644 --- a/donate/en/donor-faq.wml +++ b/donate/en/donor-faq.wml @@ -19,7 +19,7 @@ anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding. The main product of - the Tor Project is the Tor Browser, which enables people + the Tor Project is Tor Browser, which enables people to browse the internet anonymously. The Tor Project is a 501(c)3 tax-exempt non-profit organization based in Boston, Massachusetts. It was founded in 2006.</p> diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml index c740b78..6fd6e71 100644 --- a/download/en/download-easy.wml +++ b/download/en/download-easy.wml @@ -215,14 +215,14 @@ exactly as you are used to.</p> <ol> -<li><b>Use the Tor Browser</b> +<li><b>Use Tor Browser</b> <p>Tor does not protect all of your computer's Internet traffic when you run it. Tor only protects your applications that are properly configured to send their Internet traffic through Tor. To avoid problems with Tor configuration, we strongly recommend you use the <a href="<page projects/torbrowser>">Tor Browser</a>. It is pre-configured to protect your privacy and anonymity on the web as long as you're browsing -with the Tor Browser itself. Almost any other web browser configuration +with Tor Browser itself. Almost any other web browser configuration is likely to be unsafe to use with Tor.</p> </li> <li><b>Don't torrent over Tor</b> @@ -238,10 +238,10 @@ traffic</a> this way, you also slow down the entire Tor network for everyone els </p> </li> <li><b>Don't enable or install browser plugins</b> -<p>The Tor Browser will block browser plugins such as Flash, RealPlayer, +<p>Tor Browser will block browser plugins such as Flash, RealPlayer, Quicktime, and others: they can be manipulated into revealing your IP address. Similarly, we do not recommend installing additional addons or -plugins into the Tor Browser, as these may bypass Tor or otherwise harm +plugins into Tor Browser, as these may bypass Tor or otherwise harm your anonymity and privacy.</p> </li> @@ -250,7 +250,7 @@ your anonymity and privacy.</p> href="<page about/overview>#thesolution">to and within the Tor network</a>, but the encryption of your traffic to the final destination website depends upon on that website. To help -ensure private encryption to websites, the Tor Browser includes +ensure private encryption to websites, Tor Browser includes <a href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> to force the use of HTTPS encryption with major websites that support it. However, you should still watch the browser URL bar to @@ -265,7 +265,7 @@ and HTTPS relate</a>. </li> <li><b>Don't open documents downloaded through Tor while online</b> -<p>The Tor Browser will warn you before automatically opening +<p>Tor Browser will warn you before automatically opening documents that are handled by external applications. <b>DO NOT IGNORE THIS WARNING</b>. You should be very careful when downloading documents via Tor (especially DOC and PDF files, unless you use the PDF diff --git a/download/en/download.wml b/download/en/download.wml index 571c7f8..c111ee2 100644 --- a/download/en/download.wml +++ b/download/en/download.wml @@ -215,7 +215,7 @@ custom configurations. All an apt-get or yum install away.</p> you are used to.</p> <ol> -<li><b>Use the Tor Browser</b> +<li><b>Use Tor Browser</b> <p> @@ -224,7 +224,7 @@ run it. Tor only protects your applications that are properly configured to send their Internet traffic through Tor. To avoid problems with Tor configuration, we strongly recommend you use the <a href="<page projects/torbrowser>">Tor Browser</a>. It is pre-configured to protect -your privacy and anonymity on the web as long as you're browsing with the Tor +your privacy and anonymity on the web as long as you're browsing with Tor Browser itself. Almost any other web browser configuration is likely to be unsafe to use with Tor. @@ -249,10 +249,10 @@ traffic</a> this way, you also slow down the entire Tor network for everyone els <p> -The Tor Browser will block browser plugins such as Flash, RealPlayer, +Tor Browser will block browser plugins such as Flash, RealPlayer, Quicktime, and others: they can be manipulated into revealing your IP address. Similarly, we do not recommend installing additional addons or plugins into -the Tor Browser, as these may bypass Tor or otherwise harm your anonymity and +Tor Browser, as these may bypass Tor or otherwise harm your anonymity and privacy. </p> @@ -267,7 +267,7 @@ Tor will encrypt your traffic <a href="<page about/overview>#thesolution">to and within the Tor network</a>, but the encryption of your traffic to the final destination website depends upon on that website. To help ensure private -encryption to websites, the Tor Browser includes <a +encryption to websites, Tor Browser includes <a href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> to force the use of HTTPS encryption with major websites that support it. However, you should still watch the browser URL bar to ensure that websites you provide @@ -286,7 +286,7 @@ and HTTPS relate</a>. <p> -The Tor Browser will warn you before automatically opening documents that are +Tor Browser will warn you before automatically opening documents that are handled by external applications. <b>DO NOT IGNORE THIS WARNING</b>. You should be very careful when downloading documents via Tor (especially DOC and PDF files, unless you use the PDF viewer that's built into Tor Browser) as diff --git a/include/head.wmi b/include/head.wmi index 99cea11..faf8dd1 100644 --- a/include/head.wmi +++ b/include/head.wmi @@ -14,7 +14,7 @@ <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="author" content="The Tor Project, Inc."> - <meta name="description" content="Tor is a free software that prevents people from learning your location or browsing habits by letting you communicate anonymously on the Internet. It also helps you bypass censorship online. If you can't open the website, email gettor(a)torproject.org for instruction on how to get the Tor Browser."> + <meta name="description" content="Tor is a free software that prevents people from learning your location or browsing habits by letting you communicate anonymously on the Internet. It also helps you bypass censorship online. If you can't open the website, email gettor(a)torproject.org for instruction on how to get Tor Browser."> <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research"> <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg"> diff --git a/projects/en/projects.wml b/projects/en/projects.wml index 985b050..b5b8560 100644 --- a/projects/en/projects.wml +++ b/projects/en/projects.wml @@ -18,7 +18,7 @@ experience safer and better.</p> src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon" width="75" height="75"></a> <div class="projectdesc"><div class="name"><a href="<page -projects/torbrowser>">Tor Browser</a></div> <p>The Tor Browser +projects/torbrowser>">Tor Browser</a></div> <p>Tor Browser contains everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.</p> </div></div> diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index 261973a..c94a298 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -17,7 +17,7 @@ <div class="tbb box"> #include "side.wmi"  - <div class="pjtitle"><h2>What is the Tor Browser?</h2></div> + <div class="pjtitle"><h2>What is Tor Browser?</h2></div> <div class="pjtext"> <p>The <strong>Tor</strong> software protects you by bouncing your communications around a distributed network of @@ -25,7 +25,7 @@ watching your Internet connection from learning what sites you visit, it prevents the sites you visit from learning your physical location, and it lets you access sites which are blocked.</p> - <p>The <strong>Tor Browser</strong> lets you use Tor on + <p><strong>Tor Browser</strong> lets you use Tor on Windows, Mac OS X, or Linux without needing to install any software. It can run off a USB flash drive, comes with a pre-configured web browser to protect your anonymity, and is self-contained @@ -42,7 +42,7 @@ </div> <!-- Commenting out the videos until support updates them to use TB 4.0 <div class="pjvids"> - <h3>Quick Videos on how to use the Tor Browser</h3> + <h3>Quick Videos on how to use Tor Browser</h3> </div> <div class="vidtable"> <table> @@ -624,7 +624,7 @@ of web pages you visited and any cookies will be deleted.</p> <p><a href="$(IMGROOT)/tbb-screenshot3.jpg"><img src="$(IMGROOT)/tbb-screenshot3.jpg" alt="Screenshot of Firefox" width="860" height="645"></a></p> - <p>To use the Tor Browser again, double click on the "Start Tor Browser" application.</p> + <p>To use Tor Browser again, double click on the "Start Tor Browser" application.</p> <p>Remember that Tor anonymizes the origin of your traffic, and it encrypts everything inside the Tor network, but <a href="<wikifaq>#ExitEavesdroppers">it can't encrypt your traffic @@ -643,7 +643,7 @@ email the <a href="<page about/contact>">help desk</a>.</p> <br><br> <h3>Comments and suggestions</h3> - <p>The Tor Browser is under development. + <p>Tor Browser is under development. To discuss improvements and submit comments, please use the <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk">tor-talk</a> mailing list.</p> @@ -651,7 +651,7 @@ <h3>More information</h3> <p><strong><em>What is Tor and why do I need it?</em></strong> <br>To learn more about Tor, visit the <a href="<page index>">Tor Project website</a>.</p> - <p><strong><em>What is in the Tor Browser?</em></strong> + <p><strong><em>What is in Tor Browser?</em></strong> <br>It contains Tor, a modified <a href="https://www.mozilla.org/en-US/firefox/organizations/">Firefox ESR</a>, Torbutton, TorLauncher,

1 0

[webwml/staging] Implement rewrite rules for donation campaign, again
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit d603837457a92091493cd479e57e6a23c84b656d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Nov 18 13:55:41 2016 +0100 Implement rewrite rules for donation campaign, again --- .htaccess | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.htaccess b/.htaccess index 407b61f..32d7306 100644 --- a/.htaccess +++ b/.htaccess @@ -95,3 +95,21 @@ RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L] # yuck, https://twitter.com/torproject/status/677928074630049793 RewriteRule ^Donate/Donate-Twitter(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-homepage-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-twitter-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-share-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-fb-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-blog-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-email-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-de(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-es(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-fa(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-fr(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-it(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-nl(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-pt(.*) https://donate.torproject.org [R=302,L] +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]

1 0

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

18 Nov '16

commit b817b1e8254219fbbe34f703e1340cfe31b2e686 Merge: 3d40243 d603837 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Nov 18 14:04:09 2016 +0100 Merge branch 'master' into staging .htaccess | 35 +++ Makefile | 4 +- about/en/board.wml | 126 +++++---- about/en/contact.wml | 2 +- about/en/contributors.wml | 18 +- about/en/corepeople.wml | 45 ++- about/en/jobs-ooni-ux-designer.wml | 105 +++++++ about/en/jobs-ooni.wml | 151 ---------- about/en/jobs.wml | 10 +- css/donate-style.css | 2 + css/layout.css | 14 - docs/en/debian.wml | 19 +- docs/en/faq-abuse.wml | 2 +- docs/en/faq.wml | 38 +-- docs/en/hidden-services.wml | 2 +- docs/en/pluggable-transports.wml | 271 ++++++++++-------- docs/en/rpms.wml | 100 +------ docs/en/signing-keys.wml | 30 +- docs/en/tor-doc-osx.wml | 4 +- docs/en/tor-doc-relay.wml | 3 +- docs/en/tor-doc-unix.wml | 2 - docs/en/tor-manual.wml | 2 +- docs/en/verifying-signatures.wml | 20 +- donate/en/donate-options.wml | 79 ++---- donate/en/donor-faq.wml | 2 +- download/en/download-easy.wml | 64 ++--- download/en/download-unix.wml | 2 +- download/en/download.wml | 35 +-- eff/en/tor-legal-faq.wml | 4 +- en/index.wml | 2 +- getinvolved/en/tshirt.wml | 10 +- getinvolved/en/volunteer.wml | 185 ++++++------- images/2016-tor-logo-heart.png | Bin 0 -> 35104 bytes images/PT/2016-07-how-to-use-PT.png | Bin 0 -> 494386 bytes images/tbb-macosx-step-1.png | Bin 21334 -> 0 bytes images/tbb-macosx-step-2.png | Bin 20451 -> 0 bytes images/tbb-macosx-step-3.png | Bin 13846 -> 0 bytes include/donatehead.wmi | 2 +- include/head.wmi | 15 +- include/mirrors-table.wmi | 202 ++++++-------- include/tor-mirrors.csv | 209 +++++++------- include/versions.wmi | 58 ++-- projects/en/gettor.wml | 6 + projects/en/obfsproxy-debian-instructions.wml | 150 ---------- projects/en/obfsproxy-instructions.wml | 164 ----------- projects/en/obfsproxy.wml | 102 ------- projects/en/projects.wml | 12 +- projects/en/sidenav.wmi | 10 +- projects/en/torbrowser.wml | 17 +- projects/torbrowser/RecommendedTBBVersions | 20 +- rule-41/widget.js.orig | 381 ++++++++++++++++++++++++++ rule-41/widget.min.js-orig | 42 +++ 52 files changed, 1328 insertions(+), 1450 deletions(-) diff --cc css/donate-style.css index 8dfbcc2,55cae54..671d097 --- a/css/donate-style.css +++ b/css/donate-style.css @@@ -229,100 -218,9 +229,102 @@@ blockquote::before blockquote footer{ color: rgb(240,240,240); } +.donate-button { + background-color: #4FAB76; + border-color: #47996A; +} +.donate-button:hover, +.donate-button:focus, +.donate-button:active, +.donate-button:active:hover, +.donate-button:active:focus{ + background-color: #47996A; + border-color: #47996A; +} +#other-ways-section{ + display: none; +} +#other-ways-section > .container-fluid{ + padding: 0; +} +.hundred.toptwenty{ + text-align: justify; + margin-top: 0; +} +.row-eqheight{ + overflow: hidden; + padding-bottom: 20px +} +.row-eqheight > [class*="col-"]{ + margin-bottom: -99999px; + padding-bottom: 99999px; +} +.other-ways-title{ + margin: 10px 0; +} +.other-ways-title > h3{ + display: inline; +} +.other-ways-icon{ + background: transparent; + margin-top: -10px; + margin-right: 5px; + border:0; +} +.bitcoin{ + padding-top: 10px; + padding-left: 30px; + padding-right: 30px; +} +#bitpayDonation > .well > .form-group { + margin-right: 0; + margin-left: 0; +} +#bitpayDonation > .well { + box-shadow: none; + border-radius: 7px; + margin-bottom: 0; +} +.check-eutransfer{ + padding-top: 10px; + padding-left: 30px; + padding-right: 30px; + border-left: 1px dashed #e3e3e3; +} +.minor-other-ways{ + background-color: #FAFAFA; +} +.even-more{ + padding: 25px 0; + background-color: #FAFAFA; +} +.other-ways-img{ + width: 100%; + max-width: 160px; +} +.img-thumbnail.other-ways-img { + padding: 1px; + transition: none 0s ease 0s; + border: 2px solid rgb(221, 221, 221); +} +.get-in-touch{ + background-color: #35734F; + color: #fff; +} +.title { + min-height: 80px; + margin-top: 20px; + margin-bottom: 20px; + border-right: 3px solid #3D855B; + padding-top: 25px; +} +.detail { + margin-bottom: 0px; + margin-top: 50px; +} footer.footer{ + margin-top: 20px; + bottom: 0; width: 100%; /* Set the height of the footer here */ /*height: 65px;*/ diff --cc include/head.wmi index 7dd267a,faf8dd1..296a54c --- a/include/head.wmi +++ b/include/head.wmi @@@ -39,21 -40,6 +40,7 @@@ <![endif]--> # <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script> # end WML to generate css/js paths -  - <script type="text/javascript"> - var banner_config = { - localAssets: true, // - }; + - (function(){ - var e = document.createElement('script'); e.type='text/javascript'; e.async = true; - e.src = 'rule-41/widget.min.js'; - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(e, s); - })(); - </script> -  - - </head> <body> <div id="wrap">

1 0

[webwml/staging] Implement rewrite rules for donation campaign
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit 10b8d933481f2820e7d6a3bca41d5dba441c9932 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Nov 18 13:55:41 2016 +0100 Implement rewrite rules for donation campaign --- .htaccess | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.htaccess b/.htaccess index 407b61f..d5645ea 100644 --- a/.htaccess +++ b/.htaccess @@ -95,3 +95,22 @@ RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L] # yuck, https://twitter.com/torproject/status/677928074630049793 RewriteRule ^Donate/Donate-Twitter(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-homepage-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-twitter-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-share-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-fb-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-blog-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-email-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-de(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-en(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-es(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-fa(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-fr(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-it(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-nl(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-tbb-pt(.*) https://donate.torproject.org [R=302,L] +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] + [R=302,L]

1 0

[webwml/staging] Revert "Implement rewrite rules for donation campaign"
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit 4decfd830cfa3d9e47934915ece80d5e7cb573fd Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Nov 18 13:59:37 2016 +0100 Revert "Implement rewrite rules for donation campaign" This reverts commit 10b8d933481f2820e7d6a3bca41d5dba441c9932. --- .htaccess | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/.htaccess b/.htaccess index d5645ea..407b61f 100644 --- a/.htaccess +++ b/.htaccess @@ -95,22 +95,3 @@ RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L] # yuck, https://twitter.com/torproject/status/677928074630049793 RewriteRule ^Donate/Donate-Twitter(.*) /donate/donate$1 [R=302,L] -RewriteRule ^donate/donate-homepage-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-twitter-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-share-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-fb-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-blog-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-email-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-de(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-en(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-es(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-fa(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-fr(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-it(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-nl(.*) https://donate.torproject.org [R=302,L] -RewriteRule ^donate/donate-tbb-pt(.*) https://donate.torproject.org [R=302,L] -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] - [R=302,L]

1 0

[webwml/staging] Add original widget.js and widget.min.js sources
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit c85ec84cb843db158c846f3d52cddffa8104b366 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Jun 21 01:53:30 2016 +0200 Add original widget.js and widget.min.js sources --- rule-41/widget.js.orig | 381 +++++++++++++++++++++++++++++++++++++++++++++ rule-41/widget.min.js-orig | 42 +++++ 2 files changed, 423 insertions(+) diff --git a/rule-41/widget.js.orig b/rule-41/widget.js.orig new file mode 100644 index 0000000..4d6f7f6 --- /dev/null +++ b/rule-41/widget.js.orig @@ -0,0 +1,381 @@ +/* + + ______ ______ ______ + | ____| | ____| | ____| + | |__ | |__ | |__ + | __| | __| | __| + | |____ | | | | + |______| |_| |_| + + ============================================================================= + + Support the NoGlobalWarrants.org campaign by installing this banner on your site. + + <sina(a)eff.org> for support + + ============================================================================= + + @source: https://github.com/EFForg/ngw-banner + + @licstart The following is the entire license notice for the + JavaScript code in this page. + + Copyright (C) 2016 Electronic Frontier Foundation <https://eff.org> + + The JavaScript code in this page is free software: you can + redistribute it and/or modify it under the terms of the GNU + General Public License (GNU GPL) as published by the Free Software + Foundation, either version 3 of the License, or (at your option) any + later version. The code is distributed WITHOUT ANY WARRANTY; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU GPL for more details. + + As additional permission under GNU GPL version 3 section 7, you may + distribute non-source (e.g., minimized or compacted) forms of that + code without the copy of the GNU GPL normally required by section + 4, provided you include this license notice and a URL through which + recipients can access the Corresponding Source. + + @licend The above is the entire license notice for the JavaScript + code in this page. + +*/ + +// Wrap widget in function to protect scope +var _banner_config = (typeof banner_config !== 'undefined') ? banner_config : {}; + +(function (window, widgetConfig) { + + // Do configuration + widgetConfig.show_style = widgetConfig.show_style || 'banner'; + widgetConfig.debug = widgetConfig.debug || false; + widgetConfig.localAssets = widgetConfig.localAssets || false; + widgetConfig.callOnly = widgetConfig.callOnly || false; + widgetConfig.startAsMinimized = widgetConfig.startAsMinimized || false; + widgetConfig.disableDate = widgetConfig.disableDate || false; + widgetConfig.campaign = widgetConfig.campaign || 'noglobalwarrants'; + widgetConfig.cookieTimeout = widgetConfig.cookieTimeout || null; + + function debug() { + if (widgetConfig.debug) { + if (this.console) { + console.log.apply(console, arguments); + } + } + } + + // Setup + var activeCampaign; + var ASSET_URL; + + if (widgetConfig.localAssets) { + ASSET_URL = '../banner_content/'; + } else { + ASSET_URL = 'https://www.eff.org/ngw/banner_content/'; + } + + // Cookie helpers, taken from w3schools + function setCookie(c_name, value, seconds) { + var exdate = new Date(new Date().getTime() + seconds * 1000); + var c_value = escape(value) + ((seconds === null) ? '' : '; expires=' + + exdate.toUTCString()); + document.cookie = c_name + '=' + c_value; + } + + function getCookie(c_name) { + var c_value = document.cookie; + var c_start = c_value.indexOf(' ' + c_name + '='); + + if (c_start === -1) { + c_start = c_value.indexOf(c_name + '='); + } + + if (c_start === -1) { + c_value = null; + } else { + c_start = c_value.indexOf('=', c_start) + 1; + var c_end = c_value.indexOf(';', c_start); + if (c_end === -1) { c_end = c_value.length; } + c_value = unescape(c_value.substring(c_start, c_end)); + } + + return c_value; + } + + // Define checks + var checks = { + correctDate: function (callback) { + debug('correctDate()'); + + // This used to check the date by getting it from a server, but now just uses the device's local date. + + window.dateCallBackFailSafe = setTimeout(function () { + var today = new Date(); + if (today.getDate() === activeCampaign.runDate.day && today.getMonth() === activeCampaign.runDate.month - 1 && today.getFullYear() === activeCampaign.runDate.year) { + callback({activeToday: true}); + } else { + callback({activeToday: false}); + } + }, 1); + } + }; + + // Define campaigns + var campaign = { + noglobalwarrants: { + cookieName: 'noglobalwarrants_hasseen', + runDate: { + day: 21, + month: 6, // Use natural month, e.g. January = 1 + year: 2016 + }, + size: { + desktop: { + heightOpened: '300px', + heightMinimized: '50px' + }, + mobile: { + heightOpened: '100px', + heightMinimized: '0px' + } + }, + styles: { + banner: { + campaignSpacer: 'height: 50px;', + campaignContainer: 'background: #000; position: fixed; ' + + 'width: 100%; bottom: 0; left: 0; z-index: 100000; padding: 0; ' + + '-webkit-box-sizing: border-box; -moz-box-sizing: border-box;', + iframeContainer: 'position: relative; height: 350px; width: 100%; ' + + 'margin: 0; background: #08A013; z-index: 1;', + iframe: 'width: 100%; height: 100%; border: 0; margin: 0; ' + + 'padding: 0; background: #08A013;', + footerOverlay: 'cursor: pointer; position: absolute; bottom: 0; ' + + 'height: 50px; width: 100%; margin: 0; background: none; ' + + 'z-index: 2;', + closeButton: 'border: 0; height: 26px; width: 26px; ' + + 'cursor: pointer; position: absolute; top: 20px; right: 20px; ' + + 'background: url("' + ASSET_URL + 'imgs/close-button.png") no-repeat right top;', + mobileCloseButton: 'border: 0; height: 20px; width: 20px; ' + + 'cursor: pointer; position: absolute;top: 10px; right: 10px; ' + + 'background: url("' + ASSET_URL + + 'imgs/close-button-mobile.png") no-repeat right top;', + openButton: 'border: 0; height: 26px; width: 26px; ' + + 'cursor: pointer; position: absolute; bottom: 10px; ' + + 'right: 20px; background: url("' + ASSET_URL + + 'imgs/open-button.png") no-repeat right top;' + } + }, + minimized: false, + show: function (options) { + debug('show()', options); + + var cookie = getCookie(activeCampaign.cookieName); + + if (widgetConfig.startAsMinimized && cookie === null) { + this.minimized = true; + } + + var style = activeCampaign.styles[activeCampaign.config.show_style]; + + if (style.overlay) { + var overlay = document.createElement('div'); + overlay.style.cssText = style.overlay; + document.body.appendChild(overlay); + } + + // Create a spacer to prevent the container from covering up + // parts of the containing page when minimized + + if(document.getElementById("campaign-spacer")){ + document.body.removeChild(document.getElementById("campaign-spacer")); + } + + if(document.getElementById("campaign-container")){ + document.body.removeChild(document.getElementById("campaign-container")); + } + + var campaignSpacer = document.createElement('div'); + window.campaignSpacer = campaignSpacer; + campaignSpacer.style.cssText = style.campaignSpacer; + campaignSpacer.setAttribute("id", "campaign-spacer"); + campaignSpacer.setAttribute("class", "campaign-spacer"); + // Create a container + var campaignContainer = document.createElement('div'); + window.campaignContainer = campaignContainer; + campaignContainer.style.cssText = style.campaignContainer; + campaignContainer.setAttribute("id", "campaign-container"); + campaignContainer.setAttribute("class", "campaign-container"); + + // Create a container for the iframe so we can do padding and + // border-radius properly + var iframeContainer = document.createElement('div'); + + iframeContainer.style.cssText = style.iframeContainer; + + var e = document.documentElement, + g = document.getElementsByTagName('body')[0], + x = window.innerWidth || e.clientWidth || g.clientWidth; + + if (x < 767) { + if (!this.minimized) { + iframeContainer.style.height = '100px'; + } else { + iframeContainer.style.height = '0px'; + } + } else { + // Find out if user has minimized via cookie + if (this.minimized) { + iframeContainer.style.height = '50px'; + } else { + iframeContainer.style.height = activeCampaign.size.desktop.heightOpened; + } + var footerOverlay = document.createElement('div'); + footerOverlay.style.cssText = style.footerOverlay; + campaignContainer.appendChild(footerOverlay); + } + + // Append Iframe and campaign container to document + campaignContainer.appendChild(iframeContainer); + + document.body.appendChild(campaignSpacer); + document.body.appendChild(campaignContainer); + + var firstTime = true; + + if (cookie !== null) { + firstTime = false; + } + + // a Hack, if mobile set firsttime to false so splash page never shows + if (x < 767) { + firstTime = false; + } + + var iframe = document.createElement('iframe'); + + iframe.style.cssText = style.iframe; + + var us = iframe.src = ASSET_URL + activeCampaign.config.show_style + + '.html?firstTime=' + firstTime; + + iframeContainer.appendChild(iframe); + + var that = this; + + if (x > 767) { + that.fullSize = true; + // Setup a close button + var closeButton = document.createElement('button'); + closeButton.style.cssText = style.closeButton; + iframeContainer.appendChild(closeButton); + + // Setup a open button + var openButton = document.createElement('button'); + openButton.style.cssText = style.openButton; + iframeContainer.appendChild(openButton); + + if (this.minimized) { + openButton.style.display = 'block'; + closeButton.style.display = 'none'; + footerOverlay.style.display = 'block'; + } else { + openButton.style.display = 'none'; + closeButton.style.display = 'block'; + footerOverlay.style.display = 'none'; + } + + var toggleDisplay = function () { + if (!that.minimized) { + iframeContainer.style.height = '50px'; + that.minimized = true; + footerOverlay.style.display = 'block'; + closeButton.style.display = 'none'; + openButton.style.display = 'block'; + setCookie(activeCampaign.cookieName, '{"minimized": true}', + widgetConfig.cookieTimeout); + } else { + iframeContainer.style.height = '300px'; + that.minimized = false; + footerOverlay.style.display = 'none'; + openButton.style.display = 'none'; + closeButton.style.display = 'block'; + setCookie(activeCampaign.cookieName, '{"minimized": false}', + widgetConfig.cookieTimeout); + } + }; + + footerOverlay.onclick = toggleDisplay; + closeButton.onclick = toggleDisplay; + } else { + that.fullSize = false; + var mobileCloseButton = document.createElement('button'); + mobileCloseButton.style.cssText = style.mobileCloseButton; + iframeContainer.appendChild(mobileCloseButton); + debug(that.minimized); + if (that.minimized) { + + mobileCloseButton.style.display = 'none'; + } else { + mobileCloseButton.style.display = 'block'; + } + mobileCloseButton.onclick = function () { + setCookie(activeCampaign.cookieName, '{"minimized": true}', + widgetConfig.cookieTimeout); + document.body.removeChild(campaignContainer); + }; + } + }, + init: function (config) { + activeCampaign.config = config; + + var cookie = getCookie(activeCampaign.cookieName); + var that = this; + + if (cookie) { + this.minimized = JSON.parse(cookie).minimized; + } + + checks.correctDate(function (response) { + debug('correctDate() callback', response); + + clearTimeout(window.dateCallBackFailSafe); + + if (response && (response.activeToday || + widgetConfig.disableDate || widgetConfig.debug)) { + + activeCampaign.show({ + location: null, + widgetConfig: widgetConfig + }); + + if (window.addEventListener) window.addEventListener('resize', function() { + var w = window, + d = document, + e = d.documentElement, + g = d.getElementsByTagName('body')[0], + x = w.innerWidth || e.clientWidth || g.clientWidth, + y = w.innerHeight|| e.clientHeight|| g.clientHeight; + if((that.fullSize && x < 767) || (!that.fullSize && x > 767)) { + if(window.tdwfbResizeCallback) { + clearTimeout(window.tdwfbResizeCallback); + } + window.tdwfbResizeCallback = setTimeout(function () { + that.show({location: window.tdwfbLocation, widgetConfig: widgetConfig}); + windowWidth = x; + }, 50); + } + }, false); + } + }); + } + } + }; + + // Load campaign if it exists + if (typeof campaign[widgetConfig.campaign] !== 'undefined') { + activeCampaign = campaign[widgetConfig.campaign]; + activeCampaign.init(widgetConfig); + } else { + return false; + } +})(window, _banner_config); \ No newline at end of file diff --git a/rule-41/widget.min.js-orig b/rule-41/widget.min.js-orig new file mode 100644 index 0000000..ead54c3 --- /dev/null +++ b/rule-41/widget.min.js-orig @@ -0,0 +1,42 @@ +/* + + ______ ______ ______ + | ____| | ____| | ____| + | |__ | |__ | |__ + | __| | __| | __| + | |____ | | | | + |______| |_| |_| + + ============================================================================= + + Support the NoGlobalWarrants.org campaign by installing this banner on your site. + + <sina(a)eff.org> for support + + ============================================================================= + + @source: https://github.com/EFForg/ngw-banner + + @licstart The following is the entire license notice for the + JavaScript code in this page. + + Copyright (C) 2016 Electronic Frontier Foundation <https://eff.org> + + The JavaScript code in this page is free software: you can + redistribute it and/or modify it under the terms of the GNU + General Public License (GNU GPL) as published by the Free Software + Foundation, either version 3 of the License, or (at your option) any + later version. The code is distributed WITHOUT ANY WARRANTY; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU GPL for more details. + + As additional permission under GNU GPL version 3 section 7, you may + distribute non-source (e.g., minimized or compacted) forms of that + code without the copy of the GNU GPL normally required by section + 4, provided you include this license notice and a URL through which + recipients can access the Corresponding Source. + + @licend The above is the entire license notice for the JavaScript + code in this page. + +*/var _banner_config=typeof banner_config!=="undefined"?banner_config:{};(function(window,widgetConfig){widgetConfig.show_style=widgetConfig.show_style||"banner";widgetConfig.debug=widgetConfig.debug||false;widgetConfig.localAssets=widgetConfig.localAssets||false;widgetConfig.callOnly=widgetConfig.callOnly||false;widgetConfig.startAsMinimized=widgetConfig.startAsMinimized||false;widgetConfig.disableDate=widgetConfig.disableDate||false;widgetConfig.campaign=widgetConfig.campaign||"noglobalwarrants";widgetConfig.cookieTimeout=widgetConfig.cookieTimeout||null;function debug(){if(widgetConfig.debug){if(this.console){console.log.apply(console,arguments)}}}var activeCampaign;var ASSET_URL;if(widgetConfig.localAssets){ASSET_URL="../banner_content/"}else{ASSET_URL="https://www.eff.org/ngw/banner_content/"}function setCookie(c_name,value,seconds){var exdate=new Date((new Date).getTime()+seconds*1e3);var c_value=escape(value)+(seconds===null?"":"; expires="+exdate.toUTCString());document.cook ie=c_name+"="+c_value}function getCookie(c_name){var c_value=document.cookie;var c_start=c_value.indexOf(" "+c_name+"=");if(c_start===-1){c_start=c_value.indexOf(c_name+"=")}if(c_start===-1){c_value=null}else{c_start=c_value.indexOf("=",c_start)+1;var c_end=c_value.indexOf(";",c_start);if(c_end===-1){c_end=c_value.length}c_value=unescape(c_value.substring(c_start,c_end))}return c_value}var checks={correctDate:function(callback){debug("correctDate()");window.dateCallBackFailSafe=setTimeout(function(){var today=new Date;if(today.getDate()===activeCampaign.runDate.day&&today.getMonth()===activeCampaign.runDate.month-1&&today.getFullYear()===activeCampaign.runDate.year){callback({activeToday:true})}else{callback({activeToday:false})}},1)}};var campaign={noglobalwarrants:{cookieName:"noglobalwarrants_hasseen",runDate:{day:21,month:6,year:2016},size:{desktop:{heightOpened:"300px",heightMinimized:"50px"},mobile:{heightOpened:"100px",heightMinimized:"0px"}},styles:{banner:{campaignSpacer:"h eight: 50px;",campaignContainer:"background: #000; position: fixed; "+"width: 100%; bottom: 0; left: 0; z-index: 100000; padding: 0; "+"-webkit-box-sizing: border-box; -moz-box-sizing: border-box;",iframeContainer:"position: relative; height: 350px; width: 100%; "+"margin: 0; background: #08A013; z-index: 1;",iframe:"width: 100%; height: 100%; border: 0; margin: 0; "+"padding: 0; background: #08A013;",footerOverlay:"cursor: pointer; position: absolute; bottom: 0; "+"height: 50px; width: 100%; margin: 0; background: none; "+"z-index: 2;",closeButton:"border: 0; height: 26px; width: 26px; "+"cursor: pointer; position: absolute; top: 20px; right: 20px; "+'background: url("'+ASSET_URL+'imgs/close-button.png") no-repeat right top;',mobileCloseButton:"border: 0; height: 20px; width: 20px; "+"cursor: pointer; position: absolute;top: 10px; right: 10px; "+'background: url("'+ASSET_URL+'imgs/close-button-mobile.png") no-repeat right top;',openButton:"border: 0; height: 26px; width: 26px; "+"c ursor: pointer; position: absolute; bottom: 10px; "+'right: 20px; background: url("'+ASSET_URL+'imgs/open-button.png") no-repeat right top;'}},minimized:false,show:function(options){debug("show()",options);var cookie=getCookie(activeCampaign.cookieName);if(widgetConfig.startAsMinimized&&cookie===null){this.minimized=true}var style=activeCampaign.styles[activeCampaign.config.show_style];if(style.overlay){var overlay=document.createElement("div");overlay.style.cssText=style.overlay;document.body.appendChild(overlay)}if(document.getElementById("campaign-spacer")){document.body.removeChild(document.getElementById("campaign-spacer"))}if(document.getElementById("campaign-container")){document.body.removeChild(document.getElementById("campaign-container"))}var campaignSpacer=document.createElement("div");window.campaignSpacer=campaignSpacer;campaignSpacer.style.cssText=style.campaignSpacer;campaignSpacer.setAttribute("id","campaign-spacer");campaignSpacer.setAttribute("class","campaign-spa cer");var campaignContainer=document.createElement("div");window.campaignContainer=campaignContainer;campaignContainer.style.cssText=style.campaignContainer;campaignContainer.setAttribute("id","campaign-container");campaignContainer.setAttribute("class","campaign-container");var iframeContainer=document.createElement("div");iframeContainer.style.cssText=style.iframeContainer;var e=document.documentElement,g=document.getElementsByTagName("body")[0],x=window.innerWidth||e.clientWidth||g.clientWidth;if(x<767){if(!this.minimized){iframeContainer.style.height="100px"}else{iframeContainer.style.height="0px"}}else{if(this.minimized){iframeContainer.style.height="50px"}else{iframeContainer.style.height=activeCampaign.size.desktop.heightOpened}var footerOverlay=document.createElement("div");footerOverlay.style.cssText=style.footerOverlay;campaignContainer.appendChild(footerOverlay)}campaignContainer.appendChild(iframeContainer);document.body.appendChild(campaignSpacer);document.body.appendCh ild(campaignContainer);var firstTime=true;if(cookie!==null){firstTime=false}if(x<767){firstTime=false}var iframe=document.createElement("iframe");iframe.style.cssText=style.iframe;var us=iframe.src=ASSET_URL+activeCampaign.config.show_style+".html?firstTime="+firstTime;iframeContainer.appendChild(iframe);var that=this;if(x>767){that.fullSize=true;var closeButton=document.createElement("button");closeButton.style.cssText=style.closeButton;iframeContainer.appendChild(closeButton);var openButton=document.createElement("button");openButton.style.cssText=style.openButton;iframeContainer.appendChild(openButton);if(this.minimized){openButton.style.display="block";closeButton.style.display="none";footerOverlay.style.display="block"}else{openButton.style.display="none";closeButton.style.display="block";footerOverlay.style.display="none"}var toggleDisplay=function(){if(!that.minimized){iframeContainer.style.height="50px";that.minimized=true;footerOverlay.style.display="block";closeButton.styl e.display="none";openButton.style.display="block";setCookie(activeCampaign.cookieName,'{"minimized": true}',widgetConfig.cookieTimeout)}else{iframeContainer.style.height="300px";that.minimized=false;footerOverlay.style.display="none";openButton.style.display="none";closeButton.style.display="block";setCookie(activeCampaign.cookieName,'{"minimized": false}',widgetConfig.cookieTimeout)}};footerOverlay.onclick=toggleDisplay;closeButton.onclick=toggleDisplay}else{that.fullSize=false;var mobileCloseButton=document.createElement("button");mobileCloseButton.style.cssText=style.mobileCloseButton;iframeContainer.appendChild(mobileCloseButton);debug(that.minimized);if(that.minimized){mobileCloseButton.style.display="none"}else{mobileCloseButton.style.display="block"}mobileCloseButton.onclick=function(){setCookie(activeCampaign.cookieName,'{"minimized": true}',widgetConfig.cookieTimeout);document.body.removeChild(campaignContainer)}}},init:function(config){activeCampaign.config=config;var cook ie=getCookie(activeCampaign.cookieName);var that=this;if(cookie){this.minimized=JSON.parse(cookie).minimized}checks.correctDate(function(response){debug("correctDate() callback",response);clearTimeout(window.dateCallBackFailSafe);if(response&&(response.activeToday||widgetConfig.disableDate||widgetConfig.debug)){activeCampaign.show({location:null,widgetConfig:widgetConfig});if(window.addEventListener)window.addEventListener("resize",function(){var w=window,d=document,e=d.documentElement,g=d.getElementsByTagName("body")[0],x=w.innerWidth||e.clientWidth||g.clientWidth,y=w.innerHeight||e.clientHeight||g.clientHeight;if(that.fullSize&&x<767||!that.fullSize&&x>767){if(window.tdwfbResizeCallback){clearTimeout(window.tdwfbResizeCallback)}window.tdwfbResizeCallback=setTimeout(function(){that.show({location:window.tdwfbLocation,widgetConfig:widgetConfig});windowWidth=x},50)}},false)}})}}};if(typeof campaign[widgetConfig.campaign]!=="undefined"){activeCampaign=campaign[widgetConfig.campaign];a ctiveCampaign.init(widgetConfig)}else{return false}})(window,_banner_config); \ No newline at end of file

1 0

[webwml/staging] Add Tom Ritter to core people
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit 39d2a9c837a8f601b3247ba9f537bd12fc3ab9df Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Jun 23 03:25:53 2016 +0200 Add Tom Ritter to core people --- about/en/corepeople.wml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 5413c03..2e13483 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -293,6 +293,11 @@ <dd>Does trainings and outreach. Runs one of the directory authorities.</dd> + <dt>Tom Ritter, Developer</dt> + <dd>Maintains <a + href="https://consensus-health.torproject.org/">Consensus + Health</a> and runs one of the bandwidth authorities.</dd> + <dt>Leif Ryge, Developer</dt> <dd>Works on security analysis, designer of "bananaphone" transport, and part of the pluggable transports team.</dd>

1 0

[webwml/staging] Remove the ooni job posting
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit 1c0d0841571d71bb1d4eeb3226ad4efaadda2f73 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Jun 21 13:20:03 2016 +0200 Remove the ooni job posting --- about/en/jobs-ooni.wml | 151 ------------------------------------------------- about/en/jobs.wml | 22 +++---- 2 files changed, 11 insertions(+), 162 deletions(-) diff --git a/about/en/jobs-ooni.wml b/about/en/jobs-ooni.wml deleted file mode 100644 index cb52c24..0000000 --- a/about/en/jobs-ooni.wml +++ /dev/null @@ -1,151 +0,0 @@ -## translation metadata -# Revision: $Revision$ -# Translation-Priority: 3-low - -#include "head.wmi" TITLE="Tor Project: Jobs (core developer)" CHARSET="UTF-8" -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page about/overview>">About » </a> - <a href="<page about/jobs>">Jobs</a> - </div> - <div id="maincol"> -<h1>The Tor Project is looking for another dedicated core developer to -work on OONI!</h1> - -<p> -Your job will be to work as a software engineer on the Open Observatory -of Network Interference (OONI), a global network measurement platform. -Your initial focus will be on the design and implementation of a -mechanism for instrumenting probes on which measurements should be run -and re-engineering the data processing pipeline to scale to the growing -OONI user-base. - -Moreover you will be expected to be working on improving the existing -measurement instrument (ooni-probe) and the data collection backend -component (ooni-backend). -</p> - -<p> -This dedicated contractor position starts as soon as possible for -a duration of 12 months (or more, depending on further funding and -progression of the project). -</p> - -<p>Deadline for submissions: 20th of June 2016</p> - -<p> -Any candidate must: -</p> - -<ul> - <li>Have extensive experience in python and several other - programming languages.</li> - <li>Be comfortable working remotely.</li> - <li>Be self-directed.</li> - <li>Be comfortable and experienced in getting code and design - reviewed and reviewing the code and design of others.</li> - <li>Be comfortable and experienced in documenting and designing - protocols.</li> - <li>Be comfortable with transparency: as a non-profit, everything - we do is in public, including your name (or company name) and - pay rate.</li> -</ul> - -<p> -An ideal candidate would also: -</p> - -<ul> - <li>Have prior experience with designing and implementing scalable - complex network applications.</li> - <li>Not be afraid of refactoring code and writing unit-tests.</li> - <li>Be familiar with the challenges of developing and scaling data - processing pipelines.</li> - <li>Have prior experience working with the - <a href="https://twistedmatrix.com">Twisted python networking - framework</a>.</li> - <li>Be familiar with the network measurement field.</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.</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>Be passionate about internet freedom and interested in - contributing to it in a concrete way.</li> -</ul> - -<p> -Other notes: -</p> - -<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>Compensation will be determined based on experience and can be - in the range of $6500-$7500 per month.</li> -</ul> - -<p> -How to apply -</p> - -<ul> - <li>Link to a sample of code you've written in the past that you're - allowed to show us and ideally also your github profile.</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 co-workers, open source projects, - etc.</li> - <li>Email the above to oonidevjob(a)torproject.org</li> -</ul> - -<p> -About the project: -</p> - -<p> -The Open Observatory of Network Interference (OONI) is a free software -project under the Tor Project which collects and processes network -measurements with the aim of detecting network interferences, such as -censorship, surveillance and traffic manipulation. Since late 2012, OONI -has collected millions of measurements across more than 90 countries -around the world. -</p> - -<p> -About the company: -</p> - -<p> -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 6000 volunteer relays carry 48 Gbps for several 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 30 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. -</p> - - </div> -  - <div id = "sidecol"> -#include "side.wmi" -#include "info.wmi" - </div> -  -</div> - -#include <foot.wmi> - diff --git a/about/en/jobs.wml b/about/en/jobs.wml index eab3af4..4a585f1 100644 --- a/about/en/jobs.wml +++ b/about/en/jobs.wml @@ -12,18 +12,18 @@ <div id="maincol"> <h1>The Tor Project is always looking for more great people to join our team!</h1> -#<p>At the moment, we don't have any official open positions. Please check back -#soon, though! In the meantime, you may want to glance at our -#<a href="<page getinvolved/volunteer>">volunteers</a> page. +<p>At the moment, we don't have any official open positions. Please check back +soon, though! In the meantime, you may want to glance at our +<a href="<page getinvolved/volunteer>">volunteers</a> page. -<p>Specifically, we're looking for the following people currently: -</p> -<ul> -<li><a href="<page about/jobs-ooni>">Core OONI 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> -</p> +#<p>Specifically, we're looking for the following people currently: +#</p> +#<ul> +#<li><a href="<page about/jobs-ooni>">Core OONI 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> +#</p> <p>In the past, we looked for the following people:</p>

1 0

[webwml/staging] Add ewyatt to core people
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit 28d5d360b651288c53e7670d20d1a84f4c5ccdae Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Jun 24 01:13:43 2016 +0200 Add ewyatt to core people --- about/en/corepeople.wml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 2e13483..14a2f8f 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -362,6 +362,9 @@ and part of the pluggable transports team. Post-doc at Princeton.</dd> + <dt>Erin Wyatt, HR Manager</dt> + <dd>Based in the Seattle office.</dd> + <dt>Yawning, Developer</dt> <dd>Lead developer on obfs4proxy and other pluggable transports. Part of the pluggable transports team.</dd>

1 0

[webwml/staging] Add blurbs for Gunner and dawuud
by sebastian＠torproject.org 18 Nov '16

18 Nov '16

commit 0e7e1ab1ee03c0f668395c6b7a1bbfb22be99c95 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Jun 26 12:51:54 2016 +0200 Add blurbs for Gunner and dawuud --- about/en/corepeople.wml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index e7d2c0b..c55be8b 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -129,6 +129,11 @@ <dd>Onion services developer, core member of Tor development team, and lead developer of Torsocks 2.0.</dd> + <dt>Allen Gunn, Tor Community Meetings</dt> + <dd>Gunner co-organizes and helps lead the <a + href="https://trac.torproject.org/projects/tor/wiki/org/meetings">Tor + Dev Meetings</a>, and advises on Tor community matters.</dd> + <dt>Marie Gutbub, Advocate</dt> <dd>Helps educate the world about the value of Tor, especially in Europe.</dd> @@ -319,6 +324,12 @@ <dd>Part of the Tor Browser team — develops and maintains Tor Launcher and Torbutton.</dd> + <dt>David Stainton, Developer</dt> + <dd>David contributes code to txttorcon (onion service + endpoint), authored roflcopter (tor control port filter + daemon) and HoneyBadger (TCP injection attack detector). He + also analyzes the Tor network for attacks.</dd> + <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

1 0