commit 2f66f498aafc2df826acaba85346e0c83f5e5eaf
Author: Dimitris Apostolou <[email protected]>
Date: Tue Dec 15 23:12:44 2020 +0200
Fix typos
---
README.md | 4 ++--
content/gsoc/onion-toolbox/contents.lr | 4 ++--
content/gsoc/privacy-friendly-web/contents.lr | 2 +-
content/localization/becoming-tor-translator/contents.lr | 2 +-
content/onion-services/setup/install/contents.lr | 2 +-
content/relay-operations/community-resources/bad-relays/contents.lr | 2 +-
content/relay-operations/community-resources/contents.lr | 2 +-
.../community-resources/eff-tor-legal-faq/contents.lr | 2 +-
.../relay-operations/community-resources/good-bad-isps/contents.lr | 2 +-
.../community-resources/tor-abuse-templates/contents.lr | 4 ++--
.../community-resources/tor-exit-guidelines/contents.lr | 4 ++--
.../community-resources/tor-relay-universities/contents.lr | 2 +-
content/relay-operations/technical-setup/bridge/freebsd/contents.lr | 2 +-
13 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/README.md b/README.md
index fc5b24c..d0d917a 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ You can click ```Edit this page``` and submit your content
changes in a [Pull Re
```$ cd community/lego && git submodule update --init --recursive```
-5. Translations for the website are imported by Jenkins when bulding the page,
but if you want to test them, download the correct branch of the translations
repo to the ./i18n/ folder.
+5. Translations for the website are imported by Jenkins when building the
page, but if you want to test them, download the correct branch of the
translations repo to the ./i18n/ folder.
6. Finally:
@@ -75,7 +75,7 @@ This is the workflow that Tor Internal people should use when
making changes on
- Contents file, containing your changes where it would be located on the
**reviewer's repo**, e.g.
`https://gitlab.torproject.org/steph/community/blob/develop/content/onion-services/contents.lr`.
- For the review workflow, please see (Reviewer Workflow).
5. Once the work has been reviewed and any necessary changes and merge request
has been made, a repo maintainer or team members with write access to gitweb
master will then merge or cherry-pick these changes to master, following the
workflow outlined in [How to use our git
flow](https://gitlab.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#how-to-use-our-git-flow).
-6. Merger should then move the the ticket to the `Closed` column.
+6. Merger should then move the ticket to the `Closed` column.
### Reviewer Workflow
diff --git a/content/gsoc/onion-toolbox/contents.lr
b/content/gsoc/onion-toolbox/contents.lr
index 1d52e87..fa998f7 100644
--- a/content/gsoc/onion-toolbox/contents.lr
+++ b/content/gsoc/onion-toolbox/contents.lr
@@ -49,7 +49,7 @@ Ultimately myonion is about creating a better experience for
onion services deve
Myonion is a developer tool box, providing a command line interface and a GUI
to configure and deploy existing services via .onion. A minimal prototype for
myonion already [exists](https://github.com/hiromipaw/myonion).
-Someone that may want to run an onion service can use the myonion wrapper app
to start a .onion from their computer and sharea static website or a web
application.
+Someone that may want to run an onion service can use the myonion wrapper app
to start a .onion from their computer and share a static website or a web
application.
Myonion can also be used to deploy the resulting configured app to a defined
set of cloud providers.
@@ -57,7 +57,7 @@ Myonion provides a way to build and deploy onion ready
applications, allowing de
The experience for developers will be similar to using other industry
solutions, like the [Docker desktop
app](https://www.docker.com/products/docker-desktop).
-Developers using myonion are provided with pre-defined and customizable
application templates, with corresponding configuration and a test set,
eliminating error-prone manual setup and known onion service configuration
mistakes.
+Developers using myonion are provided with pre-defined and customizable
application templates, with corresponding configuration and a test set,
eliminating error-prone manual setup and known onion service configuration
mistakes.
The resulting application is therefore deployable via a set of endpoint
management tools to known providers. Providing a way to deploy onion services
at scale.
diff --git a/content/gsoc/privacy-friendly-web/contents.lr
b/content/gsoc/privacy-friendly-web/contents.lr
index 7ab642b..36cdd00 100644
--- a/content/gsoc/privacy-friendly-web/contents.lr
+++ b/content/gsoc/privacy-friendly-web/contents.lr
@@ -49,7 +49,7 @@ Websites can work seamlessly with the Tor Browser and other
privacy enhancing br
The Tor Browser is in fact, based on Mozilla's Extended Support Release (ESR)
Firefox branch. We have a series of patches against this browser to enhance
privacy and security. Browser behavior is additionally augmented through the
Torbutton extension, and we also change a number of Firefox preferences from
their defaults.
-The Tor Project has developed over the years a set of web development
guidelines that allow websites to work with security enhanced browsers without
causing any or minimal functionality destruption to their users. These
guidelines have been shaped in an internal styleguide that has been adopted
across all torproject.org websites.
+The Tor Project has developed over the years a set of web development
guidelines that allow websites to work with security enhanced browsers without
causing any or minimal functionality disruption to their users. These
guidelines have been shaped in an internal styleguide that has been adopted
across all torproject.org websites.
We are now formalizing these web development patterns and some security
concerns that need to be considered when developing websites for users surfing
the web with security enhanced browsers and tools. The scope of this project is
creating a open-source community-driven browsable list of patterns and release
a css/js framework that web developers can extend and use in their work.
diff --git a/content/localization/becoming-tor-translator/contents.lr
b/content/localization/becoming-tor-translator/contents.lr
index 9f5e07b..362df91 100644
--- a/content/localization/becoming-tor-translator/contents.lr
+++ b/content/localization/becoming-tor-translator/contents.lr
@@ -20,7 +20,7 @@ Thank you for your interest in helping us with translations.
# Localization mailing list
<a name="tor-l10n" />
-To communicate with other translators, please join the [Tor localization
mailing list](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-l10n),
where we organize translations, take decisions, report errors in source
strings, etc. Please introduce yourself and ask any questions you may have
after following up this instructions.
+To communicate with other translators, please join the [Tor localization
mailing list](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-l10n),
where we organize translations, take decisions, report errors in source
strings, etc. Please introduce yourself and ask any questions you may have
after following up these instructions.
# Translation platform
diff --git a/content/onion-services/setup/install/contents.lr
b/content/onion-services/setup/install/contents.lr
index 2796c55..6f12cc9 100644
--- a/content/onion-services/setup/install/contents.lr
+++ b/content/onion-services/setup/install/contents.lr
@@ -90,7 +90,7 @@ cost=100
### Installing Tor from source
-1. Download latest release and dependecies
+1. Download latest release and dependencies
The latest release of Tor can be found on the
[download](https://www.torproject.org/download/tor/) page.
diff --git
a/content/relay-operations/community-resources/bad-relays/contents.lr
b/content/relay-operations/community-resources/bad-relays/contents.lr
index 520a40d..4de7718 100644
--- a/content/relay-operations/community-resources/bad-relays/contents.lr
+++ b/content/relay-operations/community-resources/bad-relays/contents.lr
@@ -49,7 +49,7 @@ We have three types of flags we can apply:
Which we use depends on the severity of the issue, and if it can still be
safely used in certain situations.
-### My relays was given the BadExit flag. What's up?
+### My relay was given the BadExit flag. What's up?
In just about all cases we're unable to contact the operator to resolve the
issue, so if your relay has been flagged as a BadExit then please let us know
(see above for contact info) so we can work together to fix the issue.
diff --git a/content/relay-operations/community-resources/contents.lr
b/content/relay-operations/community-resources/contents.lr
index f2e2f0e..392fbfa 100644
--- a/content/relay-operations/community-resources/contents.lr
+++ b/content/relay-operations/community-resources/contents.lr
@@ -33,7 +33,7 @@ Also see the [Tor Exit Guidelines](tor-exit-guidelines).
Operators can put together their own abuse complaint template responses from
one of many templates that Tor has created: [Tor Abuse
Templates](tor-abuse-templates).
-It is important to respond to abuse complaints in a timely manner (usually
within 24 hours). If the hoster gets annoyed by the amount of abuse you can
reduce the amount of ports allowed in your exit policy.
+It is important to respond to abuse complaints in a timely manner (usually
within 24 hours). If the hoster gets annoyed by the amount of abuse you can
reduce the amount of ports allowed in your exit policy.
Please document your experience with new hosters on the following page:
[GoodBadISPs](good-bad-isps)
Other docs we like:
diff --git
a/content/relay-operations/community-resources/eff-tor-legal-faq/contents.lr
b/content/relay-operations/community-resources/eff-tor-legal-faq/contents.lr
index 1a9ba2c..a50fdd8 100644
--- a/content/relay-operations/community-resources/eff-tor-legal-faq/contents.lr
+++ b/content/relay-operations/community-resources/eff-tor-legal-faq/contents.lr
@@ -136,7 +136,7 @@ For information on what to do if law enforcement seeks
access to your digital de
EFF has written a [short template](tor-dmca-response) to help you write a
response to your ISP, university, etc., to let them know about the details of
the Digital Millennium Copyright Act's safe harbor, and how Tor fits in.
Note that template only refers to U.S. jurisdictions, and is intended only to
address copyright complaints that are based on a relay of allegedly infringing
material through the Tor node.
-If you like, you should consider submitting a copy of your notice to the Lumen
DatabaseThe email address for submissions is [email protected].
+If you like, you should consider submitting a copy of your notice to the Lumen
Database. The email address for submissions is [email protected].
This will help us recognize trends and issues that the lawyers might want to
focus on.
Lumen encourages submissions from people outside the United States too.
diff --git
a/content/relay-operations/community-resources/good-bad-isps/contents.lr
b/content/relay-operations/community-resources/good-bad-isps/contents.lr
index 98eca4c..54e6759 100644
--- a/content/relay-operations/community-resources/good-bad-isps/contents.lr
+++ b/content/relay-operations/community-resources/good-bad-isps/contents.lr
@@ -32,7 +32,7 @@ For network diversity and stronger anonymity, you should
avoid providers and cou
|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------|
| [UPC Austria GmbH](https://www.upc.at/) | - | - | Yes | Yes | (ISP) does not
care what their customers do at all (unless you have a business connection) |
12/2011 |
| [Silver Server GmbH](http://sil.at/) | - | -| Yes | Yes | Forwards abuse.
Hosts already some big exit/entry nodes which seem to have no problems. Very
expensive traffic. | 12/2011 |
-| [Tele2 Austria GmbH](https://tele2.at/) | - | - | Yes | Yes | Forwards abuse
at business connections, good quality traffic, does not like "proxys" on
private lines. Cheap synchronous (SDSL) connections. | 12/2011 |
+| [Tele2 Austria GmbH](https://tele2.at/) | - | - | Yes | Yes | Forwards abuse
at business connections, good quality traffic, does not like "proxies" on
private lines. Cheap synchronous (SDSL) connections. | 12/2011 |
| [A1(former Telekom Austria)](http://a1.net) | - | - | Yes | No | Does not
like Abuse (in any form) at all. Seems to give out customer data at alleged
abuse. Not recommended but cheap. | 12/2011 |
| [xpirio GmbH](http://xpirio.at) | - | - | Yes | ? | In general rather
relaxed at all services, but better get in touch with their (very
understanding) support when you expect abuse. | 12/2011 |
diff --git
a/content/relay-operations/community-resources/tor-abuse-templates/contents.lr
b/content/relay-operations/community-resources/tor-abuse-templates/contents.lr
index a590159..483cb2c 100644
---
a/content/relay-operations/community-resources/tor-abuse-templates/contents.lr
+++
b/content/relay-operations/community-resources/tor-abuse-templates/contents.lr
@@ -92,7 +92,7 @@ We're sorry your site is experiencing this heavy load from
Tor.
However, it is possible that your rate limiting alarms simply experienced a
false positive due to the amount of traffic that flows through the router.
We provide service to almost a gigabit of traffic per second, 98% of which is
web traffic.
-If the attack is real and ongoing, however, the Tor project provides an
automated DNSRBL for you to query to block login attempts coming
+If the attack is real and ongoing, however, the Tor project provides an
automated DNSRBL for you to query to block login attempts coming
from Tor nodes: https://www.torproject.org/projects/tordnsel.html.en
It is also possible to download a list of all Tor exit IPs that will connect
to your server port:
@@ -103,7 +103,7 @@ In general however, we believe that problems like this are
best solved by improv
Scraping and robot activity can be reduced/slowed by captchas, which is the
approach taken by Gmail for this same problem.
In fact, Google provides a free captcha service, complete with code for easy
inclusion in a number of systems to help other sites deal with this issue:
https://code.google.com/apis/recaptcha/intro.html
-Slow DoS attacks [aimed to consume the Apache MaxClients
limit](http://www.guerilla-ciso.com/archives/2049) can be alleviated by
reducing the httpd.conf TimeOut and KeepAliveTimeout config values to 15-30 and
raising the ServerLimit and MaxClients values to omething like 3000.
+Slow DoS attacks [aimed to consume the Apache MaxClients
limit](http://www.guerilla-ciso.com/archives/2049) can be alleviated by
reducing the httpd.conf TimeOut and KeepAliveTimeout config values to 15-30 and
raising the ServerLimit and MaxClients values to something like 3000.
If this fails, DoS attempts can also be solved with iptables-based rate
limiting solutions, load balancers such as nginx, and also IPS devices, but be
aware that Internet traffic is not always uniform in quantity by IP, due to
large corporate and even national outproxies, NATs, and services like Tor.
http://kevin.vanzonneveld.net/techblog/article/block_brute_force_attacks_with_iptables/
diff --git
a/content/relay-operations/community-resources/tor-exit-guidelines/contents.lr
b/content/relay-operations/community-resources/tor-exit-guidelines/contents.lr
index 7ad8ffd..61e4084 100644
---
a/content/relay-operations/community-resources/tor-exit-guidelines/contents.lr
+++
b/content/relay-operations/community-resources/tor-exit-guidelines/contents.lr
@@ -39,7 +39,7 @@ Once you identified your ISP, you can follow the two-step
advice of TorServers.n
2. If they come back positively, ask them if they are OK with an IP range
reassignment.
If not, you can still explain that you are a non-profit superb large
organization filled with security professionals, and that all will be good, and
why IP reassignment helps reduce their workload.
-The two-step process usually helps in elevating your request to higher levels
of support staff without scaring them off too early, even if you don't end up
with your own IP range. Here is template you can use:
[Inquiry](https://www.torservers.net/wiki/hoster/inquiry)
+The two-step process usually helps in elevating your request to higher levels
of support staff without scaring them off too early, even if you don't end up
with your own IP range. Here is template you can use:
[Inquiry](https://www.torservers.net/wiki/hoster/inquiry)
## Legal
@@ -134,7 +134,7 @@ A simple notice can be published without a separate
webserver using Tor's "DirPo
* Disk encryption might be useful to protect your node keys, but on the other
hand unencrypted machines are easier to "audit" if required. We feel it's best
to be able to easily show that you do Tor exiting, and nothing else (on that IP
or server).
-* Set reverse DNS to something that signals its use, e.g. 'anonymous-relay',
'proxy', 'tor-proxy'. so when other people see the address in their web logs,
they will more quickly understand what's going on.
+* Set reverse DNS to something that signals its use, e.g. 'anonymous-relay',
'proxy', 'tor-proxy'. So when other people see the address in their web logs,
they will more quickly understand what's going on.
If you do, and if SMTP is allowed in your exit policy, consider configuring
[SPF](https://en.wikipedia.org/wiki/Sender_Policy_Framework) on your domain:
this will protect you from users using your exit node to forge e-mails which
look like they come from you.
---
html: two-columns-page.html
diff --git
a/content/relay-operations/community-resources/tor-relay-universities/contents.lr
b/content/relay-operations/community-resources/tor-relay-universities/contents.lr
index 5d57cac..6fa5dc9 100644
---
a/content/relay-operations/community-resources/tor-relay-universities/contents.lr
+++
b/content/relay-operations/community-resources/tor-relay-universities/contents.lr
@@ -19,7 +19,7 @@ Most likely it is ambiguously worded, to let them allow or
deny things based on
But it might be extremely restrictive ("no services of any kind"), in which
case you're going to have a tough road ahead of you.
* Second, learn about your local laws with respect to liability of traffic
that exits from your Tor relay.
-In the US, these appear to be mainly the
[DMCA](/relay/community-resources/eff-tor-legal-faq/) and
[CDA](/relay/community-resources/eff-tor-legal-faq/), and the good news is
that many lawyers believe that Tor exit node operators are in the same boat as
the ISPs themselves.
+In the US, these appear to be mainly the
[DMCA](/relay/community-resources/eff-tor-legal-faq/) and
[CDA](/relay/community-resources/eff-tor-legal-faq/), and the good news is that
many lawyers believe that Tor exit node operators are in the same boat as the
ISPs themselves.
Become familiar with [the EFF's template letter regarding DMCA notices for
Tor](/relay/community-resources/eff-tor-legal-faq/tor-dmca-response/), which is
quite clear about not putting liability on service providers.
The CDA is less clear, because it was written before the modern Internet
emerged, but EFF and ACLU are optimistic.
Of course, you need to understand that without actual clear precedent (and
even then), it's still possible that a given judge will not interpret things
the way the lawyers expect.
diff --git
a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr
b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr
index 28ed6ba..e1cef75 100644
--- a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr
@@ -85,7 +85,7 @@ To confirm your bridge is running with no issues, you should
see something like
```
-### 6. To get the fastest package updates, switch from the "quarterly"
package repo to the "latest" repo.
+### 6. To get the fastest package updates, switch from the "quarterly" package
repo to the "latest" repo.
Create the following folder:
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
