- tor-commits - lists.torproject.org

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

09 Dec '15

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

1 0

[webwml/master] line-wrap, no actual changes
by arma＠torproject.org 09 Dec '15

09 Dec '15

commit 9528bea11fd3ff22b225c37916a79d9fc0b5adf7 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Dec 9 18:13:35 2015 -0500 line-wrap, no actual changes --- donate/en/donor-faq.wml | 439 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 347 insertions(+), 92 deletions(-) diff --git a/donate/en/donor-faq.wml b/donate/en/donor-faq.wml index e9005b4..1a1aba5 100644 --- a/donate/en/donor-faq.wml +++ b/donate/en/donor-faq.wml @@ -14,128 +14,331 @@ <ol> <li> What is the Tor Project and what does it do? - 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. + 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. </li> <li> Who works for the Tor Project, and what do they do? - 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>. + 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>. </li> <li> Who uses Tor? - 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. + 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. </li> <li> Can anyone use Tor? - 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>. + 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>. </li> <li> What kinds of people support Tor? - 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 + 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 </li> <li> How does the Tor software work to protect people's anonymity? - 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>. + 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>. </li> <li> - I would like to know more about how Tor works, what hidden services are, or how to run a relay. - <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. + I would like to know more about how Tor works, + what hidden services are, or how to run a relay. + <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. </li> <li> Does the Tor software work? - 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." - </li> - <li> - Is what Tor does legal? Can I get in trouble for using it? - 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>. - </li> - <li> - Where can I find out more about the Tor Project, especially financial information? - 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>. - </li> - <li> - Where does the Tor Project's money come from? - 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. - </li> - <li> - How much money does the Tor Project spend annually, and what is it used for? - 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. + 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." + </li> + <li> + Is what Tor does legal? Can I get in trouble for + using it? + 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>. + </li> + <li> + Where can I find out more about the Tor Project, + especially financial information? + 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>. + </li> + <li> + Where does the Tor Project's money come + from? + 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. + </li> + <li> + How much money does the Tor Project spend annually, + and what is it used for? + 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. </li> <li> Is my donation tax-deductible? - 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. - </li> - <li> - If I am not in the United States, can I still donate? - 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. - </li> - <li> - Am I right that the Tor Project has never asked for donations before? - 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. - </li> - <li> - Can I donate to a specific project, or restrict my donation to a particular purpose? - 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. + 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. + </li> + <li> + If I am not in the United States, can I still + donate? + 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. + </li> + <li> + Am I right that the Tor Project has never asked + for donations before? + 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. + </li> + <li> + Can I donate to a specific project, or restrict + my donation to a particular purpose? + 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. </li> <li> Can I donate while using the Tor browser? - Maybe! In our testing, we saw two scenarios related to Paypal + Tor browser: + Maybe! In our testing, we saw two scenarios related to + Paypal + Tor browser: <ol> - <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> - <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. - </li> + <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> + <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.</li> </ol> </li> <li> How can I donate via debit or credit card? - 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. + 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. </li> <li> - Why do you ask for my address and similar information? - 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. + Why do you ask for my address and similar + information? + 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. </li> <li> Why is there a minimum donation? - 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. + 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. </li> <li> Is there a maximum donation? - 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. + 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. </li> <li> Can I donate via bitcoin? - Yes! We accept <a href="https://www.torproject.org/donate/donate-options.html.en" target="_blank">bitcoin via BitPay</a>. + Yes! We accept <a + href="https://www.torproject.org/donate/donate-options.html.en" + target="_blank">bitcoin via BitPay</a>. </li> <li> - If I want my donation to be anonymous, what is the best way for me to donate? - 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 :) - </li> - <li> - Is the Tor Project required to identify me as a donor to the United States government, or to any other authority? - 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 ;) - </li> - <li> - In your privacy policy, you say you will never publicly identify me as a donor without my permission. What does that mean? - 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. - </li> - <li> - It's important to me that my donation be tax-deductible, but I don't pay taxes in the United States. - 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. - </li> - <li> - What if I don't want to use PayPal? Is there another way I can donate? - 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>. + If I want my donation to be anonymous, what is + the best way for me to donate? + 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 :) + </li> + <li> + Is the Tor Project required to identify me as + a donor to the United States government, or to any other + authority? + 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 ;) + </li> + <li> + In your privacy policy, you say you will never + publicly identify me as a donor without my permission. What + does that mean? + 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. + </li> + <li> + It's important to me that my donation be + tax-deductible, but I don't pay taxes in the United + States. + 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. + </li> + <li> + What if I don't want to use PayPal? Is there + another way I can donate? + 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>. </li> <li> What is your donor privacy policy? - Here is the Tor Project <a href="donor-privacy-policy.html.en" target="_blank">donor privacy policy</a>. + Here is the Tor Project <a + href="donor-privacy-policy.html.en" target="_blank">donor + privacy policy</a>. </li> <li> What is your refund policy? - 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. + 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. </li> <li> Can I donate by mail? - Yes. Our mailing address is The Tor Project, 7 Temple Street Suite A, Cambridge MA 02139-2403 USA. + Yes. Our mailing address is The Tor Project, 7 Temple + Street Suite A, Cambridge MA 02139-2403 USA. </li> <li> Do you accept cash donations? @@ -143,51 +346,102 @@ </li> <li> Can I donate stock? - 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. - </li> + 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. + </li> <li> Can I become a Tor Project member? - 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>. + 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>. </li> <li> How can I get a Tor t-shirt or stickers? - 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! + 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! </li> <li> - If I want to stay in touch with the Tor Project, what's the best way for me to do that? - 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>. + If I want to stay in touch with the Tor Project, + what's the best way for me to do that? + 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>. </li> <li> - Does the Tor Project participate in the Combined Federal Campaign program? - 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. + Does the Tor Project participate in the Combined + Federal Campaign program? + 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. </li> <li> - Can I donate my airline miles, flight vouchers, or hotel points? - No, sorry. We would like to accept your miles, vouchers and hotel points, and in the future we may be able to. + Can I donate my airline miles, flight vouchers, + or hotel points? + No, sorry. We would like to accept your miles, vouchers + and hotel points, and in the future we may be able to. </li> <li> Can I donate hardware? - 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. + 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. </li> <li> Can I donate my time? - 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>. - </li> - <li> - I would like my company to support Tor. What can we do to help? - 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. - </li> - <li> - You don't support my preferred way to donate. Can I recommend a new donation method to you? + 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>. + </li> + <li> + I would like my company to support Tor. What can + we do to help? + 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. + </li> + <li> + You don't support my preferred way to donate. Can + I recommend a new donation method to you? Sure. Just mail us at donations(at)torproject.org. </li> <li> - Will the Tor Project accept donations from anybody, or do you reserve the right to reject support from specific organizations or individuals? - 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. + Will the Tor Project accept donations from anybody, + or do you reserve the right to reject support from specific + organizations or individuals? + 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. </li> <li> - I have more questions. How can I get answers? - 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. + I have more questions. How can I get + answers? + 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. </li> </ol> </div> @@ -200,3 +454,4 @@ </div> </div> #include <donatefoot.wmi> +

1 0

[webwml/master] Add url for molly blogpost
by sebastian＠torproject.org 09 Dec '15

09 Dec '15

commit 0129fb2feb20e0e0653639b9b0012412bc89dcd7 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Dec 9 23:01:30 2015 +0100 Add url for molly blogpost --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index b91115f..0d0f820 100644 --- a/.htaccess +++ b/.htaccess @@ -60,4 +60,5 @@ RewriteRule ^donate/donate-download(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-button(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/giving-tue-blog(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-roger(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-blog-molly(.*) /donate/donate$1 [R=302,L] diff --git a/donate/en/donate-blog-molly.wml b/donate/en/donate-blog-molly.wml new file mode 100644 index 0000000..e69de29

1 0

[tor/master] Merge remote-tracking branch 'teor/fix-exitpolicy-leak'
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit 6102efbee227394ae53727b292a62df5368ab4c6 Merge: 631e351 bb32c29 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 9 16:25:17 2015 -0500 Merge remote-tracking branch 'teor/fix-exitpolicy-leak' src/or/policies.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/master] Initialise configured_addresses to a known value (NULL)
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit bb32c29986ecae6a213254dbfcd5c652caa4102c Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Sun Dec 6 20:24:45 2015 +1100 Initialise configured_addresses to a known value (NULL) --- src/or/policies.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/policies.c b/src/or/policies.c index 7f71b0d..2f81942 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -1350,7 +1350,7 @@ policies_parse_exit_policy_from_options(const or_options_t *or_options, smartlist_t **result) { exit_policy_parser_cfg_t parser_cfg = 0; - smartlist_t *configured_addresses; + smartlist_t *configured_addresses = NULL; int rv = 0; /* Short-circuit for non-exit relays */

1 0

[tor/master] Fix a memory leak in the exit policy parsing code
by nickm＠torproject.org 09 Dec '15

09 Dec '15

commit 16bec0dfd9e5cdd0faf99587c2261b148bc58011 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Dec 4 15:47:59 2015 +0100 Fix a memory leak in the exit policy parsing code This memory leak only occurs when the Tor instance is not an exit node. Fixes code introduced in 10a6390deb3c9ff9fbd8078fc812abf6c77ad67f. --- src/or/policies.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/policies.c b/src/or/policies.c index 126ba46..7f71b0d 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -1350,7 +1350,7 @@ policies_parse_exit_policy_from_options(const or_options_t *or_options, smartlist_t **result) { exit_policy_parser_cfg_t parser_cfg = 0; - smartlist_t *configured_addresses = smartlist_new(); + smartlist_t *configured_addresses; int rv = 0; /* Short-circuit for non-exit relays */ @@ -1360,6 +1360,8 @@ policies_parse_exit_policy_from_options(const or_options_t *or_options, return 0; } + configured_addresses = smartlist_new(); + /* Configure the parser */ if (or_options->IPv6Exit) { parser_cfg |= EXIT_POLICY_IPV6_ENABLED;

1 0

[tor-browser/tor-browser-38.4.0esr-5.0-1] Bug 16863: console.error on new Tor Browser window
by gk＠torproject.org 09 Dec '15

09 Dec '15

commit 916624727c1effa1987dff1cc5e37961a9e0e7f5 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Dec 9 11:47:08 2015 -0500 Bug 16863: console.error on new Tor Browser window Improve error handling and avoid confusing error log messages when loop.enabled is false. --- browser/components/customizableui/CustomizableUI.jsm | 8 ++++++++ browser/components/customizableui/CustomizableWidgets.jsm | 8 +++----- browser/components/loop/MozLoopService.jsm | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm index 54c2ede..a43404e 100644 --- a/browser/components/customizableui/CustomizableUI.jsm +++ b/browser/components/customizableui/CustomizableUI.jsm @@ -1186,6 +1186,11 @@ let CustomizableUIInternal = { throw new Error("buildWidget was passed a non-widget to build."); } + if (aWidget.onIsHidden && aWidget.onIsHidden()) { + LOG("Skipping hidden widget " + aWidget.id + " of type " + aWidget.type); + return undefined; + } + LOG("Building " + aWidget.id + " of type " + aWidget.type); let node; @@ -2180,6 +2185,7 @@ let CustomizableUIInternal = { widget._introducedInVersion = aData.introducedInVersion || 0; } + this.wrapWidgetEventHandler("onIsHidden", widget); this.wrapWidgetEventHandler("onBeforeCreated", widget); this.wrapWidgetEventHandler("onClick", widget); this.wrapWidgetEventHandler("onCreated", widget); @@ -3015,6 +3021,8 @@ this.CustomizableUI = { * of the widget. * - viewId: Only useful for views (and required there): the id of the * <panelview> that should be shown when clicking the widget. + * - onIsHidden(): Called to check whether a widget should be hidden + * (optional; returns a Boolean value). * - onBuild(aDoc): Only useful for custom widgets (and required there); a * function that will be invoked with the document in which * to build a widget. Should return the DOM node that has diff --git a/browser/components/customizableui/CustomizableWidgets.jsm b/browser/components/customizableui/CustomizableWidgets.jsm index 75f69dd..4a8bacf 100644 --- a/browser/components/customizableui/CustomizableWidgets.jsm +++ b/browser/components/customizableui/CustomizableWidgets.jsm @@ -933,12 +933,10 @@ const CustomizableWidgets = [ // Not in private browsing, see bug 1108187. showInPrivateBrowsing: false, introducedInVersion: 4, + onIsHidden: function() { + return !Services.prefs.getBoolPref("loop.enabled"); + }, onBuild: function(aDocument) { - // If we're not supposed to see the button, return zip. - if (!Services.prefs.getBoolPref("loop.enabled")) { - return null; - } - let node = aDocument.createElementNS(kNSXUL, "toolbarbutton"); node.setAttribute("id", this.id); node.classList.add("toolbarbutton-1"); diff --git a/browser/components/loop/MozLoopService.jsm b/browser/components/loop/MozLoopService.jsm index 3f6a77c..d915070 100644 --- a/browser/components/loop/MozLoopService.jsm +++ b/browser/components/loop/MozLoopService.jsm @@ -1107,7 +1107,7 @@ this.MozLoopService = { // Don't do anything if loop is not enabled. if (!Services.prefs.getBoolPref("loop.enabled")) { - return Promise.reject(new Error("loop is not enabled")); + return Promise.resolve(); } if (Services.prefs.getPrefType("loop.fxa.enabled") == Services.prefs.PREF_BOOL) {

1 0

[tor-browser/tor-browser-38.4.0esr-5.5-1] Bug 16863: console.error on new Tor Browser window
by gk＠torproject.org 09 Dec '15

09 Dec '15

commit c2ce09f61101f3ac2d16d644d7fb56c035bec9ba Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Dec 9 11:47:08 2015 -0500 Bug 16863: console.error on new Tor Browser window Improve error handling and avoid confusing error log messages when loop.enabled is false. --- browser/components/customizableui/CustomizableUI.jsm | 8 ++++++++ browser/components/customizableui/CustomizableWidgets.jsm | 8 +++----- browser/components/loop/MozLoopService.jsm | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm index 54c2ede..a43404e 100644 --- a/browser/components/customizableui/CustomizableUI.jsm +++ b/browser/components/customizableui/CustomizableUI.jsm @@ -1186,6 +1186,11 @@ let CustomizableUIInternal = { throw new Error("buildWidget was passed a non-widget to build."); } + if (aWidget.onIsHidden && aWidget.onIsHidden()) { + LOG("Skipping hidden widget " + aWidget.id + " of type " + aWidget.type); + return undefined; + } + LOG("Building " + aWidget.id + " of type " + aWidget.type); let node; @@ -2180,6 +2185,7 @@ let CustomizableUIInternal = { widget._introducedInVersion = aData.introducedInVersion || 0; } + this.wrapWidgetEventHandler("onIsHidden", widget); this.wrapWidgetEventHandler("onBeforeCreated", widget); this.wrapWidgetEventHandler("onClick", widget); this.wrapWidgetEventHandler("onCreated", widget); @@ -3015,6 +3021,8 @@ this.CustomizableUI = { * of the widget. * - viewId: Only useful for views (and required there): the id of the * <panelview> that should be shown when clicking the widget. + * - onIsHidden(): Called to check whether a widget should be hidden + * (optional; returns a Boolean value). * - onBuild(aDoc): Only useful for custom widgets (and required there); a * function that will be invoked with the document in which * to build a widget. Should return the DOM node that has diff --git a/browser/components/customizableui/CustomizableWidgets.jsm b/browser/components/customizableui/CustomizableWidgets.jsm index 75f69dd..4a8bacf 100644 --- a/browser/components/customizableui/CustomizableWidgets.jsm +++ b/browser/components/customizableui/CustomizableWidgets.jsm @@ -933,12 +933,10 @@ const CustomizableWidgets = [ // Not in private browsing, see bug 1108187. showInPrivateBrowsing: false, introducedInVersion: 4, + onIsHidden: function() { + return !Services.prefs.getBoolPref("loop.enabled"); + }, onBuild: function(aDocument) { - // If we're not supposed to see the button, return zip. - if (!Services.prefs.getBoolPref("loop.enabled")) { - return null; - } - let node = aDocument.createElementNS(kNSXUL, "toolbarbutton"); node.setAttribute("id", this.id); node.classList.add("toolbarbutton-1"); diff --git a/browser/components/loop/MozLoopService.jsm b/browser/components/loop/MozLoopService.jsm index 3f6a77c..d915070 100644 --- a/browser/components/loop/MozLoopService.jsm +++ b/browser/components/loop/MozLoopService.jsm @@ -1107,7 +1107,7 @@ this.MozLoopService = { // Don't do anything if loop is not enabled. if (!Services.prefs.getBoolPref("loop.enabled")) { - return Promise.reject(new Error("loop is not enabled")); + return Promise.resolve(); } if (Services.prefs.getPrefType("loop.fxa.enabled") == Services.prefs.PREF_BOOL) {

1 0

[tor-browser/tor-browser-38.4.0esr-5.5-1] Bug 12516: Compile hardenend Tor Browser with -fwrapv
by gk＠torproject.org 09 Dec '15

09 Dec '15

commit 507be1ee78b54b23106d6e99b5d07835d34682a0 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 8 10:27:03 2015 +0000 Bug 12516: Compile hardenend Tor Browser with -fwrapv --- .mozconfig-asan | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mozconfig-asan b/.mozconfig-asan index 218d2bd..9472ff2 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -1,7 +1,7 @@ . $topsrcdir/browser/config/mozconfig -export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" -export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" +export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -fwrapv" +export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -frwapv" # We need to add -ldl explicitely due to bug 1213698 export LDFLAGS="-fsanitize=address -ldl"

1 0

[tor-browser-bundle/hardened-builds] Bug 17747: Replace schanenlied with ndnop3
by gk＠torproject.org 09 Dec '15

09 Dec '15

commit ce9150067e4bdf5699dc22d64bd0b532516d3292 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 7 11:12:35 2015 +0000 Bug 17747: Replace schanenlied with ndnop3 --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index a055d8f..f27d389 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -20,7 +20,7 @@ pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte [2001:49f0:d00a:1: pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); -pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 178.209.52.110:443 67E72FF33D7D41BF11C569646A0A7B4B188340DF cert=Z+cv8z19Qb8RxWlkagp7SxiDQN++b7D2Tntowhf+j4D15/kLuj3EoSSGvuREGPc3h60Ofw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 109.105.109.165:24215 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0");

1 0