line-wrap, no actual changes
Roger Dingledine

Roger Dingledine commited on 2015-12-10 00:13:35
Zeige 1 geänderte Dateien mit 347 Einfügungen und 93 Löschungen.

... ...
@@ -14,128 +14,331 @@
14 14
           <ol>
15 15
           <li>
16 16
             <p><strong>What is the Tor Project and what does it do?</strong></p>
17
-            <p>The Tor Project’s 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. The main product of the Tor Project is the 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>
17
+            <p>The Tor Project’s mission is to advance human rights
18
+            and freedoms by creating and deploying free and open
19
+            anonymity and privacy technologies, supporting their
20
+            unrestricted availability and use, and furthering their
21
+            scientific and popular understanding. The main product of
22
+            the Tor Project is the Tor Browser, which enables people
23
+            to browse the internet anonymously.  The Tor Project is a
24
+            501(c)3 tax-exempt non-profit organization based in Boston,
25
+            Massachusetts. It was founded in 2006.</p>
18 26
           </li>
19 27
           <li>
20 28
             <p><strong>Who works for the Tor Project, and what do they do?</strong></p>
21
-            <p>Thousands people around the world actively support the work of the Tor Project, including developers, designers, relay operators, researchers, cryptographers, computer scientists, and privacy advocates, and most are not paid by the Tor Project. The paid staff of the Tor Project is very small: about 20 people in total. You can read about the core contributors to the Tor Project on our <a href="https://www.torproject.org/about/corepeople.html.en" target="_blank">Core People page</a>.</p>
29
+            <p>Thousands people around the world actively support the
30
+            work of the Tor Project, including developers, designers,
31
+            relay operators, researchers, cryptographers, computer
32
+            scientists, and privacy advocates, and most are not paid
33
+            by the Tor Project. The paid staff of the Tor Project
34
+            is very small: about 20 people in total. You can read
35
+            about the core contributors to the Tor Project on our <a
36
+            href="https://www.torproject.org/about/corepeople.html.en"
37
+            target="_blank">Core People page</a>.</p>
22 38
           </li>
23 39
           <li>
24 40
             <p><strong>Who uses Tor?</strong></p>
25
-            <p>The vast majority of Tor users are ordinary people who want control of their privacy online or people whose internet use is censored. Other Tor users are journalists, human rights defenders, domestic violence survivors, policymakers, diplomats, and academic and research institutions.</p>
41
+            <p>The vast majority of Tor users are ordinary people who
42
+            want control of their privacy online or people whose internet
43
+            use is censored. Other Tor users are journalists, human
44
+            rights defenders, domestic violence survivors, policymakers,
45
+            diplomats, and academic and research institutions.</p>
26 46
           </li>
27 47
           <li>
28 48
             <p><strong>Can anyone use Tor?</strong></p>
29
-            <p>Yes! Tor is free, and anyone can use it. To get started, you will need to <a href="https://www.torproject.org/projects/torbrowser.html.en" target="_blank">download the Tor browser</a>. We offer instructions on how to download for <a href="https://www.torproject.org/projects/torbrowser.html.en#windows" target="_blank">Windows</a>, <a href="https://www.torproject.org/projects/torbrowser.html.en#macosx" target="_blank">Mac OS X</a> and <a href="https://www.torproject.org/projects/torbrowser.html.en#linux" target="_blank">Linux</a>.</p>
49
+            <p>Yes! Tor is free, and anyone can
50
+            use it. To get started, you will need to <a
51
+            href="https://www.torproject.org/projects/torbrowser.html.en"
52
+            target="_blank">download the Tor browser</a>. We
53
+            offer instructions on how to download for <a
54
+            href="https://www.torproject.org/projects/torbrowser.html.en#windows"
55
+            target="_blank">Windows</a>, <a
56
+            href="https://www.torproject.org/projects/torbrowser.html.en#macosx"
57
+            target="_blank">Mac OS X</a> and <a
58
+            href="https://www.torproject.org/projects/torbrowser.html.en#linux"
59
+            target="_blank">Linux</a>.</p>
30 60
           </li>
31 61
           <li>
32 62
             <p><strong>What kinds of people support Tor?</strong></p>
33
-            <p>All kinds of people. Thousands of individuals have donated to support the Tor Project, and we have also received funding from a wide range of organizations including Google, the Ford Foundation, the Knight Foundation, Reddit, the U.S. National Science Foundation, the Electronic Frontier Foundation, Human Rights Watch, the Swedish International Development Cooperation Agency, the Federal Foreign Office of Germany, the U.S. Naval Research Laboratory, Omidyar Network, SRI International, and Radio Free Asia. People also support Tor in non-financial ways, for example by running Tor relays and exit nodes. In addition, everybody who uses Tor is helping to keep other users safe and anonymous, because the more people using Tor, the harder it is to identify any single individual</p>
63
+            <p>All kinds of people. Thousands of individuals have donated
64
+            to support the Tor Project, and we have also received funding
65
+            from a wide range of organizations including Google, the Ford
66
+            Foundation, the Knight Foundation, Reddit, the U.S. National
67
+            Science Foundation, the Electronic Frontier Foundation,
68
+            Human Rights Watch, the Swedish International Development
69
+            Cooperation Agency, the Federal Foreign Office of Germany,
70
+            the U.S. Naval Research Laboratory, Omidyar Network, SRI
71
+            International, and Radio Free Asia. People also support Tor in
72
+            non-financial ways, for example by running Tor relays and exit
73
+            nodes. In addition, everybody who uses Tor is helping to keep
74
+            other users safe and anonymous, because the more people using
75
+            Tor, the harder it is to identify any single individual</p>
34 76
           </li>
35 77
           <li>
36 78
             <p><strong>How does the Tor software work to protect people's anonymity?</strong></p>
37
-            <p>Tor protects you by bouncing your communications around the Tor network, which is a distributed network of relays run by volunteers all around the world. If someone is watching your internet connection, Tor prevents them from finding out what sites you are visiting. It also prevents sites you visit from finding out where you're located. You can read more about how Tor works on our <a href="https://www.torproject.org/about/overview.html.en" target="_blank">overview page</a>.</p>
79
+            <p>Tor protects you by bouncing your communications around
80
+            the Tor network, which is a distributed network of relays
81
+            run by volunteers all around the world. If someone is
82
+            watching your internet connection, Tor prevents them
83
+            from finding out what sites you are visiting. It also
84
+            prevents sites you visit from finding out where you're
85
+            located. You can read more about how Tor works on our <a
86
+            href="https://www.torproject.org/about/overview.html.en"
87
+            target="_blank">overview page</a>.</p>
38 88
           </li>
39 89
           <li>
40
-            <p><strong>I would like to know more about how Tor works, what hidden services are, or how to run a relay.</strong></p>
41
-            <p><a href="https://www.torproject.org/docs/faq.html.en" target="_blank">This Tor Project FAQ</a> has answers to all those questions, and more.</p>
90
+            <p><strong>I would like to know more about how Tor works,
91
+            what hidden services are, or how to run a relay.</strong></p>
92
+            <p><a href="https://www.torproject.org/docs/faq.html.en"
93
+            target="_blank">This Tor Project FAQ</a> has answers to all
94
+            those questions, and more.</p>
42 95
           </li>
43 96
           <li>
44 97
             <p><strong>Does the Tor software work?</strong></p>
45
-            <p>We believe Tor is the best solution available today, and we know that it does a better job of keeping you safely anonymous than other options such as VPNs, proxychains, or browser "private browsing" modes. We know that both the Russian government and the NSA have tried in the past to crack Tor, and failed. The Electronic Frontier Foundation says that Tor offers "<a href="https://www.eff.org/deeplinks/2014/07/7-things-you-should-know-about-tor" target="_blank">some of the strongest anonymity software that exists</a>, and in his book Data and Goliath, security expert Bruce Schneier wrote "The current best tool to protect your anonymity when browsing the web is Tor."</p>
46
-          </li>
47
-          <li>
48
-            <p><strong>Is what Tor does legal? Can I get in trouble for using it?</strong></p>
49
-            <p>Downloading the Tor browser or using the Tor network is legal in nearly every country. A few web sites occasionally block Tor, but that doesn't mean you're doing anything wrong. Usually it means that site has had difficulties with visitors who've been using Tor in the past, or that they misunderstand what Tor is and how it works (we’re working to change this). But it is not illegal to use Tor, and you shouldn't get in trouble for doing it. You can find more information about Tor's legal status <a href="https://www.eff.org/torchallenge/faq.html" target="_blank">on the EFF site</a>.</p>
50
-          </li>
51
-          <li>
52
-            <p><strong>Where can I find out more about the Tor Project, especially financial information?</strong></p>
53
-            <p>Here are the Tor Project's <a href="https://www.torproject.org/about/financials.html.en" target="_blank">financial statements, and its Form 990</a>.</p>
54
-          </li>
55
-          <li>
56
-            <p><strong>Where does the Tor Project's money come from?</strong></p>
57
-            <p>Tor is supported by United States government funding agencies, NGOs, private foundations, research institutions, private companies, and nearly 8,000 personal donations from people like you. The exact percentage varies by year, but in any given year, 80-90% of the Tor Project's funding comes from United States government funding sources. See <a href="https://www.torproject.org/about/sponsors.html.en" target="_blank">https://www.torproject.org/about/sponsors.html.en</a> for more.</p>
58
-          </li>
59
-          <li>
60
-            <p><strong>How much money does the Tor Project spend annually, and what is it used for?</strong></p>
61
-            <p>The Tor Project spends about $2.5 million annually. About 80% of the Tor Project's spending goes on staffing, mostly software engineers. About 10% goes towards administrative costs such as accounting and legal costs and bank fees. The remaining 10% is spent on travel, meetings and conferences, which are important for Tor because the Tor community is global.</p>
98
+            <p>We believe Tor is the best solution available today,
99
+            and we know that it does a better job of keeping you
100
+            safely anonymous than other options such as VPNs,
101
+            proxychains, or browser "private browsing" modes. We
102
+            know that both the Russian government and the NSA
103
+            have tried in the past to crack Tor, and failed. The
104
+            Electronic Frontier Foundation says that Tor offers "<a
105
+            href="https://www.eff.org/deeplinks/2014/07/7-things-you-should-know-about-tor"
106
+            target="_blank">some of the strongest anonymity software
107
+            that exists</a>, and in his book Data and Goliath, security
108
+            expert Bruce Schneier wrote "The current best tool to protect
109
+            your anonymity when browsing the web is Tor."</p>
110
+          </li>
111
+          <li>
112
+            <p><strong>Is what Tor does legal? Can I get in trouble for
113
+            using it?</strong></p>
114
+            <p>Downloading the Tor browser or using the Tor network
115
+            is legal in nearly every country. A few web sites
116
+            occasionally block Tor, but that doesn't mean you're
117
+            doing anything wrong. Usually it means that site has had
118
+            difficulties with visitors who've been using Tor in the
119
+            past, or that they misunderstand what Tor is and how it
120
+            works (we’re working to change this). But it is not
121
+            illegal to use Tor, and you shouldn't get in trouble for
122
+            doing it. You can find more information about Tor's legal
123
+            status <a href="https://www.eff.org/torchallenge/faq.html"
124
+            target="_blank">on the EFF site</a>.</p>
125
+          </li>
126
+          <li>
127
+            <p><strong>Where can I find out more about the Tor Project,
128
+            especially financial information?</strong></p>
129
+            <p>Here are the Tor Project's <a
130
+            href="https://www.torproject.org/about/financials.html.en"
131
+            target="_blank">financial statements, and its Form
132
+            990</a>.</p>
133
+          </li>
134
+          <li>
135
+            <p><strong>Where does the Tor Project's money come
136
+            from?</strong></p>
137
+            <p>Tor is supported by United States government funding
138
+            agencies, NGOs, private foundations, research institutions,
139
+            private companies, and nearly 8,000 personal donations
140
+            from people like you. The exact percentage varies by year,
141
+            but in any given year, 80-90% of the Tor Project's funding
142
+            comes from United States government funding sources. See
143
+            <a href="https://www.torproject.org/about/sponsors.html.en"
144
+            target="_blank">https://www.torproject.org/about/sponsors.html.en</a>
145
+            for more.</p>
146
+          </li>
147
+          <li>
148
+            <p><strong>How much money does the Tor Project spend annually,
149
+            and what is it used for?</strong></p>
150
+            <p>The Tor Project spends about $2.5 million annually. About
151
+            80% of the Tor Project's spending goes on staffing, mostly
152
+            software engineers. About 10% goes towards administrative
153
+            costs such as accounting and legal costs and bank fees. The
154
+            remaining 10% is spent on travel, meetings and conferences,
155
+            which are important for Tor because the Tor community is
156
+            global.</p>
62 157
           </li>
63 158
           <li>
64 159
             <p><strong>Is my donation tax-deductible?</strong></p>
65
-            <p>If you pay taxes in the United States, your donation to Tor is tax deductible to the full extent required by law. The tax ID number for the Tor Project is 20-8096820.</p>
66
-          </li>
67
-          <li>
68
-            <p><strong>If I am not in the United States, can I still donate?</strong></p>
69
-            <p>Yes, definitely. Your donation probably isn't tax-deductible (unless you pay taxes on U.S. income) but we would very much appreciate your support. </p>
70
-          </li>
71
-          <li>
72
-            <p><strong>Am I right that the Tor Project has never asked for donations before?</strong></p>
73
-            <p>Yes! We've had a donate button on the site for years, and so far nearly 8,000 people have given money to the Tor Project. But this is the first time we've actively sought donations. To date, much of Tor Project funding has come from United States federal funding sources, such as the U.S. independent agency the International Broadcasting Bureau (IBB) and the U.S. Department of State's Bureau of Democracy, Human Rights, and Labor (DRL). While we are grateful for this funding, we don't want the Tor Project to become too dependent on any single type of funding. Crowdfunding is unrestricted--It allows us to spend the money on the projects we think are most important and respond quickly to changing events.  And so, we are asking you to help financially support us, to increase the Tor Project's independence and ensure the sustainability of the products and services we provide.</p>
74
-          </li>
75
-          <li>
76
-            <p><strong>Can I donate to a specific project, or restrict my donation to a particular purpose?</strong></p>
77
-            <p>No, sorry. If we accept a donation from someone who has specified how they want it used, we're required by the IRS to track and report separately on that money. That would be a big administrative burden for a small organization, and we don't think it's a good idea for us. However, we would be very happy to hear your ideas and feedback about our work. If you're donating using a mechanism that allows for comments, feel free to send your thoughts that way.</p>
160
+            <p>If you pay taxes in the United States, your donation to
161
+            Tor is tax deductible to the full extent required by law. The
162
+            tax ID number for the Tor Project is 20-8096820.</p>
163
+          </li>
164
+          <li>
165
+            <p><strong>If I am not in the United States, can I still
166
+            donate?</strong></p>
167
+            <p>Yes, definitely. Your donation probably isn't
168
+            tax-deductible (unless you pay taxes on U.S. income) but we
169
+            would very much appreciate your support. </p>
170
+          </li>
171
+          <li>
172
+            <p><strong>Am I right that the Tor Project has never asked
173
+            for donations before?</strong></p>
174
+            <p>Yes! We've had a donate button on the site for years,
175
+            and so far nearly 8,000 people have given money to the Tor
176
+            Project. But this is the first time we've actively sought
177
+            donations. To date, much of Tor Project funding has come
178
+            from United States federal funding sources, such as the
179
+            U.S. independent agency the International Broadcasting Bureau
180
+            (IBB) and the U.S. Department of State's Bureau of Democracy,
181
+            Human Rights, and Labor (DRL). While we are grateful for
182
+            this funding, we don't want the Tor Project to become too
183
+            dependent on any single type of funding. Crowdfunding is
184
+            unrestricted--It allows us to spend the money on the projects
185
+            we think are most important and respond quickly to changing
186
+            events.  And so, we are asking you to help financially support
187
+            us, to increase the Tor Project's independence and ensure the
188
+            sustainability of the products and services we provide.</p>
189
+          </li>
190
+          <li>
191
+            <p><strong>Can I donate to a specific project, or restrict
192
+            my donation to a particular purpose?</strong></p>
193
+            <p>No, sorry. If we accept a donation from someone who has
194
+            specified how they want it used, we're required by the IRS
195
+            to track and report separately on that money. That would
196
+            be a big administrative burden for a small organization,
197
+            and we don't think it's a good idea for us. However, we
198
+            would be very happy to hear your ideas and feedback about
199
+            our work. If you're donating using a mechanism that allows
200
+            for comments, feel free to send your thoughts that way.</p>
78 201
           </li>
79 202
           <li>
80 203
             <p><strong>Can I donate while using the Tor browser?</strong></p>
81
-            <p>Maybe! In our testing, we saw two scenarios related to Paypal + Tor browser:<br />
204
+            <p>Maybe! In our testing, we saw two scenarios related to
205
+            Paypal + Tor browser:<br />
82 206
             <ol>
83
-              <li>Sometimes you get an error after clicking on the 'Donate' button. If this is happening to you, you should change your circuit and try again.</li>
84
-              <li>For users logging in to Paypal: some people had no problem donating via PayPal while using the Tor browser. But, some people couldn't complete the donation process, and one person had their PayPal account temporarily frozen. We recommend not using the Tor browser to donate using your PayPal account, unless you're willing to risk some difficulties with PayPal.
85
-              </li>
207
+              <li>Sometimes you get an error after clicking on the
208
+              'Donate' button. If this is happening to you, you should
209
+              change your circuit and try again.</li>
210
+              <li>For users logging in to Paypal: some people had
211
+              no problem donating via PayPal while using the Tor
212
+              browser. But, some people couldn't complete the donation
213
+              process, and one person had their PayPal account temporarily
214
+              frozen. We recommend not using the Tor browser to donate
215
+              using your PayPal account, unless you're willing to risk
216
+              some difficulties with PayPal.</li>
86 217
               </ol></p>
87 218
           </li>
88 219
           <li>
89 220
             <p><strong>How can I donate via debit or credit card?</strong></p>
90
-            <p>To donate using a major credit card or debit card (VISA, MasterCard, Discover or American Express) or via PayPal, please visit our donate page. You do not need to have a PayPal account to donate via credit card.</p>
221
+            <p>To donate using a major credit card or debit card (VISA,
222
+            MasterCard, Discover or American Express) or via PayPal,
223
+            please visit our donate page. You do not need to have a
224
+            PayPal account to donate via credit card.</p>
91 225
           </li>
92 226
           <li>
93
-            <p><strong>Why do you ask for my address and similar information?</strong></p>
94
-            <p>If you donate by credit card, you will be asked for some information that's required to process your credit card payment, including your billing address. This allows our payment processor to verify your identity, process your payment, and prevent fraudulent charges to your credit card. We don't ask for information beyond what's required by the payment processor.</p>
227
+            <p><strong>Why do you ask for my address and similar
228
+            information?</strong></p>
229
+            <p>If you donate by credit card, you will be asked for some
230
+            information that's required to process your credit card
231
+            payment, including your billing address. This allows our
232
+            payment processor to verify your identity, process your
233
+            payment, and prevent fraudulent charges to your credit
234
+            card. We don't ask for information beyond what's required
235
+            by the payment processor.</p>
95 236
           </li>
96 237
           <li>
97 238
             <p><strong>Why is there a minimum donation?</strong></p>
98
-            <p>People who have stolen credit card information often donate to nonprofits as a way of testing whether the card works. These people typically use a very small amount for their testing, and we've found that setting a $1 minimum donation seems to deter them.</p>
239
+            <p>People who have stolen credit card information often
240
+            donate to nonprofits as a way of testing whether the card
241
+            works. These people typically use a very small amount for
242
+            their testing, and we've found that setting a $1 minimum
243
+            donation seems to deter them.</p>
99 244
           </li>  
100 245
           <li>
101 246
             <p><strong>Is there a maximum donation?</strong></p>
102
-            <p>No, no, no! More funding from you means we can do more things we are excited to do, like hire a person to monitor the Tor network full time, or research, test, and  implement ideas we have for making  the Tor network even stronger.</p>
247
+            <p>No, no, no! More funding from you means we can do more
248
+            things we are excited to do, like hire a person to monitor
249
+            the Tor network full time, or research, test, and  implement
250
+            ideas we have for making  the Tor network even stronger.</p>
103 251
           </li>
104 252
           <li>
105 253
             <p><strong>Can I donate via bitcoin?</strong></p>
106
-            <p>Yes! We accept <a href="https://www.torproject.org/donate/donate-options.html.en" target="_blank">bitcoin via BitPay</a>.</p>
107
-          </li>  
108
-          <li>
109
-            <p><strong>If I want my donation to be anonymous, what is the best way for me to donate?</strong></p>
110
-            <p>You can donate by mailing cash to the Tor Project. Our address is The Tor Project, Inc., 7 Temple Street Suite A, Cambridge MA 02139-2403 USA. You can donate via bitcoin if you have bitcoin set up in a way that preserves your anonymity. You can buy cash gift cards and mail them to us. There are probably other ways to donate anonymously that we haven't thought of-- maybe you will :)</p>
111
-          </li>
112
-          <li>
113
-            <p><strong>Is the Tor Project required to identify me as a donor to the United States government, or to any other authority?</strong></p>
114
-            <p>If you donate $5,000 or more to the Tor Project in a single year, we are required to report the donation amount and your name and address (if we have it) to the IRS, on Schedule B of the Form 990, which is filed annually. However,  it's normal for nonprofits to redact individual donor information from the copy of the 990 that's made publicly-available, and that's what we do. We are not required to identify donors to any other organization or authority, and we do not. (Also, if  you wanted, you could give us $4,999 in late 2015 and $4,999 in early 2016 ;)</p>
115
-          </li>
116
-          <li>
117
-            <p><strong>In your privacy policy, you say you will never publicly identify me as a donor without my permission. What does that mean?</strong></p>
118
-            <p>Yes, that's right. If you donate to the Tor Project, there will be some people at the Tor Project who know about your donation. However, we will never publicly identify you as a donor, unless you have given us permission to do so. That means we won't post your name on our website, thank you on Twitter, or do anything else that would publicly identify you as someone who has donated. If we decide we would like to publicly name you as a donor, we will ask you first, and will not do it until and unless you say it's okay.</p>
119
-          </li>
120
-          <li>
121
-            <p><strong>It's important to me that my donation be tax-deductible, but I don't pay taxes in the United States. </strong></p>
122
-            <p>Right now, we can only offer tax-deductibility to donors who pay taxes in the United States. If it's important to you that your donations be tax-deductible in a different country, let us know and we will try to offer tax-deductibility in your country in future.  Or, if you are in Germany, France or Sweden, <a href="https://www.torproject.org/docs/faq.html.en#RelayDonations" target="_blank">these organizations support the Tor network</a> and may be able to offer you tax-deductibility for your donation.</p>
123
-          </li>
124
-          <li>
125
-            <p><strong>What if I don't want to use PayPal? Is there another way I can donate? </strong></p>
126
-            <p>Yes! Here is a list of <a href="https://www.torproject.org/donate/donate-options.html.en" target="_blank">other ways you can donate</a>.</p>
254
+            <p>Yes! We accept <a
255
+            href="https://www.torproject.org/donate/donate-options.html.en"
256
+            target="_blank">bitcoin via BitPay</a>.</p>
257
+          </li>  
258
+          <li>
259
+            <p><strong>If I want my donation to be anonymous, what is
260
+            the best way for me to donate?</strong></p>
261
+            <p>You can donate by mailing cash to the Tor Project. Our
262
+            address is The Tor Project, Inc., 7 Temple Street Suite A,
263
+            Cambridge MA 02139-2403 USA. You can donate via bitcoin
264
+            if you have bitcoin set up in a way that preserves your
265
+            anonymity. You can buy cash gift cards and mail them to
266
+            us. There are probably other ways to donate anonymously that
267
+            we haven't thought of-- maybe you will :)</p>
268
+          </li>
269
+          <li>
270
+            <p><strong>Is the Tor Project required to identify me as
271
+            a donor to the United States government, or to any other
272
+            authority?</strong></p>
273
+            <p>If you donate $5,000 or more to the Tor Project in a single
274
+            year, we are required to report the donation amount and your
275
+            name and address (if we have it) to the IRS, on Schedule
276
+            B of the Form 990, which is filed annually. However,  it's
277
+            normal for nonprofits to redact individual donor information
278
+            from the copy of the 990 that's made publicly-available, and
279
+            that's what we do. We are not required to identify donors to
280
+            any other organization or authority, and we do not. (Also,
281
+            if  you wanted, you could give us $4,999 in late 2015 and
282
+            $4,999 in early 2016 ;)</p>
283
+          </li>
284
+          <li>
285
+            <p><strong>In your privacy policy, you say you will never
286
+            publicly identify me as a donor without my permission. What
287
+            does that mean?</strong></p>
288
+            <p>Yes, that's right. If you donate to the Tor Project, there
289
+            will be some people at the Tor Project who know about your
290
+            donation. However, we will never publicly identify you as
291
+            a donor, unless you have given us permission to do so. That
292
+            means we won't post your name on our website, thank you on
293
+            Twitter, or do anything else that would publicly identify
294
+            you as someone who has donated. If we decide we would like
295
+            to publicly name you as a donor, we will ask you first,
296
+            and will not do it until and unless you say it's okay.</p>
297
+          </li>
298
+          <li>
299
+            <p><strong>It's important to me that my donation be
300
+            tax-deductible, but I don't pay taxes in the United
301
+            States. </strong></p>
302
+            <p>Right now, we can only offer tax-deductibility to
303
+            donors who pay taxes in the United States. If it's
304
+            important to you that your donations be tax-deductible
305
+            in a different country, let us know and we will
306
+            try to offer tax-deductibility in your country in
307
+            future.  Or, if you are in Germany, France or Sweden, <a
308
+            href="https://www.torproject.org/docs/faq.html.en#RelayDonations"
309
+            target="_blank">these organizations support the Tor
310
+            network</a> and may be able to offer you tax-deductibility
311
+            for your donation.</p>
312
+          </li>
313
+          <li>
314
+            <p><strong>What if I don't want to use PayPal? Is there
315
+            another way I can donate? </strong></p>
316
+            <p>Yes! Here is a list of <a
317
+            href="https://www.torproject.org/donate/donate-options.html.en"
318
+            target="_blank">other ways you can donate</a>.</p>
127 319
           </li>
128 320
           <li>
129 321
             <p><strong>What is your donor privacy policy?</strong></p>
130
-            <p>Here is the Tor Project <a href="donor-privacy-policy.html.en" target="_blank">donor privacy policy</a>.</p>
322
+            <p>Here is the Tor Project <a
323
+            href="donor-privacy-policy.html.en" target="_blank">donor
324
+            privacy policy</a>.</p>
131 325
           </li>
132 326
           <li>
133 327
             <p><strong>What is your refund policy?</strong></p>
134
-            <p>If you want your donation refunded, please tell us by emailing donations(at)torproject.org. To process your refund we'll need to know the date of your donation, the amount you donated, your full name, the payment method you used and your country of origin. Please also tell us why you're asking for a refund. Please note that some payment methods won't support refunds, or require them to be made in a specific way, so we may need additional information from you in order to process yours.</p>
328
+            <p>If you want your donation refunded, please tell us
329
+            by emailing donations(at)torproject.org. To process your
330
+            refund we'll need to know the date of your donation, the
331
+            amount you donated, your full name, the payment method you
332
+            used and your country of origin. Please also tell us why
333
+            you're asking for a refund. Please note that some payment
334
+            methods won't support refunds, or require them to be made
335
+            in a specific way, so we may need additional information
336
+            from you in order to process yours.</p>
135 337
           </li>
136 338
           <li>
137 339
             <p><strong>Can I donate by mail?</strong></p>
138
-            <p>Yes. Our mailing address is The Tor Project, 7 Temple Street Suite A, Cambridge MA 02139-2403 USA.</p>
340
+            <p>Yes. Our mailing address is The Tor Project, 7 Temple
341
+            Street Suite A, Cambridge MA 02139-2403 USA.</p>
139 342
           </li>
140 343
           <li>
141 344
             <p><strong>Do you accept cash donations?</strong></p>
... ...
@@ -143,51 +346,102 @@
143 346
           </li>
144 347
           <li>
145 348
             <p><strong>Can I donate stock?</strong></p>
146
-            <p>Yes! Many companies --such as Google, Microsoft, eBay, PayPal, Apple, Verizon, Red Hat, many universities, and others-- will match donations made by their employees. The fastest way to find out if your company matches donations is usually by checking with your HR department, or you can search for your company name at <a href="https://www.matchinggifts.com/rit/" target="_blank">https://www.matchinggifts.com/rit/</a>. If your company isn't currently set up to match donations to the Tor Project, we would be happy to help with the paperwork. If you want help figuring out the process, write us at donations(at)torproject.org.</p>
349
+            <p>Yes! Many companies --such as Google, Microsoft, eBay,
350
+            PayPal, Apple, Verizon, Red Hat, many universities,
351
+            and others-- will match donations made by their
352
+            employees. The fastest way to find out if your company
353
+            matches donations is usually by checking with your
354
+            HR department, or you can search for your company
355
+            name at <a href="https://www.matchinggifts.com/rit/"
356
+            target="_blank">https://www.matchinggifts.com/rit/</a>. If
357
+            your company isn't currently set up to match donations
358
+            to the Tor Project, we would be happy to help with the
359
+            paperwork. If you want help figuring out the process, write
360
+            us at donations(at)torproject.org.</p>
147 361
           </li>
148 362
           <li>
149 363
             <p><strong>Can I become a Tor Project member?</strong></p>
150
-            <p>Right now, we don't have a membership program, but we may set one up in the future. If you want to get involved with the Tor Project, <a href="<page getinvolved/volunteer>">this is a good place to start</a>.</p>
364
+            <p>Right now, we don't have a membership program, but we may
365
+            set one up in the future. If you want to get involved with
366
+            the Tor Project, <a href="<page getinvolved/volunteer>">this
367
+            is a good place to start</a>.</p>
151 368
           </li>
152 369
           <li>
153 370
             <p><strong>How can I get a Tor t-shirt or stickers?</strong></p>
154
-            <p>If you donate $23 or more, you will get stickers we created just for this campaign. And if you donate $100 or more, you will get a special 'Tor supporter' t-shirt!</p>
371
+            <p>If you donate $23 or more, you will get stickers we
372
+            created just for this campaign. And if you donate $100 or
373
+            more, you will get a special 'Tor supporter' t-shirt!</p>
155 374
           </li>
156 375
           <li>
157
-            <p><strong>If I want to stay in touch with the Tor Project, what's the best way for me to do that?</strong></p>
158
-            <p>You can sign up to receive  the <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-news" target="_blank">Tor weekly newsletter</a>, read the <a href="https://blog.torproject.org/" target="_blank">Tor blog</a>, or <a href="https://twitter.com/torproject" target="_blank">follow us on Twitter</a>.</p>
376
+            <p><strong>If I want to stay in touch with the Tor Project,
377
+            what's the best way for me to do that?</strong></p>
378
+            <p>You can sign up to receive the <a
379
+            href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-news"
380
+            target="_blank">Tor weekly newsletter</a>, read the <a
381
+            href="https://blog.torproject.org/" target="_blank">Tor
382
+            blog</a>, or <a href="https://twitter.com/torproject"
383
+            target="_blank">follow us on Twitter</a>.</p>
159 384
           </li>
160 385
           <li>
161
-            <p><strong>Does the Tor Project participate in the Combined Federal Campaign program?</strong></p>
162
-            <p>No, Tor doesn't currently participate in the CFC program. If you'd like to get Tor added to the CFC program in your location, that would be great: please let us know if you need any help. </p>
386
+            <p><strong>Does the Tor Project participate in the Combined
387
+            Federal Campaign program?</strong></p>
388
+            <p>No, Tor doesn't currently participate in the CFC
389
+            program. If you'd like to get Tor added to the CFC program
390
+            in your location, that would be great: please let us know
391
+            if you need any help. </p>
163 392
           </li>
164 393
           <li>
165
-            <p><strong>Can I donate my airline miles, flight vouchers, or hotel points?</strong></p>
166
-            <p>No, sorry. We would like to accept your miles, vouchers and hotel points, and in the future we may be able to.</p>
394
+            <p><strong>Can I donate my airline miles, flight vouchers,
395
+            or hotel points?</strong></p>
396
+            <p>No, sorry. We would like to accept your miles, vouchers
397
+            and hotel points, and in the future we may be able to.</p>
167 398
           </li>
168 399
           <li>
169 400
             <p><strong>Can I donate hardware?</strong></p>
170
-            <p>Typically no, we don't encourage people to donate hardware. But if you want to make a hardware donation that you think might be especially useful for us, please mail donations(at)torproject.org.</p>
401
+            <p>Typically no, we don't encourage people to donate
402
+            hardware. But if you want to make a hardware donation that
403
+            you think might be especially useful for us, please mail
404
+            donations(at)torproject.org.</p>
171 405
           </li>
172 406
           <li>
173 407
             <p><strong>Can I donate my time?</strong></p>
174
-            <p>Yes. Here's a <a href="https://www.torproject.org/getinvolved/volunteer.html.en" target="_blank">list of areas where we would love your help</a>.</p>
175
-          </li>
176
-          <li>
177
-            <p><strong>I would like my company to support Tor. What can we do to help?</strong></p>
178
-            <p>Your company could match donations made by its employees to the Tor Project--that would be wonderful. Your company may operate a corporate foundation that gives out grants, and if so, you should encourage it to fund us. Maybe your company would be willing to <a href="https://www.torproject.org/docs/faq.html.en#HowDoIDecide" target="_blank">operate a Tor relay</a>. If your company sells cloud services, perhaps it could donate these to Tor:  We use them in some anti-censorship projects.</p>
179
-          </li>
180
-          <li>
181
-            <p><strong>You don't support my preferred way to donate. Can I recommend a new donation method to you?</strong></p>
408
+            <p>Yes. Here's a <a
409
+            href="https://www.torproject.org/getinvolved/volunteer.html.en"
410
+            target="_blank">list of areas where we would love your
411
+            help</a>.</p>
412
+          </li>
413
+          <li>
414
+            <p><strong>I would like my company to support Tor. What can
415
+            we do to help?</strong></p>
416
+            <p>Your company could match donations made by its employees
417
+            to the Tor Project--that would be wonderful. Your
418
+            company may operate a corporate foundation that
419
+            gives out grants, and if so, you should encourage it
420
+            to fund us. Maybe your company would be willing to <a
421
+            href="https://www.torproject.org/docs/faq.html.en#HowDoIDecide"
422
+            target="_blank">operate a Tor relay</a>. If your company
423
+            sells cloud services, perhaps it could donate these to Tor:
424
+            We use them in some anti-censorship projects.</p>
425
+          </li>
426
+          <li>
427
+            <p><strong>You don't support my preferred way to donate. Can
428
+            I recommend a new donation method to you?</strong></p>
182 429
             <p>Sure. Just mail us at donations(at)torproject.org.</p>
183 430
           </li>
184 431
           <li>
185
-            <p><strong>Will the Tor Project accept donations from anybody, or do you reserve the right to reject support from specific organizations or individuals?</strong></p>
186
-            <p>We do reserve the right to reject a donation. To date though, we haven't exercised that right. We are happy that a broad range of people use and support Tor.</p>
432
+            <p><strong>Will the Tor Project accept donations from anybody,
433
+            or do you reserve the right to reject support from specific
434
+            organizations or individuals?</strong></p>
435
+            <p>We do reserve the right to reject a donation. To date
436
+            though, we haven't exercised that right. We are happy that
437
+            a broad range of people use and support Tor.</p>
187 438
           </li>
188 439
           <li>
189
-            <p><strong>I have more questions. How can I get answers?</strong></p>
190
-            <p>Feel free to send questions to donations(at)torproject.org. We will try to answer you, and we'll also post your question (and the answer) here.</p>
440
+            <p><strong>I have more questions. How can I get
441
+            answers?</strong></p>
442
+            <p>Feel free to send questions to
443
+            donations(at)torproject.org. We will try to answer you,
444
+            and we'll also post your question (and the answer) here.</p>
191 445
           </li>
192 446
           </ol>
193 447
           </div>
194 448