tor-webwml.git

@@ -59,14 +59,14 @@ repeated requests.  Therefore, we advocate for a subscription-based

 approach:  simply sign up for recurring monthly donations. Consistent

 donations let us worry less about fund-raising and focus on improving

 the Tor software and network. You can cancel your subscription at any

-time. There are two ways to donate:

+time. There are two ways to donate:</p>

+

 <ol>

 <li>through our <a href="http://givv.org/recipients/the-tor-project">Givv account</a></li>

-

 <li>Or through PayPal.  If Paypal, see below:</li>

 </ol>

+

 <form id="subscribe" action="https://www.paypal.com/cgi-bin/webscr" method="post">

-</p>

 <br />

 Choose your currency:

 <select name="currency_code">

@@ -90,44 +90,42 @@ Choose your currency:

 <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="image" src="images/btn_donateCC_LG.gif" name="submit"

- alt="Make payments with PayPal - it's fast, free and secure!"/>

+<input type="image" src="images/btn_donateCC_LG.gif" name="submit" alt="Make payments with PayPal - it's fast, free and secure!"/>

 <input type="hidden" name="cmd" value="_xclick-subscriptions" />

 <input type="hidden" name="business" value="donations@torproject.org" />

 <input type="hidden" name="item_name" value="Tor Project Membership" />

-<input type="hidden" name="return"

-value="https://www.torproject.org/donate#funds"/>

-<input type="hidden" name="cancel_return"

- value="https://www.torproject.org/donate"/>

+<input type="hidden" name="return" value="https://www.torproject.org/donate#funds"/>

+<input type="hidden" name="cancel_return" value="https://www.torproject.org/donate"/>

 </form>

+

 <br />

+

 <h3><a class="anchor" href="#paypal">Single donation via Amazon or PayPal</a></h3>

+

 <ol>

 <li>through Amazon Payments:</li>

 <div style="width:20em;padding-left:10px;padding-top:10px;padding-right:10px;padding-bottom:10px;">

 	<table class="table" border="0" cellpadding="0" cellspacing="0" width="100%">

 	<tr>

 	<form action="https://authorize.payments.amazon.com/pba/paypipeline" method="post">

-	  <input type="hidden" name="immediateReturn" value="1" >

-	  <input type="hidden" name="collectShippingAddress" value="0" >

-	  <input type="hidden" name="signatureVersion" value="2" >

-	  <input type="hidden" name="signatureMethod" value="HmacSHA256" >

-	  <input type="hidden" name="minimumDonationAmount" value="USD 10" >

-	  <input type="hidden" name="accessKey" value="11SEM03K88SD016FS1G2" >

-	  <input type="hidden" name="signature" value="Q+R9ErF8Kcz7GFQ/CYw8aSEYlWa/otVLgxVACPvHcJM=" >

-	  <input type="hidden" name="isDonationWidget" value="1" >

-	  <input type="hidden" name="description" value="Supporting Online Anonymity &amp; Privacy" >

-	  <input type="hidden" name="amazonPaymentsAccountId" value="XGSROLNTXRNC3N1P4TXKMNK14LN1D6SZUD8SN1" >

-	  <input type="hidden" name="returnUrl" value="https://www.torproject.org/donate.html.en#outcome" >

-	  <input type="hidden" name="processImmediate" value="1" >

-	  <input type="hidden" name="cobrandingStyle" value="logo" >

-	  <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate.html.en#outcome" >

-

-	<td>$&nbsp;

-	<input type="text" name="amount" size="8"

-		value="10"></td>

+	  <input type="hidden" name="immediateReturn" value="1" />

+	  <input type="hidden" name="collectShippingAddress" value="0" />

+	  <input type="hidden" name="signatureVersion" value="2" />

+	  <input type="hidden" name="signatureMethod" value="HmacSHA256" />

+	  <input type="hidden" name="minimumDonationAmount" value="USD 10" />

+	  <input type="hidden" name="accessKey" value="11SEM03K88SD016FS1G2" />

+	  <input type="hidden" name="signature" value="Q+R9ErF8Kcz7GFQ/CYw8aSEYlWa/otVLgxVACPvHcJM=" />

+	  <input type="hidden" name="isDonationWidget" value="1" />

+	  <input type="hidden" name="description" value="Supporting Online Anonymity &amp; Privacy" />

+	  <input type="hidden" name="amazonPaymentsAccountId" value="XGSROLNTXRNC3N1P4TXKMNK14LN1D6SZUD8SN1" />

+	  <input type="hidden" name="returnUrl" value="https://www.torproject.org/donate.html.en#outcome" />

+	  <input type="hidden" name="processImmediate" value="1" />

+	  <input type="hidden" name="cobrandingStyle" value="logo" />

+	  <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate.html.en#outcome" />

+	  <td>&nbsp;</td>

+	  <td><input type="text" name="amount" size="8" value="10" /></td>

 	  <td>&nbsp;</td>

-	<td><input type="image" src="http://g-ecx.images-amazon.com/images/G/01/asp/golden_small_donate_withmsg_whitebg.gif" border="0"></td>

+	  <td><input type="image" src="http://g-ecx.images-amazon.com/images/G/01/asp/golden_small_donate_withmsg_whitebg.gif" border="0" /></td>

 	</form>

 	</tr>

 	</table>

@@ -150,32 +148,35 @@ doesn't require any account):<br />

 </select>

 <input type="hidden" name="no_shipping" value="1" />

-<input type="image" src="images/btn_donateCC_LG.gif"

- name="submit" alt="Make payments with PayPal - it's fast, free and

-secure!"/>

+<input type="image" src="images/btn_donateCC_LG.gif" name="submit" alt="Make payments with PayPal - it's fast, free and secure!"/>

 <input type="hidden" name="cmd" value="_xclick" />

 <input type="hidden" name="business" value="donations@torproject.org" />

 <input type="hidden" name="item_name" value="Tor" />

-<input type="hidden" name="return"

-value="https://www.torproject.org/donate#funds"/>

-<input type="hidden" name="cancel_return"

-value="https://www.torproject.org/donate"/>

+<input type="hidden" name="return" value="https://www.torproject.org/donate#funds"/>

+<input type="hidden" name="cancel_return" value="https://www.torproject.org/donate"/>

 </p>

 </form>

+</ol>

 <p>If you want to send a check, money order, or cash, please send

 to:</p>

-<p><address>The Tor Project<br />

+<p>

+<address>

+The Tor Project<br />

 969 Main Street, Suite 206<br />

-Walpole, MA 02081 USA</address></p>

+Walpole, MA 02081 USA

+</address>

+</p>

-If in Europe, feel free to donate to the <a href="http://ccc.de/">Chaos

-Computer Club</a> on behalf of Tor:

+If in Europe, feel free to donate to the <a href="http://ccc.de/">Chaos Computer Club</a> on behalf of Tor:

 <p>

-<address>Wau Holland Stiftung<br />

+<address>

+Wau Holland Stiftung<br />

 IBAN DE03 5204 0021 0277 281202<br />

-SWIFT BIC COBADEFF520</address></p>

+SWIFT BIC COBADEFF520

+</address>

+</p>

 <p>If you want a donation receipt for your non-paypal, non-check deposit,

 please specifically request one with your mailed donation.</p>

@@ -185,15 +186,16 @@ please specifically request one with your mailed donation.</p>

 <h3><a class="anchor" href="#services">Donate Services</a></h3>

 <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 <a

-href="<page sponsors>">many sponsors</a> in providing online privacy

+representation, or consulting.  By donating services, you join our <a href="<page sponsors>">many sponsors</a> 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 <a href="<page

+coders to either port Tor to new or old operating systems, or solve difficult

+online anonymity problems.  Take a look at <a href="<page

 volunteer>#Coding">our coding projects</a>.</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

@@ -218,11 +225,13 @@ anonymity?</p>

 <a id="outcome"></a>

 <a id="funds"></a><a class="anchor" href="#funds"></a>

 <h3><a class="anchor" href="#outcome">What happens to my donation?</a></h3>

-<p>If you've just donated, thank you for your donation.  Your funds are deposited into our general fund.  You join our

-<a href="<page sponsors>">many sponsors</a> in funding the future of Tor and online anonymity.

-In 2008, The Tor Project spent and received its funds as follows: </p>

-<p><img src="images/2008-funding-chart.png" alt="Who funds the Tor Project?"/>

-<img src="images/2008-expenses-chart.png" alt="How is the money spent?"/></p>

+

+<p>If you've just donated, thank you for your donation.  Your funds are deposited into our general fund.  You join our <a href="<page sponsors>">many sponsors</a> in funding the future of Tor and online anonymity. In 2008, The Tor Project spent and received its funds as follows: </p>

+

+<p>

+<img src="images/2008-funding-chart.png" alt="Who funds the Tor Project?" />

+<img src="images/2008-expenses-chart.png" alt="How is the money spent?" />

+</p>

 <div class="underline"></div>

 <strong>The Tor Project respects the confidentiality of our supporters,