tor-commits
Threads by month
- ----- 2025 -----
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
June 2021
- 17 participants
- 1287 discussions

[donate-static/staging] Move the /state-disclosures page to markdown
by kez@torproject.org 30 Jun '21
by kez@torproject.org 30 Jun '21
30 Jun '21
commit 26e67a631d5f7528bb999ac36934c6515cff04cc
Author: kez <kez(a)torproject.org>
Date: Wed Jun 30 00:43:34 2021 -0400
Move the /state-disclosures page to markdown
See: tpo/web/donate-static#34
---
content/state-disclosures/contents.lr | 61 ++++++++++++++++++-----------------
models/state-disclosures.ini | 9 ++++++
templates/state-disclosures.html | 18 +++++++++++
3 files changed, 58 insertions(+), 30 deletions(-)
diff --git a/content/state-disclosures/contents.lr b/content/state-disclosures/contents.lr
index 4085d0b3..c7ba8fdb 100644
--- a/content/state-disclosures/contents.lr
+++ b/content/state-disclosures/contents.lr
@@ -1,6 +1,6 @@
-_model: donate-page
+_model: state-disclosures
---
-_template: donate-empty.html
+_template: state-disclosures.html
---
section_id: donate
---
@@ -8,33 +8,34 @@ section: Donate
---
title: State Disclosures
---
+preamble: Certain states require written disclosures for nonprofit organizations soliciting contributions. Individual state disclosures are below.
+---
body:
-<div class="fixed-width">
- <div class="state-disclosures">
- <div class="preamble">
- <p>Certain states require written disclosures for nonprofit organizations soliciting contributions. Individual state disclosures are below.</p>
- </div>
- <p><b>Florida</b>: a copy of the official registration and financial information may be obtained from the division of consumer services by calling toll-free, within the state, 1-800-435-7352 (800-HELP-FLA), or visiting www.FloridaConsumerHelp.com. Registration does not imply endorsement, approval, or recommendation by the state. Florida Registration #CH58356</p>
- <p><b>Georgia</b>: A full and fair description of our programs and our financial statement summary is available upon request at The Tor Project, Inc.; 217 First Avenue South #4903; Seattle, WA 98194 and phone number 206-420-3136.</p>
- <p><b>Maryland</b>: For the cost of copies and postage, from the Office of the Secretary of State, State House, Annapolis, MD 21401.</p>
- <p><b>Nevada</b>: Contributions may be tax deductible pursuant to the provisions of sec. 170(c) of the Internal Revenue Code of 1986, 26 U.S.C. ¤170(c).</p>
- <p><b>New Jersey</b>: Information filed with the attorney general concerning this charitable solicitation and the percentage of contributions received by the charity during the last reporting period that were dedicated to the charitable purpose may be obtained from the attorney general of the state of New Jersey by calling (973) 504-6215 and is available on the internet at <a href="https://www.state.nj.us/lps/ca/charfrm.htm" target="_blank" class="hyperlinks links">www.state.nj.us/lps/ca/charfrm.htm</a>. Registration with the attorney general does not imply endorsement.</p>
- <p><b>New York</b>: Upon request, from the Attorney General's Charities Bureau, 28 Liberty Street, New York, NY 10005, 1-212-416-8686 or <a href="https://www.charitiesnys.com" target="_blank" class="hyperlinks links">www.charitiesnys.com</a>.</p>
- <p><b>North Carolina</b>: Financial information about this organization and a copy of its license are available from the State Solicitation Licensing Branch at 1-919-814-5400. The license is not an endorsement by the state.</p>
- <p><b>Pennsylvania</b>: The official registration and financial information of The Tor Project, Inc. may be obtained from the Pennsylvania Department of State by calling toll-free, within Pennsylvania, 1-800-732-0999.</p>
- <p><b>Virginia</b>: From the State Office of Consumer Affairs in the Department of Agriculture and Consumer Affairs, P.O. Box 1163, Richmond, VA 23218.</p>
- <p><b>Washington</b>: From the Secretary of State at 1-800-332-4483 or <a href="http://www.sos.wa.gov/charities" target="_blank" class="hyperlinks links">http://www.sos.wa.gov/charities/</a></p>
- <p><b>West Virginia</b>: West Virginia residents may obtain a summary of the registration and financial documents from the Secretary of State, State Capitol, Charleston, WV 25305.</p>
- <p><b>Wisconsin</b>: A financial statement of the charitable organization disclosing assets, liabilities, fund balances, revenue and expenses for the preceding fiscal year will be provided to any person upon request.</p>
- <h4>Registration with a state agency does not constitute or imply endorsement, approval or recommendation by that state.</h4>
- <p>More information about <a href="http://www.labyrinthinc.com/charity-resources/nonprofit-regulations/fundrai…" target="_blank" class="hyperlinks links">state disclosure verbiage</a> and <a href="http://www.labyrinthinc.com/charity-resources/annual-charitable-state-regis…" target="_blank" class="hyperlinks links">charitable state registrations</a>.</p>
- <hr/>
- <div class="button-line">
- <a class="purple button" href="../donor-faq">Back to Donate FAQ</a>
- </div>
- <div class="button-line">
- <a class="purple button" href="../">Back to Donate Page</a>
- </div>
- </div>
-</div>
+**Florida**: a copy of the official registration and financial information may be obtained from the division of consumer services by calling toll-free, within the state, 1-800-435-7352 (800-HELP-FLA), or visiting [www.FloridaConsumerHelp.com](www.FloridaConsumerHelp.com "" target="_blank" rel="noopener"). Registration does not imply endorsement, approval, or recommendation by the state. Florida Registration #CH58356
+
+**Georgia**: A full and fair description of our programs and our financial statement summary is available upon request at The Tor Project, Inc.; 217 First Avenue South #4903; Seattle, WA 98194 and phone number 206-420-3136.
+
+**Maryland**: For the cost of copies and postage, from the Office of the Secretary of State, State House, Annapolis, MD 21401.
+
+**Nevada**: Contributions may be tax deductible pursuant to the provisions of sec. 170(c) of the Internal Revenue Code of 1986, 26 U.S.C. ¤170(c).
+
+**New Jersey**: Information filed with the attorney general concerning this charitable solicitation and the percentage of contributions received by the charity during the last reporting period that were dedicated to the charitable purpose may be obtained from the attorney general of the state of New Jersey by calling (973) 504-6215 and is available on the internet at [https://www.state.nj.us/lps/ca/charfrm.htm](https://www.state.nj.us/lps/ca/… "" target="_blank" rel="noopener" class="hyperlinks links"). Registration with the attorney general does not imply endorsement.
+
+**New York**: Upon request, from the Attorney General's Charities Bureau, 28 Liberty Street, New York, NY 10005, 1-212-416-8686 or [www.charitiesnys.com](https://www.charitiesnys.com "" target="_blank" class="hyperlinks links").
+
+**North Carolina**: Financial information about this organization and a copy of its license are available from the State Solicitation Licensing Branch at 1-919-814-5400. The license is not an endorsement by the state.
+
+**Pennsylvania**: The official registration and financial information of The Tor Project, Inc. may be obtained from the Pennsylvania Department of State by calling toll-free, within Pennsylvania, 1-800-732-0999.
+
+**Virginia**: From the State Office of Consumer Affairs in the Department of Agriculture and Consumer Affairs, P.O. Box 1163, Richmond, VA 23218.
+
+**Washington**: From the Secretary of State at 1-800-332-4483 or [http://www.sos.wa.gov/charities/](http://www.sos.wa.gov/charities "" target="_blank" class="hyperlinks links")
+
+**West Virginia**: West Virginia residents may obtain a summary of the registration and financial documents from the Secretary of State, State Capitol, Charleston, WV 25305.
+
+**Wisconsin**: A financial statement of the charitable organization disclosing assets, liabilities, fund balances, revenue and expenses for the preceding fiscal year will be provided to any person upon request.
+
+#### Registration with a state agency does not constitute or imply endorsement, approval or recommendation by that state.
+
+More information about [state disclosure verbiage](http://www.labyrinthinc.com/charity-resources/nonprofit-regulatio… "" class="hyperlinks links" target="_blank" rel="noopener") and [charitable state registrations](http://www.labyrinthinc.com/charity-resources/annual-charita… "" class="hyperlinks links" target="_blank" rel="noopener").
diff --git a/models/state-disclosures.ini b/models/state-disclosures.ini
new file mode 100644
index 00000000..e4f9516d
--- /dev/null
+++ b/models/state-disclosures.ini
@@ -0,0 +1,9 @@
+[model]
+name = Donate Page
+label = {{ this.title }}
+inherits = donate-page
+
+[fields.preamble]
+label = Preamble
+type = markdown
+translate = True
\ No newline at end of file
diff --git a/templates/state-disclosures.html b/templates/state-disclosures.html
new file mode 100644
index 00000000..ac8fc4ee
--- /dev/null
+++ b/templates/state-disclosures.html
@@ -0,0 +1,18 @@
+{% extends "donate-empty.html" %}
+{% block donate_content %}
+<div class="fixed-width">
+ <div class="state-disclosures">
+ <div class="preamble">
+ {{ this.preamble }}
+ </div>
+ {{ this.body }}
+ <hr/>
+ <div class="button-line">
+ <a class="purple button" href="../donor-faq">Back to Donate FAQ</a>
+ </div>
+ <div class="button-line">
+ <a class="purple button" href="../">Back to Donate Page</a>
+ </div>
+ </div>
+</div>
+{% endblock %}
1
0

30 Jun '21
commit b74dea7597f56de8ba7f487287ab44876fc802f5
Author: kez <kez(a)torproject.org>
Date: Wed Jun 30 00:57:29 2021 -0400
Move the /privacy-policy page to markdown
See: tpo/web/donate-static#34
---
content/privacy-policy/contents.lr | 25 ++++++++++++-------------
templates/privacy-policy.html | 10 ++++++++++
2 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/content/privacy-policy/contents.lr b/content/privacy-policy/contents.lr
index ce626881..b55ef355 100644
--- a/content/privacy-policy/contents.lr
+++ b/content/privacy-policy/contents.lr
@@ -1,6 +1,6 @@
_model: donate-page
---
-_template: donate-empty.html
+_template: privacy-policy.html
---
title: Donor Privacy Policy
---
@@ -12,15 +12,14 @@ color: primary
---
body:
-<div class="privacy-policy">
- <p>The Tor Project respects donor privacy and welcomes anonymous donations. If being anonymous is important to you, the best way to preserve your anonymity is by donating using a method that doesn't disclose your personal information.</p>
- <p>If you provide personal information as part of the donation process, it may be collected and retained by third-party service providers and/or the Tor Project, as described below. The Tor Project has very little influence over how third-party service providers, such as PayPal, may collect and use your information. We recommend you familiarize yourself with their <a href="https://www.paypal.com/webapps/mpp/ua/privacy-full">policies</a>, especially if you have privacy concerns.</p>
- <p>When you donate to the Tor Project, depending what mechanism you use, we may learn your name, the amount you donated, your email address, phone number and/or mailing address, as well as any other information you provide. We may also learn incidental data such as the date and time of your donation. The Tor Project will never have access to your financial data, such as your credit card information. We aim to be careful with your information.</p>
- <p>If you have provided your email address, we will email you once to thank you and give you a receipt. If you opt in during the donation process, we may email you again in future. If you donate more than $5,000 and we know your name and address, we are required to disclose it to the IRS in <a href="https://www.irs.gov/pub/irs-pdf/f990ezb.pdf">Schedule B of the Form 990</a>. But, that information is redacted from the publicly-available version of our Form 990. We will never publicly identify you as a donor without your permission.</p>
- <p>We do not publish, sell, trade, or rent any information about you. For our records, we retain your name, the amount of your donation, the date of the donation, and your contact information. Access to that information is restricted inside the Tor Project to people who need it to do their work, for example by thanking you or mailing you a t-shirt.</p>
- <p><strong>The Tor Project very much appreciates all its donors. Thank you for supporting Tor.</strong></p>
-</div>
-<hr>
-<div class="button-line">
- <a class="purple button" href="../">Back to Donate Page</a>
-</div>
+The Tor Project respects donor privacy and welcomes anonymous donations. If being anonymous is important to you, the best way to preserve your anonymity is by donating using a method that doesn't disclose your personal information.
+
+If you provide personal information as part of the donation process, it may be collected and retained by third-party service providers and/or the Tor Project, as described below. The Tor Project has very little influence over how third-party service providers, such as PayPal, may collect and use your information. We recommend you familiarize yourself with their [policies](https://www.paypal.com/webapps/mpp/ua/privacy-full "" target="_blank" rel="noopener"), especially if you have privacy concerns.
+
+When you donate to the Tor Project, depending what mechanism you use, we may learn your name, the amount you donated, your email address, phone number and/or mailing address, as well as any other information you provide. We may also learn incidental data such as the date and time of your donation. The Tor Project will never have access to your financial data, such as your credit card information. We aim to be careful with your information.
+
+If you have provided your email address, we will email you once to thank you and give you a receipt. If you opt in during the donation process, we may email you again in future. If you donate more than $5,000 and we know your name and address, we are required to disclose it to the IRS in [Schedule B of the Form 990](https://www.irs.gov/pub/irs-pdf/f990ezb.pdf "" target="_blank" rel="noopener"). But, that information is redacted from the publicly-available version of our Form 990. We will never publicly identify you as a donor without your permission.
+
+We do not publish, sell, trade, or rent any information about you. For our records, we retain your name, the amount of your donation, the date of the donation, and your contact information. Access to that information is restricted inside the Tor Project to people who need it to do their work, for example by thanking you or mailing you a t-shirt.
+
+**The Tor Project very much appreciates all its donors. Thank you for supporting Tor.**
diff --git a/templates/privacy-policy.html b/templates/privacy-policy.html
new file mode 100644
index 00000000..ac851092
--- /dev/null
+++ b/templates/privacy-policy.html
@@ -0,0 +1,10 @@
+{% extends "donate-empty.html" %}
+{% block donate_content %}
+<div class="privacy-policy">
+ {{ this.body }}
+</div>
+<hr>
+<div class="button-line">
+ <a class="purple button" href="../">Back to Donate Page</a>
+</div>
+{% endblock %}
1
0

[donate-static/staging] Move the /champions-of-privacy page to markdown
by kez@torproject.org 30 Jun '21
by kez@torproject.org 30 Jun '21
30 Jun '21
commit b835a137976967a398524f90b1f273f000a59df2
Author: kez <kez(a)torproject.org>
Date: Wed Jun 30 02:52:32 2021 -0400
Move the /champions-of-privacy page to markdown
See: tpo/web/donate-static#34
---
content/champions-of-privacy/contents.lr | 27 ++++++++++++++-------------
models/champions-of-privacy.ini | 13 +++++++++++++
templates/champions-of-privacy.html | 10 ++++++++++
templates/donate-form.html | 2 +-
4 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/content/champions-of-privacy/contents.lr b/content/champions-of-privacy/contents.lr
index 254bc59b..959a1aff 100644
--- a/content/champions-of-privacy/contents.lr
+++ b/content/champions-of-privacy/contents.lr
@@ -1,8 +1,8 @@
-_model: donate-form
+_model: champions-of-privacy
---
frequency: single
---
-_template: donate-form.html
+_template: champions-of-privacy.html
---
body:
---
@@ -12,17 +12,18 @@ title: Champions of Privacy
---
intro:
-<div class="mx-auto fixed-width col-7">
- <p></p>
- <p>Champions of Privacy make a significant pledge of $1,000 or more—creating a steady, reliable source of funds to help us be agile in our defense against the growing threats to privacy, freedom of expression, and access to information online.</p>
- <p>As a Champion of Privacy, you'll receive exclusive gifts and invitations to online events that will give you insider access to what's happening at Tor.</p>
- <p>We believe everyone in the world should be able to enjoy the luxury our tools provide: private access to the open web. The Tor Project counts on the support of our Champions of Privacy to keep our software strong and available to everyone who needs it. With your help, we can make the Tor network accessible to all.</p>
- <p>We're standing up for the universal human right to privacy. Join us by becoming a Champion of Privacy today.</p>
- <div class="text-center">
- <h4><a class="hyperlinks links" href="../monthly-giving">Join with a monthly gift of $84 per month, or more.</a></h4>
- <h4><a class="hyperlinks links" href="../cryptocurrency">Join with cryptocurrency.</a></h4>
- </div>
-</div>
+Champions of Privacy make a significant pledge of $1,000 or more—creating a steady, reliable source of funds to help us be agile in our defense against the growing threats to privacy, freedom of expression, and access to information online.
+
+As a Champion of Privacy, you'll receive exclusive gifts and invitations to online events that will give you insider access to what's happening at Tor.
+
+We believe everyone in the world should be able to enjoy the luxury our tools provide: private access to the open web. The Tor Project counts on the support of our Champions of Privacy to keep our software strong and available to everyone who needs it. With your help, we can make the Tor network accessible to all.
+
+We're standing up for the universal human right to privacy. Join us by becoming a Champion of Privacy today.
+---
+footer:
+
+#### [Join with a monthly gift of $84 per month, or more.](../monthly-giving "" class="hyperlinks links" target="_blank" rel="noopener")
+#### [Join with cryptocurrency.](../cryptocurrency "" class="hyperlinks links" target="_blank" rel="noopener")
---
single_one: 100000
---
diff --git a/models/champions-of-privacy.ini b/models/champions-of-privacy.ini
new file mode 100644
index 00000000..45df20ef
--- /dev/null
+++ b/models/champions-of-privacy.ini
@@ -0,0 +1,13 @@
+[model]
+name = Donate Page
+label = {{ this.title }}
+inherits = donate-form
+
+[fields.intro]
+label = Intro
+type = markdown
+
+[fields.footer]
+label = Footer
+type = markdown
+translate = True
\ No newline at end of file
diff --git a/templates/champions-of-privacy.html b/templates/champions-of-privacy.html
new file mode 100644
index 00000000..a7b36ad1
--- /dev/null
+++ b/templates/champions-of-privacy.html
@@ -0,0 +1,10 @@
+{% extends "donate-form.html" %}
+{% block donate_form_intro %}
+<div class="mx-auto fixed-width col-7">
+ <br>
+ {{ this.intro }}
+ <div class="text-center">
+ {{ this.footer }}
+ </div>
+</div>
+{% endblock %}
diff --git a/templates/donate-form.html b/templates/donate-form.html
index cfacc90d..67fac7cf 100644
--- a/templates/donate-form.html
+++ b/templates/donate-form.html
@@ -1,7 +1,7 @@
{% extends "layout.html" %}
{% block content %}
<div>
- {{ this.intro }}
+ {% block donate_form_intro %}{{ this.intro }}{% endblock %}
</div>
<div class="donate-form">
<div id="campaign-totals-area"></div>
1
0

[tor-browser-build/master] Revert "fixup! Add Tor Project bookmarks: tb-manual, community portal, donation, bridges db, and support portal"
by sysrqb@torproject.org 30 Jun '21
by sysrqb@torproject.org 30 Jun '21
30 Jun '21
commit c7e16bb784a74733549cbcbcedb87b85c550cb9b
Author: Matthew Finkel <sysrqb(a)torproject.org>
Date: Wed Jun 30 17:54:15 2021 +0000
Revert "fixup! Add Tor Project bookmarks: tb-manual, community portal, donation, bridges db, and support portal"
This reverts commit 215c74866903946fa75fe369108562506fcfe5ba.
---
projects/tor-browser/build | 11 +++++++++--
projects/tor-browser/config | 2 +-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index d2b8482..1d2e35b 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -48,7 +48,9 @@ MARTOOLS=$rootdir/mar-tools
mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
tar -C "$TBDIR" -xf [% c('input_files_by_name/obfs4') %]
-tar -C "$TBDIR" -xf [% c('input_files_by_name/snowflake') -%]
+[% IF c("var/snowflake") %]
+ tar -C "$TBDIR" -xf [% c('input_files_by_name/snowflake') -%]
+[% END -%]
tar -C "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]" -xf [% c('input_files_by_name/fonts') %]
@@ -133,7 +135,12 @@ cp -a Bundle-Data/Docs/* "$TBDIR/$DOCSPATH"
tar -C Bundle-Data/[% bundledata_osname %] [% IF ! c("var/namecoin") %]--exclude=*Electrum-NMC* --exclude=*ncprop279*[% END %] -c . | tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -x
cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$TBDIR/$TORCONFIGPATH/torrc-defaults"
-cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH"
+[% IF ! c("var/snowflake") %]
+ grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \
+ >> "$GENERATEDPREFSPATH"
+[% ELSE %]
+ cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH"
+[% END %]
[% IF ! c("var/multi_lingual") %]
echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$GENERATEDPREFSPATH"
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 1045d90..f98062e 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -75,7 +75,7 @@ input_files:
enable: '[% ! c("var/android") %]'
- project: snowflake
name: snowflake
- enable: '[% ! c("var/android") %]'
+ enable: '[% c("var/snowflake") && ! c("var/android") %]'
- filename: Bundle-Data
enable: '[% ! c("var/android") %]'
- URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit…
1
0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation@torproject.org 30 Jun '21
by translation@torproject.org 30 Jun '21
30 Jun '21
commit d0da6dceb90fc47948fcfab625b97d8b93a11ca6
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Jun 30 17:47:44 2021 +0000
https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
contents+pl.po | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 76 insertions(+), 10 deletions(-)
diff --git a/contents+pl.po b/contents+pl.po
index 068241c62b..6094094d07 100644
--- a/contents+pl.po
+++ b/contents+pl.po
@@ -14,8 +14,8 @@
# Filip <filipiczesio(a)vp.pl>, 2020
# Dawid Potocki <dpot(a)disroot.org>, 2020
# Marcin S <dzidek1003(a)o2.pl>, 2021
-# Kristian <geezet(a)riseup.net>, 2021
# Emma Peel, 2021
+# Kristian <geezet(a)riseup.net>, 2021
#
msgid ""
msgstr ""
@@ -23,7 +23,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-06-30 10:04+CET\n"
"PO-Revision-Date: 2018-10-02 22:41+0000\n"
-"Last-Translator: Emma Peel, 2021\n"
+"Last-Translator: Kristian <geezet(a)riseup.net>, 2021\n"
"Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -580,7 +580,7 @@ msgstr ""
#: https//support.torproject.org/glossary/dangerzone/
#: (content/glossary/dangerzone/contents+en.lrword.term)
msgid "Dangerzone"
-msgstr ""
+msgstr "Dangerzone"
#: https//support.torproject.org/glossary/dangerzone/
#: (content/glossary/dangerzone/contents+en.lrword.definition)
@@ -589,12 +589,17 @@ msgid ""
"document (even pdf) to pdf, when the document is potentially dangerous or "
"from an untrustworthy source."
msgstr ""
+"[Dangerzone](https://github.com/firstlookmedia/dangerzone) konwertuje każdy "
+"dokument tekstowy (nawet pdf) do pdf, gdy dokument jest potencjalnie "
+"niebezpieczny lub pochodzi z niezaufanego źródła."
#: https//support.torproject.org/glossary/dangerzone/
#: (content/glossary/dangerzone/contents+en.lrword.definition)
msgid ""
"This is done by converting the pdf to raw pixel data and then back to pdf."
msgstr ""
+"Dzieje się tak przez konwertowanie pdf do surowych pikseli, a następnie z "
+"powrotem do pdf. "
#: https//support.torproject.org/glossary/directory-authority/
#: (content/glossary/directory-authority/contents+en.lrword.term)
@@ -688,7 +693,7 @@ msgstr ""
#: https//support.torproject.org/glossary/f-droid/
#: (content/glossary/f-droid/contents+en.lrword.term)
msgid "F-Droid"
-msgstr ""
+msgstr "F-Droid"
#: https//support.torproject.org/glossary/f-droid/
#: (content/glossary/f-droid/contents+en.lrword.definition)
@@ -696,6 +701,8 @@ msgid ""
"F-Droid is a repository of FOSS (free and open source software) applications"
" for Android."
msgstr ""
+"F-Droid jest repozytorium aplikacji FOSS (free and open source software) dla"
+" systemów Android."
#: https//support.torproject.org/glossary/f-droid/
#: (content/glossary/f-droid/contents+en.lrword.definition)
@@ -703,6 +710,8 @@ msgid ""
"Just like in Google Play one can browse, install and keep track of updates "
"on the device using F-Droid."
msgstr ""
+"Podobnie jak Google Play, dzięki F-Droid możesz przeglądać, instalować i "
+"śledzić aktualizacje na Twoim urządzeniu."
#: https//support.torproject.org/glossary/f-droid/
#: (content/glossary/f-droid/contents+en.lrword.definition)
@@ -711,6 +720,9 @@ msgid ""
"manual.torproject.org/mobile-tor/) if you prefer installing the app through "
"F-Droid."
msgstr ""
+"Przeglądarka Tor jest dostępna na F-Droid. Śledź te [kroki](https://tb-"
+"manual.torproject.org/mobile-tor/) jeśli preferujesz instalację aplikacji "
+"przez F-Droid."
#: https//support.torproject.org/glossary/firefox/
#: (content/glossary/firefox/contents+en.lrword.term)
@@ -1859,6 +1871,9 @@ msgid ""
"[Snowflake](https://snowflake.torproject.org) is a pluggable transport which"
" provides censorship circumvention and access to a free and open internet."
msgstr ""
+"[Snowflake](https://snowflake.torproject.org) jest transportem wtykowym, "
+"który pozwala na obejście cenzury i zapewnia dostęp do wolnego i otwartego "
+"internetu."
#: https//support.torproject.org/glossary/snowflake/
#: (content/glossary/snowflake/contents+en.lrword.definition)
@@ -1866,12 +1881,16 @@ msgid ""
"It has three components; the Snowflake client, the Snowflake proxy (the two "
"together known as the Snowflake peers) and the broker."
msgstr ""
+"Składa się z trzech komponentów; klienta Snowflake, proxy Snowflake (oba "
+"razem znane jako Snowflake peers) oraz brokera."
#: https//support.torproject.org/glossary/snowflake/
#: (content/glossary/snowflake/contents+en.lrword.definition)
msgid ""
"Snowflake can allow an open browser tab to act as an ephemeral Tor bridge."
msgstr ""
+"Snowflake pozwala otwartej karcie przeglądarki stać się efemerycznym mostem "
+"Tora."
#: https//support.torproject.org/glossary/snowflake/
#: (content/glossary/snowflake/contents+en.lrword.definition)
@@ -1879,16 +1898,18 @@ msgid ""
"In order to prevent the blocking of proxy IP addresses, Snowflake involves a"
" large number of volunteer proxies, which also makes them hard to pin point."
msgstr ""
+"Aby zapobiec blokowaniu adresu IP proxy, Snowflake angażuje dużą liczbę "
+"wolontariuszy proxy, przez co ciężko jest zidentyfikować jednostkę."
#: https//support.torproject.org/glossary/socks5/
#: (content/glossary/socks5/contents+en.lrword.term)
msgid "SOCKS5"
-msgstr ""
+msgstr "SOCKS5"
#: https//support.torproject.org/glossary/socks5/
#: (content/glossary/socks5/contents+en.lrword.definition)
msgid "SOCKS5 is an Internet protocol used by Tor."
-msgstr ""
+msgstr "SOCKS5 to protokół Internetowy używany przez Tora."
#: https//support.torproject.org/glossary/socks5/
#: (content/glossary/socks5/contents+en.lrword.definition)
@@ -1896,6 +1917,8 @@ msgid ""
"It sends the traffic through the Tor network instead of sending it from your"
" IP address into the open network."
msgstr ""
+"Wysyła on ruch przez sieć Tor zamiast wysyłać go z Twojego adresu IP do "
+"otwartej sieci."
#: https//support.torproject.org/glossary/socks5/
#: (content/glossary/socks5/contents+en.lrword.definition)
@@ -1903,6 +1926,8 @@ msgid ""
"It is a general purpose [proxy](../proxy) that sits at the layer 5 of the "
"OSI model and uses the tunneling method."
msgstr ""
+"Jest to [proxy](../proxy) ogólnego użytku, które znajduje się w 5 warstwie "
+"modelu OSI i używa metody tunelowania."
#: https//support.torproject.org/glossary/socks5/
#: (content/glossary/socks5/contents+en.lrword.definition)
@@ -1910,11 +1935,13 @@ msgid ""
"The applications that you run with SOCKS5 will be aware of the tunneling, "
"but you can prevent identity correlation if set up correctly."
msgstr ""
+"Aplikacje których używasz wraz z SOCKS5 są świadome tunelowania, lecz jeśli "
+"odpowiednio skonfigurowane, mogą zapobiec korelacji tożsamości."
#: https//support.torproject.org/glossary/socks5/
#: (content/glossary/socks5/contents+en.lrword.spelling)
msgid "All in caps, as it is an acronym."
-msgstr ""
+msgstr "Wszystko z wielkich liter, ponieważ to akronim."
#: https//support.torproject.org/glossary/ssl/
#: (content/glossary/ssl/contents+en.lrword.term)
@@ -1996,7 +2023,7 @@ msgstr "[Dowiedz się więcej o Tails](https://tails.boum.org/)."
#: https//support.torproject.org/glossary/the-guardian-project/
#: (content/glossary/the-guardian-project/contents+en.lrword.term)
msgid "The Guardian Project"
-msgstr ""
+msgstr "Guardian Project"
#: https//support.torproject.org/glossary/the-guardian-project/
#: (content/glossary/the-guardian-project/contents+en.lrword.definition)
@@ -2005,6 +2032,10 @@ msgid ""
" developers, activists and designers that create easy to use, secure, "
"opensource mobile apps and operating system enhancements."
msgstr ""
+"[Guardian Project](https://guardianproject.info/) to grupa deweloperów "
+"oprogramowania, aktywistów i projektantów, którzy tworzą łatwe w użytku, "
+"bezpiecznie, z otwartym źródłem aplikacje mobilne oraz usprawnienia systemów"
+" operacyjnych."
#: https//support.torproject.org/glossary/the-guardian-project/
#: (content/glossary/the-guardian-project/contents+en.lrword.definition)
@@ -2014,6 +2045,10 @@ msgid ""
"provided by The Guardian Project helps route other apps on your andriod "
"device over the Tor network."
msgstr ""
+"[Aplikacja "
+"Orbot](https://play.google.com/store/apps/details?id=org.torproject.android)"
+" stworzona przez Guardian Project pomaga przekierować ruch innych aplikacji "
+"na Twoim urządzeniu Android przez sieć Tor."
#: https//support.torproject.org/glossary/the-tor-project/
#: (content/glossary/the-tor-project/contents+en.lrword.term)
@@ -5928,6 +5963,11 @@ msgid ""
"search results in English regardless of what Google server you have been "
"sent to. The changed link might look like this:"
msgstr ""
+"Zwróć uwagę, że adresy URL wyszukiwania Google używają argumentów jako parę "
+"nazwa/wartość, jedna z tych nazw to \"hl\". Jeśli ustawisz \"hl\" na \"pl\","
+" to Google zwróci wyniki wyszukiwania w języku Polskim niezależnie do "
+"jakiego serwera Google zostałeś wysłany. Zmieniony link może wyglądać mniej "
+"więcej tak:"
#: https//support.torproject.org/tbb/tbb-43/
#: (content/tbb/tbb-43/contents+en.lrquestion.description)
@@ -6864,6 +6904,8 @@ msgid ""
"In the body of the mail, write the name of your operating system (such as "
"Windows, macOS, or Linux)."
msgstr ""
+"W treści maila wpisz nazwę Twojego systemu operacyjnego (np. Windows, macOS,"
+" lub Linux)"
#: https//support.torproject.org/gettor/gettor-2/
#: (content/gettor/gettor-2/contents+en.lrquestion.description)
@@ -7289,6 +7331,8 @@ msgid ""
"You may try one or more of the following activities in case you encounter "
"this error:"
msgstr ""
+"Możesz spróbować jednego lub więcej rekomendowanych sposobów w przypadku gdy"
+" napotka Cię ten błąd:"
#: https//support.torproject.org/connecting/connecting-4/
#: (content/connecting/connecting-4/contents+en.lrquestion.description)
@@ -10364,6 +10408,10 @@ msgid ""
"correctly; even a small mistake will stop Tor Browser from being able to "
"reach the site."
msgstr ""
+"Jeśli nie możesz dotrzeć do pożądanego serwisu cebulowego, upewnij się, że "
+"poprawnie wpisałeś 16-znakowy lub, w najnowszym formacie, 56-znakowy adres "
+"cebulowy; nawet drobny błąd powstrzyma Przeglądarkę Tor przed dotarciem na "
+"miejsce."
#: https//support.torproject.org/onionservices/onionservices-3/
#: (content/onionservices/onionservices-3/contents+en.lrquestion.description)
@@ -10483,17 +10531,19 @@ msgstr "Cebula ze znakiem ostrzegawczym oznacza:"
#: https//support.torproject.org/onionservices/onionservices-5/
#: (content/onionservices/onionservices-5/contents+en.lrquestion.description)
msgid "- The Onion Service is served over HTTPS with an expired Certificate."
-msgstr ""
+msgstr "- Usługa Onion jest obsługiwana przez HTTPS z wygasłym Certyfikatem."
#: https//support.torproject.org/onionservices/onionservices-5/
#: (content/onionservices/onionservices-5/contents+en.lrquestion.description)
msgid "- The Onion Service is served over HTTPS with a wrong Domain."
-msgstr ""
+msgstr "- Usługa Onion jest obsługiwana przez HTTPS z nieprawidłową Domeną."
#: https//support.torproject.org/onionservices/onionservices-5/
#: (content/onionservices/onionservices-5/contents+en.lrquestion.description)
msgid "- The Onion Service is served with a mixed form over an insecure URL."
msgstr ""
+"- Usługa Onion jest obsługiwana w formie mieszanej, pochodzącej z niepewnego"
+" URL."
#: https//support.torproject.org/onionservices/v2-deprecation/
#: (content/onionservices/v2-deprecation/contents+en.lrquestion.title)
@@ -12761,6 +12811,12 @@ msgid ""
"removing the ability of the abusers to blend in, the abusers moved back to "
"using their open proxies and bot networks."
msgstr ""
+"Na przykład, sieć IRC Freenode, miała problem ze skoordynowaną grupą "
+"sprawców nadużyć, którzy dołączali na kanały i subtelnie przejmowali "
+"konwersacje; ale gdy zostali oznaczeni jako użytkownicy pochodzący z węzła "
+"Tor - \"anonimowi użytkownicy\", odjęło im to możliwość wtopienia się w "
+"tłum, co skutkowało przeniesieniem się z powrotem na otwarte proxy i "
+"botnety."
#: https//support.torproject.org/abuse/i-want-to-ban-tor/
#: (content/abuse/ban-tor/contents+en.lrquestion.description)
@@ -13144,6 +13200,10 @@ msgid ""
"complaints\", so we hope our network is more sustainable than past attempts "
"at anonymity networks."
msgstr ""
+"Polityka wyjścia Tora pomaga odróżnić rolę osoby \"chcącej przekazać zasoby "
+"na rzecz sieci\", od osoby \"chętnej do zajmowania się skargami dotyczącymi "
+"nadużyć połączeń wyjściowych\", więc mamy nadzieję, że nasza sieć jest "
+"bardziej zrównoważona niż poprzednie próby stworzenia anonimowej sieci."
#: https//support.torproject.org/abuse/does-tor-get-much-abuse/
#: (content/abuse/how-much-abuse/contents+en.lrquestion.description)
@@ -13241,6 +13301,9 @@ msgid ""
"sprung up based on this flawed security model (not unlike the antivirus "
"industry)."
msgstr ""
+"Sieci IRC przegrywają walkę próbując blokować wszystkie węzły, cały przemysł"
+" chałupniczy list blokujących i sposobów walki z trollami powstał w skutek "
+"tego wadliwego modelu bezpieczeństwa (podobnie jak branża antywirusowa)."
#: https//support.torproject.org/abuse/tor-ban-irc/
#: (content/abuse/irc-ban/contents+en.lrquestion.description)
@@ -14192,6 +14255,9 @@ msgid ""
" clients make periodically to update their list of relays and estimate "
"number of users indirectly from there."
msgstr ""
+"W sumie, to nie liczymy użytkowników, lecz liczymy ilość zapytań wysłanych "
+"do katalogów, klient co jakiś czas odświeża listę ich przekaźników i szacuje"
+" liczbę użytkowników pośrednio stamtąd."
#: https//support.torproject.org/metrics/user-numbers/
#: (content/metrics/user-numbers/contents+en.lrquestion.title)
1
0

[tor-browser/tor-browser-78.11.0esr-10.5-1] squash! Bug 26961: New user onboarding.
by sysrqb@torproject.org 30 Jun '21
by sysrqb@torproject.org 30 Jun '21
30 Jun '21
commit 19d57bc2c04eed2290354024d9eb4b08779a7b41
Author: Matthew Finkel <sysrqb(a)torproject.org>
Date: Wed Jun 30 17:37:11 2021 +0000
squash! Bug 26961: New user onboarding.
Bug 40429: Update Onboarding for 10.5
---
browser/extensions/onboarding/content/Onboarding.jsm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/browser/extensions/onboarding/content/Onboarding.jsm b/browser/extensions/onboarding/content/Onboarding.jsm
index 9f51fb4bd28a..99ec2b45d35f 100644
--- a/browser/extensions/onboarding/content/Onboarding.jsm
+++ b/browser/extensions/onboarding/content/Onboarding.jsm
@@ -909,7 +909,7 @@ class Onboarding {
}
const kOnionURL = "https://3g2upl4pq6kufc4m.onion/"; // DuckDuckGo
- const kLearnMore = "https://www.torproject.org/releases/tor-browser-10-0/";
+ const kLearnMore = "https://www.torproject.org/releases/tor-browser-10-5/";
let handledTourActionClick = false;
switch (id) {
case "onboarding-overlay-button-icon":
1
0

[tor-browser-build/master] fixup! Add Tor Project bookmarks: tb-manual, community portal, donation, bridges db, and support portal
by sysrqb@torproject.org 30 Jun '21
by sysrqb@torproject.org 30 Jun '21
30 Jun '21
commit 215c74866903946fa75fe369108562506fcfe5ba
Author: Matthew Finkel <sysrqb(a)torproject.org>
Date: Wed Jun 30 17:34:12 2021 +0000
fixup! Add Tor Project bookmarks: tb-manual, community portal, donation, bridges db, and support portal
---
projects/tor-browser/build | 11 ++---------
projects/tor-browser/config | 2 +-
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index 1d2e35b..d2b8482 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -48,9 +48,7 @@ MARTOOLS=$rootdir/mar-tools
mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
tar -C "$TBDIR" -xf [% c('input_files_by_name/obfs4') %]
-[% IF c("var/snowflake") %]
- tar -C "$TBDIR" -xf [% c('input_files_by_name/snowflake') -%]
-[% END -%]
+tar -C "$TBDIR" -xf [% c('input_files_by_name/snowflake') -%]
tar -C "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]" -xf [% c('input_files_by_name/fonts') %]
@@ -135,12 +133,7 @@ cp -a Bundle-Data/Docs/* "$TBDIR/$DOCSPATH"
tar -C Bundle-Data/[% bundledata_osname %] [% IF ! c("var/namecoin") %]--exclude=*Electrum-NMC* --exclude=*ncprop279*[% END %] -c . | tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -x
cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$TBDIR/$TORCONFIGPATH/torrc-defaults"
-[% IF ! c("var/snowflake") %]
- grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \
- >> "$GENERATEDPREFSPATH"
-[% ELSE %]
- cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH"
-[% END %]
+cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH"
[% IF ! c("var/multi_lingual") %]
echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$GENERATEDPREFSPATH"
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index f98062e..1045d90 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -75,7 +75,7 @@ input_files:
enable: '[% ! c("var/android") %]'
- project: snowflake
name: snowflake
- enable: '[% c("var/snowflake") && ! c("var/android") %]'
+ enable: '[% ! c("var/android") %]'
- filename: Bundle-Data
enable: '[% ! c("var/android") %]'
- URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit…
1
0

[tor-browser-build/master] Add Tor Project bookmarks: tb-manual, community portal, donation, bridges db, and support portal
by sysrqb@torproject.org 30 Jun '21
by sysrqb@torproject.org 30 Jun '21
30 Jun '21
commit f5fa4a2b726475798e988b3f07dbe5dc9bf21afc
Author: gus <gus(a)torproject.org>
Date: Fri Jun 25 20:35:23 2021 -0300
Add Tor Project bookmarks: tb-manual, community portal, donation, bridges db, and support portal
---
.../linux/Data/Browser/profile.default/bookmarks.html | 9 +++++++--
.../mac/TorBrowser/Data/Browser/profile.default/bookmarks.html | 9 +++++++--
.../windows/Data/Browser/profile.default/bookmarks.html | 9 +++++++--
3 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/bookmarks.html b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/bookmarks.html
index 7aa31dd..30e1598 100644
--- a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/bookmarks.html
+++ b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/bookmarks.html
@@ -7,11 +7,16 @@
<H1>Bookmarks</H1>
<DL><p>
- <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">Bookmarks Toolbar Folder</H3>
-<DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
+ <DT><H3>Tor Project Bookmarks</H3>
+<DD>Helpful bookmarks from the Tor Project
<DL><p>
<DT><A HREF="https://www.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMAAAX/
//8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">Learn more about Tor</A>
<DT><A HREF="https://blog.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMAAAX
///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">The Tor Blog</A>
+ <DT><A HREF="https://support.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMA
AAX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">Tor Support portal - Get help</A>
+ <DT><A HREF="https://tb-manual.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHz
MAAAX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">Tor Browser Manual</A>
+ <DT><A HREF="https://community.torproject.org" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzM
AAAX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">Tor Community - Get Involved</A>
+ <DT><A HREF="https://donate.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMAA
AX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">Donate - Keep Tor Strong</A>
+ <DT><A HREF="https://bridges.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMA
AAX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">Circumvent Censorship, Get Bridges</A>
</DL><p>
<HR>
</DL><p>
diff --git a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/bookmarks.html b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/bookmarks.html
index 7aa31dd..30e1598 100644
--- a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/bookmarks.html
+++ b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/bookmarks.html
@@ -7,11 +7,16 @@
<H1>Bookmarks</H1>
<DL><p>
- <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">Bookmarks Toolbar Folder</H3>
-<DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
+ <DT><H3>Tor Project Bookmarks</H3>
+<DD>Helpful bookmarks from the Tor Project
<DL><p>
<DT><A HREF="https://www.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMAAAX/
//8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">Learn more about Tor</A>
<DT><A HREF="https://blog.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMAAAX
///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">The Tor Blog</A>
+ <DT><A HREF="https://support.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMA
AAX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">Tor Support portal - Get help</A>
+ <DT><A HREF="https://tb-manual.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHz
MAAAX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">Tor Browser Manual</A>
+ <DT><A HREF="https://community.torproject.org" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzM
AAAX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">Tor Community - Get Involved</A>
+ <DT><A HREF="https://donate.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMAA
AX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">Donate - Keep Tor Strong</A>
+ <DT><A HREF="https://bridges.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMA
AAX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">Circumvent Censorship, Get Bridges</A>
</DL><p>
<HR>
</DL><p>
diff --git a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/bookmarks.html b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/bookmarks.html
index 7aa31dd..30e1598 100644
--- a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/bookmarks.html
+++ b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/bookmarks.html
@@ -7,11 +7,16 @@
<H1>Bookmarks</H1>
<DL><p>
- <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">Bookmarks Toolbar Folder</H3>
-<DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
+ <DT><H3>Tor Project Bookmarks</H3>
+<DD>Helpful bookmarks from the Tor Project
<DL><p>
<DT><A HREF="https://www.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMAAAX/
//8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">Learn more about Tor</A>
<DT><A HREF="https://blog.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMAAAX
///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">The Tor Blog</A>
+ <DT><A HREF="https://support.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMA
AAX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">Tor Support portal - Get help</A>
+ <DT><A HREF="https://tb-manual.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHz
MAAAX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">Tor Browser Manual</A>
+ <DT><A HREF="https://community.torproject.org" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzM
AAAX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">Tor Community - Get Involved</A>
+ <DT><A HREF="https://donate.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMAA
AX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">Donate - Keep Tor Strong</A>
+ <DT><A HREF="https://bridges.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMA
AAX///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">Circumvent Censorship, Get Bridges</A>
</DL><p>
<HR>
</DL><p>
1
0

[donate-static/staging] Move the donor FAQ pages entirely to structured markdown
by kez@torproject.org 30 Jun '21
by kez@torproject.org 30 Jun '21
30 Jun '21
commit 7f5ebc522d8ae83e1b17b77ba5acfb3220e5027b
Author: kez <kez(a)torproject.org>
Date: Tue Jun 29 00:27:49 2021 -0400
Move the donor FAQ pages entirely to structured markdown
---
content/donor-faq/01-how-can-i-donate/contents.lr | 18 ++
.../02-what-is-the-tor-project/contents.lr | 6 +
.../03-who-works-for-the-tor-project/contents.lr | 6 +
content/donor-faq/04-who-uses-tor/contents.lr | 6 +
.../donor-faq/05-can-anyone-use-tor/contents.lr | 6 +
.../06-what-kinds-of-people-use-tor/contents.lr | 6 +
.../07-how-does-tor-protect-anonymity/contents.lr | 12 +
.../08-more-about-how-tor-works/contents.lr | 6 +
.../09-does-the-tor-software-work/contents.lr | 14 ++
.../10-is-what-tor-does-legal/contents.lr | 13 ++
.../contents.lr | 6 +
.../12-where-does-the-money-come-from/contents.lr | 15 ++
.../contents.lr | 11 +
.../14-is-my-donation-tax-deductible/contents.lr | 28 +++
.../15-outside-united-states-donation/contents.lr | 8 +
.../contents.lr | 30 +++
.../contents.lr | 12 +
.../contents.lr | 14 ++
.../19-donate-via-debit-credit/contents.lr | 7 +
.../20-why-do-you-ask-for-my-address/contents.lr | 11 +
.../21-why-is-there-a-minimum-donation/contents.lr | 9 +
.../22-is-there-a-maximum-donation/contents.lr | 9 +
.../contents.lr | 10 +
.../donor-faq/24-can-i-donate-by-mail/contents.lr | 6 +
.../25-do-you-accept-cash-donations/contents.lr | 6 +
.../26-can-i-donate-via-amazonsmile/contents.lr | 12 +
.../contents.lr | 10 +
.../28-can-i-make-a-stock-donation/contents.lr | 19 ++
.../contents.lr | 12 +
.../contents.lr | 15 ++
.../contents.lr | 6 +
.../32-what-is-your-refund-policy/contents.lr | 12 +
.../contents.lr | 11 +
.../contents.lr | 11 +
.../contents.lr | 7 +
.../36-stay-in-touch-with-tor-project/contents.lr | 7 +
.../contents.lr | 10 +
.../38-can-i-donate-my-airline-miles/contents.lr | 7 +
.../donor-faq/39-can-i-donate-hardware/contents.lr | 8 +
.../donor-faq/40-can-i-donate-my-time/contents.lr | 6 +
.../contents.lr | 12 +
.../contents.lr | 6 +
.../contents.lr | 8 +
.../contents.lr | 8 +
content/donor-faq/contents.lr | 241 +--------------------
models/donor-faq.ini | 8 +
models/donor-question.ini | 16 ++
templates/donate-empty.html | 2 +-
templates/donor-faq.html | 25 +++
templates/donor-question.html | 0
50 files changed, 514 insertions(+), 240 deletions(-)
diff --git a/content/donor-faq/01-how-can-i-donate/contents.lr b/content/donor-faq/01-how-can-i-donate/contents.lr
new file mode 100644
index 00000000..f1d6f893
--- /dev/null
+++ b/content/donor-faq/01-how-can-i-donate/contents.lr
@@ -0,0 +1,18 @@
+key: 1
+---
+question: How else can I donate to the Tor Project?
+---
+answer:
+Note: if you wish to donate to the Tor Project by [credit card or PayPal, please click here.](https://2019.www.torproject.org/donate/donate.html.en)
+
+The Tor Project also offers the following alternative donation methods:
+- [Bitcoin and Other Cryptocurrencies](../cryptocurrency "" target="_blank" rel="noopener")
+- [BTCPayServer](../cryptocurrency "" target="_blank" rel="noopener")
+- [BottlePay](https://twitter.com/torproject/status/1196820407950741520 "" target="_blank" rel="noopener")
+- [Amazon Smile](https://smile.amazon.com/ch/20-8096820 "" target="_blank" rel="noopener")
+- [Giving Assistant](https://givingassistant.org/np#tor-project-inc "" target="_blank" rel="noopener")
+- [EU Bank Transfer](../donor-faq#eu-bank-transfer "" target="_blank" rel="noopener")
+- [Checks](../donor-faq#donate-by-mail "" target="_blank" rel="noopener") or [Money Orders](../donor-faq#donate-anonymous "" target="_blank" rel="noopener")
+- [Stock Donation](../donor-faq#donate-stock "" target="_blank" rel="noopener")
+
+If you have any questions or would like to receive a thank-you gift after making a donation with one of the methods above, please email <span class="email">giving(at)torproject.org</span>.
diff --git a/content/donor-faq/02-what-is-the-tor-project/contents.lr b/content/donor-faq/02-what-is-the-tor-project/contents.lr
new file mode 100644
index 00000000..6ca06629
--- /dev/null
+++ b/content/donor-faq/02-what-is-the-tor-project/contents.lr
@@ -0,0 +1,6 @@
+key: 2
+---
+question: What is the Tor Project and what does it do?
+---
+answer:
+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 [Tor Browser](https://www.torproject.org/download/download-easy.html.en "" target="_blank" rel="noopener"), which enables people to browse the internet anonymously. The Tor Project is a 501(c)3 tax-exempt non-profit organization. It was founded in 2006.
diff --git a/content/donor-faq/03-who-works-for-the-tor-project/contents.lr b/content/donor-faq/03-who-works-for-the-tor-project/contents.lr
new file mode 100644
index 00000000..3e20fa7d
--- /dev/null
+++ b/content/donor-faq/03-who-works-for-the-tor-project/contents.lr
@@ -0,0 +1,6 @@
+key: 3
+---
+question: Who works for the Tor Project, and what do they do?
+---
+answer:
+Thousands of 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 47 people in total. You can read about the core contributors to the Tor Project on our [Core People page](https://www.torproject.org/about/corepeople.html.en "" target="_blank" rel="noopener")<span class="links">.
diff --git a/content/donor-faq/04-who-uses-tor/contents.lr b/content/donor-faq/04-who-uses-tor/contents.lr
new file mode 100644
index 00000000..929ef7ab
--- /dev/null
+++ b/content/donor-faq/04-who-uses-tor/contents.lr
@@ -0,0 +1,6 @@
+key: 4'
+---
+question: Who uses Tor?
+---
+answer:
+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.
diff --git a/content/donor-faq/05-can-anyone-use-tor/contents.lr b/content/donor-faq/05-can-anyone-use-tor/contents.lr
new file mode 100644
index 00000000..be520fc5
--- /dev/null
+++ b/content/donor-faq/05-can-anyone-use-tor/contents.lr
@@ -0,0 +1,6 @@
+key: 5
+---
+question: Can anyone use Tor?
+---
+answer:
+Yes! Tor is free, and anyone can use it. To get started, you will need to [download Tor Browser](https://www.torproject.org/projects/torbrowser.html.en "" target="_blank" rel="noopener"). We offer instructions on how to download for [Windows](https://www.torproject.org/projects/torbrowser.html.en#windows "" target="_blank" rel="noopener"), [Mac OS X](https://www.torproject.org/projects/torbrowser.html.en#macosx "" target="_blank" rel="noopener"), [Linux](https://www.torproject.org/projects/torbrowser.html.en#linux "" target="_blank" rel="noopener"), and [Android](https://www.torproject.org/download/#android "" target="_blank" rel="noopener").
diff --git a/content/donor-faq/06-what-kinds-of-people-use-tor/contents.lr b/content/donor-faq/06-what-kinds-of-people-use-tor/contents.lr
new file mode 100644
index 00000000..5e6b42e0
--- /dev/null
+++ b/content/donor-faq/06-what-kinds-of-people-use-tor/contents.lr
@@ -0,0 +1,6 @@
+key: 6
+---
+question: What kinds of people support Tor?
+---
+answer:
+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](https://www.torproject.org/about/sponsors/ "" target="_blank" rel="noopener") 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 Open Technology Fund. People also support Tor in non-financial ways, for example by [running Tor relays](https://community.torproject.org/relay/ "" target="_blank" rel="noopener") to help carry traffic for other users. 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.
diff --git a/content/donor-faq/07-how-does-tor-protect-anonymity/contents.lr b/content/donor-faq/07-how-does-tor-protect-anonymity/contents.lr
new file mode 100644
index 00000000..c7541edc
--- /dev/null
+++ b/content/donor-faq/07-how-does-tor-protect-anonymity/contents.lr
@@ -0,0 +1,12 @@
+key: 7
+---
+question: How does the Tor software work to protect people's anonymity?
+---
+answer:
+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.
+
+[Watch this video to learn more about how Tor works.](https://youtu.be/JWII85UlzKw)
diff --git a/content/donor-faq/08-more-about-how-tor-works/contents.lr b/content/donor-faq/08-more-about-how-tor-works/contents.lr
new file mode 100644
index 00000000..ce590819
--- /dev/null
+++ b/content/donor-faq/08-more-about-how-tor-works/contents.lr
@@ -0,0 +1,6 @@
+key: 8
+---
+question: I would like to know more about how Tor works, what onion services are, or how to run a relay.
+---
+answer:
+[This Tor Project FAQ](https://support.torproject.org/faq/) has answers to all those questions, and more.
diff --git a/content/donor-faq/09-does-the-tor-software-work/contents.lr b/content/donor-faq/09-does-the-tor-software-work/contents.lr
new file mode 100644
index 00000000..9fa84b6b
--- /dev/null
+++ b/content/donor-faq/09-does-the-tor-software-work/contents.lr
@@ -0,0 +1,14 @@
+key: 9
+---
+question: Does the Tor software work?
+---
+answer:
+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 [some of the strongest anonymity software that exists](https://www.eff.org/deeplinks/2014/07/7-things-you-should-know-abou…,
+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."
diff --git a/content/donor-faq/10-is-what-tor-does-legal/contents.lr b/content/donor-faq/10-is-what-tor-does-legal/contents.lr
new file mode 100644
index 00000000..1d4c40d6
--- /dev/null
+++ b/content/donor-faq/10-is-what-tor-does-legal/contents.lr
@@ -0,0 +1,13 @@
+key: 10
+---
+question: Is what Tor does legal? Can I get in trouble for using it?
+---
+answer:
+Downloading 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 on the [EFF Legal FAQ](https://community.torproject.org/relay/community-resources/eff-tor-leg….
diff --git a/content/donor-faq/11-more-about-tor-project-financial-info/contents.lr b/content/donor-faq/11-more-about-tor-project-financial-info/contents.lr
new file mode 100644
index 00000000..4718851b
--- /dev/null
+++ b/content/donor-faq/11-more-about-tor-project-financial-info/contents.lr
@@ -0,0 +1,6 @@
+key: 11
+---
+question: Where can I find out more about the Tor Project, especially financial information?
+---
+answer:
+Here are the Tor Project's [financial statements and its Form 990](https://www.torproject.org/about/financials.html.en).
diff --git a/content/donor-faq/12-where-does-the-money-come-from/contents.lr b/content/donor-faq/12-where-does-the-money-come-from/contents.lr
new file mode 100644
index 00000000..3b284e2a
--- /dev/null
+++ b/content/donor-faq/12-where-does-the-money-come-from/contents.lr
@@ -0,0 +1,15 @@
+key: 12
+---
+question: Where does the Tor Project's money come from?
+---
+answer:
+Tor is supported by United States government funding agencies, NGOs,
+private foundations, research institutions, private companies, and over
+20,000 personal donations from people like you. (See our [Sponsors Page](https://www.torproject.org/about/sponsors)
+for more.) While we are grateful for this funding, we don't want the
+Tor Project to become too dependent on any single source. Crowdfunding
+allows us to diversify our donor base and 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.
diff --git a/content/donor-faq/13-how-much-does-tor-project-spend-annually/contents.lr b/content/donor-faq/13-how-much-does-tor-project-spend-annually/contents.lr
new file mode 100644
index 00000000..ddbae44e
--- /dev/null
+++ b/content/donor-faq/13-how-much-does-tor-project-spend-annually/contents.lr
@@ -0,0 +1,11 @@
+key: 13
+---
+question: How much money does the Tor Project spend annually, and what is it used for?
+---
+answer:
+The Tor Project spends about $5 million annually. About 80% of the Tor
+Project's spending goes to 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.
diff --git a/content/donor-faq/14-is-my-donation-tax-deductible/contents.lr b/content/donor-faq/14-is-my-donation-tax-deductible/contents.lr
new file mode 100644
index 00000000..36fefcd7
--- /dev/null
+++ b/content/donor-faq/14-is-my-donation-tax-deductible/contents.lr
@@ -0,0 +1,28 @@
+key: 14
+---
+question: Is my donation tax-deductible?
+---
+answer:
+If you pay taxes in the United States, your donation to Tor is tax
+deductible to the full extent required by law. Following is information
+you may need for reporting purposes:
+
+**Tor Project Tax ID Number (EIN \#)**: 20-8096820
+**Address**:
+The Tor Project, Inc.
+217 First Avenue South \#4903
+Seattle, WA 98194
+**Phone number**: 206-420-3136
+**Contact person**: Isabela Bagueros, Executive Director
+
+For European bank transfers, we have an
+arrangement with the Renewable Freedom Foundation to provide
+tax-deductible donations for Europeans. They will issue a donation
+receipt [upon request](https://renewablefreedom.org/contact/). The account information is as follows:
+
+**Renewable Freedom Foundation**
+IBAN: DE17721500000053693701
+BIC: BYLADEM1ING
+Sparkasse Ingolstadt
+Rathausplatz 6
+85049 Ingolstadt
diff --git a/content/donor-faq/15-outside-united-states-donation/contents.lr b/content/donor-faq/15-outside-united-states-donation/contents.lr
new file mode 100644
index 00000000..ef97677b
--- /dev/null
+++ b/content/donor-faq/15-outside-united-states-donation/contents.lr
@@ -0,0 +1,8 @@
+key: 15
+---
+question: If I am not in the United States, can I still donate?
+---
+answer:
+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.
diff --git a/content/donor-faq/16-tax-deductible-ousite-united-states/contents.lr b/content/donor-faq/16-tax-deductible-ousite-united-states/contents.lr
new file mode 100644
index 00000000..581d8841
--- /dev/null
+++ b/content/donor-faq/16-tax-deductible-ousite-united-states/contents.lr
@@ -0,0 +1,30 @@
+key: 16
+---
+question: It's important to me that my donation be tax-deductible, but I don't pay taxes in the United States.
+---
+answer:
+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 the future. Or, if you are in
+Germany, France, or Sweden, these organizations support the Tor network
+and may be able to offer you tax-deductibility for your
+donation.
+
+[torservers.net](https://www.torservers.net/) is a German charitable non-profit that runs a
+wide variety of exit relays worldwide. They also like donations of
+bandwidth from ISPs.
+
+[Noisebridge](https://www.noisebridge.net/wiki/Noisebridge_Tor) is a US-based 501(c)(3) non-profit that
+collects donations and turns them into more US-based exit relay
+capacity.
+
+[Nos Oignons](https://nos-oignons.net/) is a French charitable non-profit that runs fast
+exit relays in France.
+
+[DFRI](https://www.dfri.se/donera/?lang=en) is a Swedish non-profit running exit
+relays.
+
+These organizations are not the same as [The Tor Project, Inc](https://www.torproject.org/), but
+we consider that a good thing. They're run by nice people who are part
+of the Tor community.
diff --git a/content/donor-faq/17-donate-to-specific-project-purpose/contents.lr b/content/donor-faq/17-donate-to-specific-project-purpose/contents.lr
new file mode 100644
index 00000000..d08f2026
--- /dev/null
+++ b/content/donor-faq/17-donate-to-specific-project-purpose/contents.lr
@@ -0,0 +1,12 @@
+key: 17
+---
+question: Can I donate to a specific project, or restrict my donation to a particular purpose?
+---
+answer:
+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.
diff --git a/content/donor-faq/18-can-i-donate-while-using-tor-browser/contents.lr b/content/donor-faq/18-can-i-donate-while-using-tor-browser/contents.lr
new file mode 100644
index 00000000..30cd051f
--- /dev/null
+++ b/content/donor-faq/18-can-i-donate-while-using-tor-browser/contents.lr
@@ -0,0 +1,14 @@
+key: 18
+---
+question: Can I donate while using Tor Browser?
+---
+answer:
+Yes! In our testing, donation works via Tor Browser. If you run into
+problems, please contact giving(at)torproject.org.
+
+For users logging in to Paypal: some people had no problem donating via PayPal while using
+Tor Browser. Some users experience issues because PayPal limits the
+number of times an IP address can be used in a certain period of time.
+This is to prevent fraud from card testers. If you run into an issue,
+please try again. Unfortunately, when we are receiving a high volume of
+donations, you might need to use a different browser.
diff --git a/content/donor-faq/19-donate-via-debit-credit/contents.lr b/content/donor-faq/19-donate-via-debit-credit/contents.lr
new file mode 100644
index 00000000..2f50526e
--- /dev/null
+++ b/content/donor-faq/19-donate-via-debit-credit/contents.lr
@@ -0,0 +1,7 @@
+key: 19
+---
+question: How can I donate via debit or credit card?
+---
+answer:
+To donate using a major credit card or debit card (VISA, MasterCard,
+Discover or American Express) or via PayPal, please visit our [donate page](https://donate.torproject.org/).
diff --git a/content/donor-faq/20-why-do-you-ask-for-my-address/contents.lr b/content/donor-faq/20-why-do-you-ask-for-my-address/contents.lr
new file mode 100644
index 00000000..c6dad40e
--- /dev/null
+++ b/content/donor-faq/20-why-do-you-ask-for-my-address/contents.lr
@@ -0,0 +1,11 @@
+key: 20
+---
+question: Why do you ask for my address and similar information?
+---
+answer:
+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.
diff --git a/content/donor-faq/21-why-is-there-a-minimum-donation/contents.lr b/content/donor-faq/21-why-is-there-a-minimum-donation/contents.lr
new file mode 100644
index 00000000..28aac5e8
--- /dev/null
+++ b/content/donor-faq/21-why-is-there-a-minimum-donation/contents.lr
@@ -0,0 +1,9 @@
+key: 21
+---
+question: Why is there a minimum donation?
+---
+answer:
+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 $2 minimum donation seems to deter them.
diff --git a/content/donor-faq/22-is-there-a-maximum-donation/contents.lr b/content/donor-faq/22-is-there-a-maximum-donation/contents.lr
new file mode 100644
index 00000000..e55732f1
--- /dev/null
+++ b/content/donor-faq/22-is-there-a-maximum-donation/contents.lr
@@ -0,0 +1,9 @@
+key: 22
+---
+question: Is there a maximum donation?
+---
+answer:
+Nope. 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.
diff --git a/content/donor-faq/23-i-want-my-donation-to-be-anonymous/contents.lr b/content/donor-faq/23-i-want-my-donation-to-be-anonymous/contents.lr
new file mode 100644
index 00000000..097d7cee
--- /dev/null
+++ b/content/donor-faq/23-i-want-my-donation-to-be-anonymous/contents.lr
@@ -0,0 +1,10 @@
+key: 23
+---
+question: If I want my donation to be anonymous, what is the best way for me to donate?
+---
+answer:
+You can donate by sending us a postal money order. You can donate via
+bitcoin or another cryptocurrency if you have it 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.
diff --git a/content/donor-faq/24-can-i-donate-by-mail/contents.lr b/content/donor-faq/24-can-i-donate-by-mail/contents.lr
new file mode 100644
index 00000000..dfd7c2b3
--- /dev/null
+++ b/content/donor-faq/24-can-i-donate-by-mail/contents.lr
@@ -0,0 +1,6 @@
+key: 24
+---
+question: Can I donate by mail?
+---
+answer:
+Yes. Our mailing address is **The Tor Project, 217 First Avenue South \#4903, Seattle WA 98194, USA.**
diff --git a/content/donor-faq/25-do-you-accept-cash-donations/contents.lr b/content/donor-faq/25-do-you-accept-cash-donations/contents.lr
new file mode 100644
index 00000000..08488cee
--- /dev/null
+++ b/content/donor-faq/25-do-you-accept-cash-donations/contents.lr
@@ -0,0 +1,6 @@
+key: 25
+---
+question: Do you accept cash donations?
+---
+answer:
+Yes.
diff --git a/content/donor-faq/26-can-i-donate-via-amazonsmile/contents.lr b/content/donor-faq/26-can-i-donate-via-amazonsmile/contents.lr
new file mode 100644
index 00000000..c360fdce
--- /dev/null
+++ b/content/donor-faq/26-can-i-donate-via-amazonsmile/contents.lr
@@ -0,0 +1,12 @@
+key: 26
+---
+question: Can I donate via AmazonSmile?
+---
+answer:
+Amazon Smile is a website operated by Amazon with the same products,
+prices, and shopping features as Amazon.com. The difference is that when
+you shop on Amazon Smile, the Amazon Smile Foundation will donate 0.5%
+of the purchase price of eligible products to the charitable
+organization of your choice.
+
+[Set up the Tor Project on Amazon Smile](https://smile.amazon.com/ch/20-8096820)
diff --git a/content/donor-faq/27-can-i-donate-via-giving-assistant/contents.lr b/content/donor-faq/27-can-i-donate-via-giving-assistant/contents.lr
new file mode 100644
index 00000000..7bae4d31
--- /dev/null
+++ b/content/donor-faq/27-can-i-donate-via-giving-assistant/contents.lr
@@ -0,0 +1,10 @@
+key: 27
+---
+question: Can I donate via Giving Assistant?
+---
+answer:
+Giving Assistant helps you donate a percentage of your cash back
+earnings to us with every purchase you make at 3,000+ popular online
+retailers.
+
+[Use Giving Assistant to save money and support the Tor Project](https://givingassistant.org/np#tor-project-inc)
diff --git a/content/donor-faq/28-can-i-make-a-stock-donation/contents.lr b/content/donor-faq/28-can-i-make-a-stock-donation/contents.lr
new file mode 100644
index 00000000..4398fcb0
--- /dev/null
+++ b/content/donor-faq/28-can-i-make-a-stock-donation/contents.lr
@@ -0,0 +1,19 @@
+key: 28
+---
+question: Can I make a stock donation?
+---
+answer:
+You can donate stock to the Tor Project. Please let us know in advance
+if you are transmitting securities via DTC by contacting us at
+giving(at)torproject.org.
+
+<p style="margin: 1em;">
+Brokerage Firm: Merrill Lynch, Pierce, Fenner & Smith, Inc.<br>
+Account Name: The Tor Project<br>
+Contact: Jeffrey K. Miller: 206.464.3564<br>
+E-mail: jeffrey.k.miller(at)ml.com<br>
+FAX: 206.388.4456<br>
+The Tor Project Account #: ***-*3016<br>
+DTC #: 8862<br>
+Tax ID #: 20-8096820
+</p>
diff --git a/content/donor-faq/29-is-tor-project-required-to-identify-me-as-a-donor/contents.lr b/content/donor-faq/29-is-tor-project-required-to-identify-me-as-a-donor/contents.lr
new file mode 100644
index 00000000..e78feb03
--- /dev/null
+++ b/content/donor-faq/29-is-tor-project-required-to-identify-me-as-a-donor/contents.lr
@@ -0,0 +1,12 @@
+key: 29
+---
+question: Is the Tor Project required to identify me as a donor to the United States government, or to any other authority?
+---
+answer:
+If you donate $20,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.
diff --git a/content/donor-faq/30-you-say-you-will-never-publicly-identify-me-as-a-donor/contents.lr b/content/donor-faq/30-you-say-you-will-never-publicly-identify-me-as-a-donor/contents.lr
new file mode 100644
index 00000000..d007e284
--- /dev/null
+++ b/content/donor-faq/30-you-say-you-will-never-publicly-identify-me-as-a-donor/contents.lr
@@ -0,0 +1,15 @@
+key: 30
+---
+question: In your privacy policy, you say you will never publicly identify me as a donor without my permission. What does that mean?
+---
+answer:
+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. If you talk about your donation on social
+media (and we appreciate you doing so!), we will take that to mean it's
+okay for us to engage with or amplify your post.
diff --git a/content/donor-faq/31-what-is-your-donor-privacy-policy/contents.lr b/content/donor-faq/31-what-is-your-donor-privacy-policy/contents.lr
new file mode 100644
index 00000000..1253b135
--- /dev/null
+++ b/content/donor-faq/31-what-is-your-donor-privacy-policy/contents.lr
@@ -0,0 +1,6 @@
+key: 31
+---
+question: What is your donor privacy policy?
+---
+answer:
+Here is the Tor Project [donor privacy policy](https://donate.torproject.org/privacy-policy).
diff --git a/content/donor-faq/32-what-is-your-refund-policy/contents.lr b/content/donor-faq/32-what-is-your-refund-policy/contents.lr
new file mode 100644
index 00000000..cf9cfe7b
--- /dev/null
+++ b/content/donor-faq/32-what-is-your-refund-policy/contents.lr
@@ -0,0 +1,12 @@
+key: 32
+---
+question: What is your refund policy?
+---
+answer:
+If you want your donation refunded, please tell us by emailing
+giving(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.
diff --git a/content/donor-faq/33-does-tor-project-accept-matching-donations/contents.lr b/content/donor-faq/33-does-tor-project-accept-matching-donations/contents.lr
new file mode 100644
index 00000000..94141b5b
--- /dev/null
+++ b/content/donor-faq/33-does-tor-project-accept-matching-donations/contents.lr
@@ -0,0 +1,11 @@
+key: 33
+---
+question: Does Tor Project accept matching donations?
+---
+answer:
+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. If you
+want help figuring out the process, write us at
+giving(at)torproject.org.
diff --git a/content/donor-faq/34-can-i-become-a-tor-project-member/contents.lr b/content/donor-faq/34-can-i-become-a-tor-project-member/contents.lr
new file mode 100644
index 00000000..9dc7fd05
--- /dev/null
+++ b/content/donor-faq/34-can-i-become-a-tor-project-member/contents.lr
@@ -0,0 +1,11 @@
+key: 34
+---
+question: Can I become a Tor Project member?
+---
+answer:
+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, [this is a
+good place to start](https://community.torproject.org/).
+We do have two giving programs - Champions of Privacy and Defenders of Privacy.
+Champions of Privacy donate $1,000 or more per year and enjoy special
+perks and access. Defenders of Privacy sign up to donate monthly and receive an exclusive patch.
diff --git a/content/donor-faq/35-how-can-i-get-a-tor-t-shirt-or-stickers/contents.lr b/content/donor-faq/35-how-can-i-get-a-tor-t-shirt-or-stickers/contents.lr
new file mode 100644
index 00000000..bccc70bf
--- /dev/null
+++ b/content/donor-faq/35-how-can-i-get-a-tor-t-shirt-or-stickers/contents.lr
@@ -0,0 +1,7 @@
+key: 35
+---
+question: How can I get a Tor t-shirt or stickers?
+---
+answer:
+A variety of thank-you gifts for donors, including t-shirts, hoodies and
+stickers, are presented on our main [donation page](https://donate.torproject.org/).
diff --git a/content/donor-faq/36-stay-in-touch-with-tor-project/contents.lr b/content/donor-faq/36-stay-in-touch-with-tor-project/contents.lr
new file mode 100644
index 00000000..75afa3df
--- /dev/null
+++ b/content/donor-faq/36-stay-in-touch-with-tor-project/contents.lr
@@ -0,0 +1,7 @@
+key: 36
+---
+question: If I want to stay in touch with the Tor Project, what's the best way for me to do that?
+---
+answer:
+You can sign up to receive [Tor News](https://newsletter.torproject.org/), read the
+[Tor Blog](https://blog.torproject.org/), or [follow us on Twitter](https://twitter.com/torproject).
diff --git a/content/donor-faq/37-does-the-tor-project-participate-in-the-combined-federal-campaign-program/contents.lr b/content/donor-faq/37-does-the-tor-project-participate-in-the-combined-federal-campaign-program/contents.lr
new file mode 100644
index 00000000..938569b5
--- /dev/null
+++ b/content/donor-faq/37-does-the-tor-project-participate-in-the-combined-federal-campaign-program/contents.lr
@@ -0,0 +1,10 @@
+key: 37
+---
+question: Does the Tor Project participate in the Combined Federal Campaign program?
+---
+answer:
+Tor is set up to participate in the
+[King County Employee Giving Program](https://www.kingcounty.gov/audience/employees/giving.aspx).
+Tor doesn't currently participate in the Federal 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.
diff --git a/content/donor-faq/38-can-i-donate-my-airline-miles/contents.lr b/content/donor-faq/38-can-i-donate-my-airline-miles/contents.lr
new file mode 100644
index 00000000..8acf19c1
--- /dev/null
+++ b/content/donor-faq/38-can-i-donate-my-airline-miles/contents.lr
@@ -0,0 +1,7 @@
+key: 38
+---
+question: Can I donate my airline miles, flight vouchers, or hotel points?
+---
+answer:
+No, sorry. We would like to accept your miles, vouchers and hotel
+points, and in the future we may be able to.
diff --git a/content/donor-faq/39-can-i-donate-hardware/contents.lr b/content/donor-faq/39-can-i-donate-hardware/contents.lr
new file mode 100644
index 00000000..da7a3113
--- /dev/null
+++ b/content/donor-faq/39-can-i-donate-hardware/contents.lr
@@ -0,0 +1,8 @@
+key: 39
+---
+question: Can I donate hardware?
+---
+answer:
+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 giving(at)torproject.org.
diff --git a/content/donor-faq/40-can-i-donate-my-time/contents.lr b/content/donor-faq/40-can-i-donate-my-time/contents.lr
new file mode 100644
index 00000000..dc5beea4
--- /dev/null
+++ b/content/donor-faq/40-can-i-donate-my-time/contents.lr
@@ -0,0 +1,6 @@
+key: 40
+---
+question: Can I donate my time?
+---
+answer:
+Yes. Here's a [list of areas where we would love your help](https://community.torproject.org/).
diff --git a/content/donor-faq/41-i-would-like-my-company-to-support-tor/contents.lr b/content/donor-faq/41-i-would-like-my-company-to-support-tor/contents.lr
new file mode 100644
index 00000000..0e718196
--- /dev/null
+++ b/content/donor-faq/41-i-would-like-my-company-to-support-tor/contents.lr
@@ -0,0 +1,12 @@
+key: 41
+---
+question: I would like my company to support Tor. What can we do to help?
+---
+answer:
+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
+[operate a Tor relay](https://community.torproject.org/relay/). If
+your company sells cloud services, perhaps it could donate these to Tor:
+We use them in some anti-censorship projects.
diff --git a/content/donor-faq/42-can-i-recommend-a-new-donation-method-to-you/contents.lr b/content/donor-faq/42-can-i-recommend-a-new-donation-method-to-you/contents.lr
new file mode 100644
index 00000000..d8e61e40
--- /dev/null
+++ b/content/donor-faq/42-can-i-recommend-a-new-donation-method-to-you/contents.lr
@@ -0,0 +1,6 @@
+key: 42
+---
+question: You don't support my preferred way to donate. Can I recommend a new donation method to you?
+---
+answer:
+Sure. Just mail us at giving(at)torproject.org.
diff --git a/content/donor-faq/43-will-the-tor-project-accept-donations-from-anybody/contents.lr b/content/donor-faq/43-will-the-tor-project-accept-donations-from-anybody/contents.lr
new file mode 100644
index 00000000..bd6edcf7
--- /dev/null
+++ b/content/donor-faq/43-will-the-tor-project-accept-donations-from-anybody/contents.lr
@@ -0,0 +1,8 @@
+key: 43
+---
+question: Will the Tor Project accept donations from anybody, or do you reserve the right to reject support from specific organizations or individuals?
+---
+answer:
+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.
diff --git a/content/donor-faq/44-i-have-more-questions-how-can-i-get-answers/contents.lr b/content/donor-faq/44-i-have-more-questions-how-can-i-get-answers/contents.lr
new file mode 100644
index 00000000..03d67db8
--- /dev/null
+++ b/content/donor-faq/44-i-have-more-questions-how-can-i-get-answers/contents.lr
@@ -0,0 +1,8 @@
+key: 44
+---
+question: I have more questions. How can I get answers?
+---
+answer:
+Feel free to send questions to frontdesk(at)rt.torproject.org. We will
+try to answer you, and we'll also post your question (and the answer)
+here.
diff --git a/content/donor-faq/contents.lr b/content/donor-faq/contents.lr
index ecdd955f..2bfbc85d 100644
--- a/content/donor-faq/contents.lr
+++ b/content/donor-faq/contents.lr
@@ -1,6 +1,6 @@
-_model: donate-page
+_model: donor-faq
---
-_template: donate-empty.html
+_template: donor-faq.html
---
section_id: donate
---
@@ -12,240 +12,3 @@ title: donor-faq
---
body:
-<div class="fixed-width">
- <div class="donor-faq">
- <div class="preamble">
- <p>
- If your question isn’t answered below, email <span class="email">frontdesk(at)rt.torproject.org</span> with general Tor inquiries, or <span class="email">giving(at)torproject.org</span> with donor-specific questions.
- </p>
- </div>
- <ol class="questions">
- <li>
- <h2 class="question">How else can I donate to the Tor Project?</h2>
- <p class="answer">Note: if you wish to donate to the Tor Project by <a class="hyperlinks links" href="https://2019.www.torproject.org/donate/donate.html.en" target="_blank">credit card or PayPal, please click here.</a></p>
- <p class="answer">The Tor Project also offers the following alternative donation methods:</p>
- <ul class="answer">
- <li><a class="hyperlinks links" href="../cryptocurrency" target="_blank">Bitcoin and Other Cryptocurrencies</a></li>
- <li><a class="hyperlinks links" href="../cryptocurrency" target="_blank">BTCPayServer</a></li>
- <li><a class="hyperlinks links" href="https://twitter.com/torproject/status/1196820407950741520" target="_blank">BottlePay</a></li>
- <li><a class="hyperlinks links" href="https://smile.amazon.com/ch/20-8096820" target="_blank">Amazon Smile</a></li>
- <li><a class="hyperlinks links" href="https://givingassistant.org/np#tor-project-inc" target="_blank">Giving Assistant</a></li>
- <li><a class="hyperlinks links" href="../donor-faq#eu-bank-transfer">EU Bank Transfer</a></li>
- <li><a class="hyperlinks links" href="../donor-faq#donate-by-mail">Checks</a> or <a class="hyperlinks links" href="../donor-faq#donate-anonymous">Money Orders</a></a></li>
- <li><a class="hyperlinks links" href="../donor-faq#donate-stock">Stock Donation</a></li>
- </ul>
- <p class="answer">If you have any questions or would like to receive a thank-you gift after making a donation with one of the methods above, please email <span class="email">giving(at)torproject.org</span>.</p>
- </li>
- <li>
- <h2 class="question">What is the Tor Project and what does it do?</h2>
- <p class="answer">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 <a href="https://www.torproject.org/download/download-easy.html.en" target="_blank">Tor Browser</a>, which enables people to browse the internet anonymously. The Tor Project is a 501(c)3 tax-exempt non-profit organization. It was founded in 2006.</p>
- </li>
- <li>
- <h2 class="question">Who works for the Tor Project, and what do they do?</h2>
- <p class="answer">Thousands of 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 47 people in total. You can read about the core contributors to the Tor Project on our <a class="hyperlinks" target="_blank" href="https://www.torproject.org/about/corepeople.html.en"><span class="links">Core People page</span></a>.</p> </li>
- <li>
- <h2 class="question">Who uses Tor?</h2>
- <p class="answer">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>
- </li>
- <li>
- <h2 class="question">Can anyone use Tor?</h2>
- <p class="answer">Yes! Tor is free, and anyone can use it. To get started, you will need to <a class="hyperlinks links" target="_blank" href="https://www.torproject.org/projects/torbrowser.html.en"><span class="links">download Tor Browser</span></a>. We offer instructions on how to download for <a class="hyperlinks links" target="_blank" href="https://www.torproject.org/projects/torbrowser.html.en#windows">Windows</a>, <a class="hyperlinks links" target="_blank" href="https://www.torproject.org/projects/torbrowser.html.en#macosx">Mac OS X</a>, <a class="hyperlinks links" target="_blank" href="https://www.torproject.org/projects/torbrowser.html.en#linux">Linux</a>, and <a class="hyperlinks links" target="_blank" href="https://www.torproject.org/download/#android">Android</a>.</p>
- </li>
- <li>
- <h2 class="question">What kinds of people support Tor?</h2>
- <p class="answer">All kinds of people. Thousands of individuals have donated to support the Tor Project, and we have also received funding from <a class="hyperlinks links" href="https://www.torproject.org/about/sponsors/" target="_blank">a wide range of organizations</a> 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 Open Technology Fund. People also support Tor in non-financial ways, for example by <a class="hyperlinks links" href="https://community.torproject.org/relay/" target="_blank">running Tor relays</a> to help carry traffic for other users. 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 i
dentify any single individual.</p>
- </li>
- <li>
- <h2 class="question">How does the Tor software work to protect people's anonymity?</h2>
- <p class="answer">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. <a class="hyperlinks links" href="https://youtu.be/JWII85UlzKw" target="_blank">Watch this video</a> to learn more about how Tor works.</a>
- </p>
- </li>
- <li>
- <h2 class="question">I would like to know more about how Tor works, what onion services are, or how to run a relay.</h2>
- <p class="answer"><a class="hyperlinks links" target="_blank" href="https://support.torproject.org/faq/">This Tor Project FAQ</a> has answers to all those questions, and more.</p>
- </li>
- <li>
- <h2 class="question">Does the Tor software work?</h2>
- <p class="answer">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 class="hyperlinks links" target="_blank" href="https://www.eff.org/deeplinks/2014/07/7-things-you-should-know-about-tor">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>
- </li>
- <li>
- <h2 class="question">Is what Tor does legal? Can I get in trouble for using it?</h2>
- <p class="answer">Downloading 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 on the <a class="hyperlinks links" target="_blank" href="https://community.torproject.org/relay/community-resources/eff-tor-legal-fa…">EFF Legal FAQ</a>.</p>
- </li>
- <li>
- <h2 class="question">Where can I find out more about the Tor Project, especially financial information?</h2>
- <p class="answer">Here are the Tor Project's <a class="hyperlinks links" target="_blank" href="https://www.torproject.org/about/financials.html.en">financial statements and its Form 990</a>.</p>
- </li>
- <li>
- <h2 class="question">Where does the Tor Project's money come from?</h2>
- <p class="answer">Tor is supported by United States government funding agencies, NGOs, private foundations, research institutions, private companies, and over 20,000 personal donations from people like you. (See our <a class="hyperlinks links single-link" target="_blank" href="https://www.torproject.org/about/sponsors">Sponsors Page</a> for more.) While we are grateful for this funding, we don't want the Tor Project to become too dependent on any single source. Crowdfunding allows us to diversify our donor base and 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>
- </li>
- <li>
- <h2 class="question">How much money does the Tor Project spend annually, and what is it used for?</h2>
- <p class="answer">The Tor Project spends about $5 million annually. About 80% of the Tor Project's spending goes to 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>
- </li>
- <li>
- <h2 class="question">Is my donation tax-deductible?</h2>
- <p class="answer">If you pay taxes in the United States, your donation to Tor is tax deductible to the full extent required by law. Following is information you may need for reporting purposes:</p>
- <p class="answer" style="margin: 1em;">
- <b>Tor Project Tax ID Number (EIN #):</b> 20-8096820<br>
- <b>Address:</b><br>
- The Tor Project, Inc.<br>
- 217 First Avenue South #4903<br>
- Seattle, WA 98194<br>
- <b>Phone number:</b> 206-420-3136<br>
- <b>Contact person:</b> Isabela Bagueros, Executive Director<br></p>
- <p id="eu-bank-transfer" class="answer" style="margin: 1em;"">For European bank transfers, we have an arrangement with the Renewable Freedom Foundation to provide tax-deductible donations for Europeans. They will issue a donation receipt <a href="https://renewablefreedom.org/contact/" target="_blank" class="hyperlinks links">upon request</a>. The account information is as follows:</p>
- <p class="answer" style="margin: 1em;"><b>Renewable Freedom Foundation</b><br>
- IBAN: DE17721500000053693701<br>
- BIC: BYLADEM1ING<br>
- Sparkasse Ingolstadt<br>
- Rathausplatz 6<br>
- 85049 Ingolstadt</p>
- </li>
- <li>
- <h2 class="question">If I am not in the United States, can I still donate?</h2>
- <p class="answer">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>
- </li>
- <li>
- <h2 class="question">It's important to me that my donation be tax-deductible, but I don't pay taxes in the United States.</h2>
- <p class="answer">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 the future. Or, if you are in Germany, France, or Sweden, these organizations support the Tor network and may be able to offer you tax-deductibility for your donation.</p>
- <p class="answer"><a href="https://www.torservers.net/" target="_blank" class="hyperlinks links">torservers.net</a> is a German charitable non-profit that runs a wide variety of exit relays worldwide. They also like donations of bandwidth from ISPs.</p>
- <p class="answer"><a href="https://www.noisebridge.net/wiki/Noisebridge_Tor" target="_blank" class="hyperlinks links">Noisebridge</a> is a US-based 501(c)(3) non-profit that collects donations and turns them into more US-based exit relay capacity.</p>
- <p class="answer"><a href="https://nos-oignons.net/" target="_blank" class="hyperlinks links">Nos Oignons</a> is a French charitable non-profit that runs fast exit relays in France.</p>
- <p class="answer"><a href="https://www.dfri.se/donera/?lang=en" target="_blank" class="hyperlinks links">DFRI</a> is a Swedish non-profit running exit relays.</p>
- <p class="answer">These organizations are not the same as <a href="https://www.torproject.org" target="_blank" class="hyperlinks links">The Tor Project, Inc</a>, but we consider that a good thing. They're run by nice people who are part of the Tor community.</p>
- </li>
- <li>
- <h2 class="question">Can I donate to a specific project, or restrict my donation to a particular purpose?</h2>
- <p class="answer">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>
- </li>
- <li>
- <h2 class="question">Can I donate while using Tor Browser?</h2>
- <p class="answer">Yes! In our testing, donation works via Tor Browser. If you run into problems, please contact <span class="email">giving(at)torproject.org</span>.</p>
- <p class="answer">For users logging in to Paypal: some people had no problem donating via PayPal while using Tor Browser. Some users experience issues because PayPal limits the number of times an IP address can be used in a certain period of time. This is to prevent fraud from card testers. If you run into an issue, please try again. Unfortunately, when we are receiving a high volume of donations, you might need to use a different browser.</p>
- </li>
- <li>
- <h2 class="question">How can I donate via debit or credit card?</h2>
- <p class="answer">To donate using a major credit card or debit card (VISA, MasterCard, Discover or American Express) or via PayPal, please visit our <a class="hyperlinks links" href="../">donate page</a>.</p>
- </li>
- <li>
- <h2 class="question">Why do you ask for my address and similar information?</h2>
- <p class="answer">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>
- </li>
- <li>
- <h2 class="question">Why is there a minimum donation?</h2>
- <p class="answer">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 $2 minimum donation seems to deter them.</p>
- </li>
- <li>
- <h2 class="question">Is there a maximum donation?</h2>
- <p class="answer">Nope. 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>
- </li>
- <li id="donate-anonymous">
- <h2 class="question">If I want my donation to be anonymous, what is the best way for me to donate?</h2>
- <p class="answer">You can donate by sending us a postal money order. You can donate via bitcoin or another cryptocurrency if you have it 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>
- </li>
- <li id="donate-by-mail">
- <h2 class="question">Can I donate by mail?</h2>
- <p class="answer">Yes. Our mailing address is <b>The Tor Project, 217 First Avenue South #4903, Seattle WA 98194, USA</b>.</p>
- </li>
- <li>
- <h2 class="question">Do you accept cash donations?</h2>
- <p class="answer">Yes.</p>
- </li>
- <li>
- <h2 class="question">Can I donate via AmazonSmile?</h2>
- <p class="answer">Amazon Smile is a website operated by Amazon with the same products, prices, and shopping features as Amazon.com. The difference is that when you shop on Amazon Smile, the Amazon Smile Foundation will donate 0.5% of the purchase price of eligible products to the charitable organization of your choice.</p>
- <p class="answer"><a href="https://smile.amazon.com/ch/20-8096820" target="_blank" class="hyperlinks links">Set up the Tor Project on Amazon Smile</a></p>
- </li>
- <li>
- <h2 class="question">Can I donate via Giving Assistant?</h2>
- <p class="answer">Giving Assistant helps you donate a percentage of your cash back earnings to us with every purchase you make at 3,000+ popular online retailers.</p>
- <p class="answer"><a href="https://givingassistant.org/np#tor-project-inc" target="_blank" class="hyperlinks links">Use Giving Assistant to save money and support the Tor Project</a></p>
- </li>
- <li id="donate-stock">
- <h2 class="question">Can I make a stock donation?</h2>
- <p class="answer">You can donate stock to the Tor Project. Please let us know in advance if you are transmitting securities via DTC by contacting us at <span class="email">giving(at)torproject.org</span>.</p>
- <p class="answer" style="margin: 1em;">Brokerage Firm: Merrill Lynch, Pierce, Fenner & Smith, Inc.<br>
- Account Name: The Tor Project<br>
- Contact: Jeffrey K. Miller: 206.464.3564<br>
- E-mail: <span class="email">jeffrey.k.miller(at)ml.com</span><br>
- FAX: 206.388.4456<br>
- The Tor Project Account #: ***-*3016<br>
- DTC #: 8862<br>
- Tax ID #: 20-8096820</p>
- </li>
- <li>
- <h2 class="question">Is the Tor Project required to identify me as a donor to the United States government, or to any other authority?</h2>
- <p class="answer">If you donate $20,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.</p>
- </li>
- <li>
- <h2 class="question">In your privacy policy, you say you will never publicly identify me as a donor without my permission. What does that mean?</h2>
- <p class="answer">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. If you talk about your donation on social media (and we appreciate you doing so!), we will take that to mean it's okay for us to engage with or amplify your post.</p>
- </li>
- <li>
- <h2 class="question">What is your donor privacy policy?</h2>
- <p class="answer">Here is the Tor Project <a class="hyperlinks links" target="_blank" href="../privacy-policy">donor privacy policy</a>.</p>
- </li>
- <li>
- <h2 class="question">What is your refund policy?</h2>
- <p class="answer">If you want your donation refunded, please tell us by emailing <span class="email">giving(at)torproject.org</span>. 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>
- </li>
- <li>
- <h2 class="question">Does Tor Project accept matching donations?</h2>
- <p class="answer">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. If you want help figuring out the process, write us at <span class="email">giving(at)torproject.org</a>.</p>
- </li>
- <li>
- <h2 class="question">Can I become a Tor Project member?</h2>
- <p class="answer">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 class="hyperlinks links" target="_blank" href="https://community.torproject.org">this is a good place to start</a>. We do have two giving programs - Champions of Privacy and Defenders of Privacy. Champions of Privacy donate $1,000 or more per year and enjoy special perks and access. Defenders of Privacy sign up to donate monthly and receive an exclusive patch.</p>
- </li>
- <li>
- <h2 class="question">How can I get a Tor t-shirt or stickers?</h2>
- <p class="answer">A variety of thank-you gifts for donors, including t-shirts, hoodies and stickers, are presented on our main <a class="hyperlinks links" href="../">donation page</a>.</p>
- </li>
- <li>
- <h2 class="question">If I want to stay in touch with the Tor Project, what's the best way for me to do that?</h2>
- <p class="answer">You can sign up to receive <a class="hyperlinks links" target="_blank" href="https://newsletter.torproject.org/">Tor News</a>, read the <a class="hyperlinks links" target="_blank" href="https://blog.torproject.org/">Tor Blog</a>, or <a class="hyperlinks links" target="_blank" href="https://twitter.com/torproject">follow us on Twitter</a>.</p>
- </li>
- <li>
- <h2 class="question">Does the Tor Project participate in the Combined Federal Campaign program?</h2>
- <p class="answer">Tor is set up to participate in the <a href="https://www.kingcounty.gov/audience/employees/giving.aspx" target="_blank" class="hyperlinks links">King County Employee Giving Program</a>. Tor doesn't currently participate in the Federal 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>
- </li>
- <li>
- <h2 class="question">Can I donate my airline miles, flight vouchers, or hotel points?</h2>
- <p class="answer">No, sorry. We would like to accept your miles, vouchers and hotel points, and in the future we may be able to.</p>
- </li>
- <li>
- <h2 class="question">Can I donate hardware?</h2>
- <p class="answer">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 <span class="email">giving(at)torproject.org</span>.</p>
- </li>
- <li>
- <h2 class="question">Can I donate my time?</h2>
- <p class="answer">Yes. Here's a <a class="hyperlinks links" target="_blank" href="https://community.torproject.org">list of areas where we would love your help</a>.</p>
- </li>
- <li>
- <h2 class="question">I would like my company to support Tor. What can we do to help?</h2>
- <p class="answer">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 class="hyperlinks links" target="_blank" href="https://community.torproject.org/relay/">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>
- </li>
- <li>
- <h2 class="question">You don't support my preferred way to donate. Can I recommend a new donation method to you?</h2>
- <p class="answer">Sure. Just mail us at <span class="email">giving(at)torproject.org</span></a>.</p>
- </li>
- <li>
- <h2 class="question">Will the Tor Project accept donations from anybody, or do you reserve the right to reject support from specific organizations or individuals?</h2>
- <p class="answer">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>
- </li>
- <li>
- <h2 class="question">I have more questions. How can I get answers?</h2>
- <p class="answer">Feel free to send questions to <span class="email">frontdesk(at)rt.torproject.org</span>. We will try to answer you, and we'll also post your question (and the answer) here.</p>
- </li>
- </ol>
- <hr/>
- <div class="button-line">
- <a class="purple button" href="../state-disclosures">State Registration Disclosures</a>
- </div>
- <div class="button-line">
- <a class="purple button" href="../">Back to Donate Page</a>
- </div>
- </div>
-</div>
diff --git a/models/donor-faq.ini b/models/donor-faq.ini
new file mode 100644
index 00000000..b8af0b97
--- /dev/null
+++ b/models/donor-faq.ini
@@ -0,0 +1,8 @@
+[model]
+name = Donor FAQ Question
+label = {{ this.title }}
+inherits = donate-page
+
+[children]
+model = donor-question
+order_by = key
\ No newline at end of file
diff --git a/models/donor-question.ini b/models/donor-question.ini
new file mode 100644
index 00000000..28f74750
--- /dev/null
+++ b/models/donor-question.ini
@@ -0,0 +1,16 @@
+[model]
+name = donor-question
+label = {{ this.question }}
+hidden = yes
+
+[fields.question]
+label = Question
+type = string
+
+[fields.answer]
+label = Answer
+type = markdown
+
+[fields.key]
+label = Key
+type = integer
diff --git a/templates/donate-empty.html b/templates/donate-empty.html
index 85d11b6a..1e423c3a 100644
--- a/templates/donate-empty.html
+++ b/templates/donate-empty.html
@@ -2,7 +2,7 @@
{% block content %}
<div class="donate-page">
<div class="donate-page-wrapper {{ this.page_type }}">
- {{ this.body }}
+ {% block donate_content %}{{ this.body }}{% endblock %}
</div>
</div>
{% endblock %}
diff --git a/templates/donor-faq.html b/templates/donor-faq.html
new file mode 100644
index 00000000..c88ed42c
--- /dev/null
+++ b/templates/donor-faq.html
@@ -0,0 +1,25 @@
+{% extends "donate-empty.html" %}
+{% block donate_content %}
+<div class="fixed-width">
+ <div class="donor-faq">
+ <div class="preamble">
+ <p>{{ this.preamble }}</p>
+ </div>
+ <ol class="questions">
+ {% for child in this.children %}
+ <li>
+ <h2 class="question">{{ child.question }}</h2>
+ <div class="answer">{{ child.answer }}</div>
+ </li>
+ {% endfor %}
+ </ol>
+ <hr/>
+ <div class="button-line">
+ <a class="purple button" href="../state-disclosures">State Registration Disclosures</a>
+ </div>
+ <div class="button-line">
+ <a class="purple button" href="../">Back to Donate Page</a>
+ </div>
+ </div>
+</div>
+{% endblock %}
diff --git a/templates/donor-question.html b/templates/donor-question.html
new file mode 100644
index 00000000..e69de29b
1
0

[donate-static/staging] Fix crypto page template not displaying crypto addresses
by kez@torproject.org 30 Jun '21
by kez@torproject.org 30 Jun '21
30 Jun '21
commit 2a45990cc2bdf5e12f6ee780e29829729045f669
Author: kez <kez(a)torproject.org>
Date: Tue Jun 29 15:24:51 2021 -0400
Fix crypto page template not displaying crypto addresses
---
content/cryptocurrency/contents.lr | 4 ++--
models/crypto-page.ini | 9 +++++++++
templates/cryptocurrency.html | 1 +
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/content/cryptocurrency/contents.lr b/content/cryptocurrency/contents.lr
index c49fd436..8b2d10e7 100644
--- a/content/cryptocurrency/contents.lr
+++ b/content/cryptocurrency/contents.lr
@@ -1,6 +1,6 @@
-_model: donate-page
+_model: crypto-page
---
-_template: donate-empty.html
+_template: cryptocurrency.html
---
title: Cryptocurrency
---
diff --git a/models/crypto-page.ini b/models/crypto-page.ini
new file mode 100644
index 00000000..4e4d7c84
--- /dev/null
+++ b/models/crypto-page.ini
@@ -0,0 +1,9 @@
+[model]
+name = Donate Page
+label = {{ this.title }}
+inherits = donate-page
+
+[fields.body]
+label = Body
+type = html
+translate = False
\ No newline at end of file
diff --git a/templates/cryptocurrency.html b/templates/cryptocurrency.html
index d0715784..c7a13d03 100644
--- a/templates/cryptocurrency.html
+++ b/templates/cryptocurrency.html
@@ -1,3 +1,4 @@
+{% extends "layout.html" %}
{% block content %}
<div class="cryptocurrency">
<div class="payment-other-div container">
1
0