commit a061237a03aa63b3551459e172faf01ac611ce6d Author: gus <gus@torproject.org> Date: Tue Jul 21 16:17:20 2020 -0400 Change whitelist to allow, change blacklist to blocklist --- content/relay-operations/community-resources/bad-relays/contents.lr | 2 +- .../relay-operations/technical-setup/bridge/dragonflybsd/contents.lr | 2 +- content/relay-operations/technical-setup/bridge/freebsd/contents.lr | 2 +- content/relay-operations/technical-setup/bridge/netbsd/contents.lr | 2 +- content/relay-operations/types-of-relays/contents.lr | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/content/relay-operations/community-resources/bad-relays/contents.lr b/content/relay-operations/community-resources/bad-relays/contents.lr index 0a03c6f..13dcdc9 100644 --- a/content/relay-operations/community-resources/bad-relays/contents.lr +++ b/content/relay-operations/community-resources/bad-relays/contents.lr @@ -19,7 +19,7 @@ A bad relay is one that either doesn't work properly or tampers with our users' * Performing a [Sybil attack](https://en.wikipedia.org/wiki/Sybil_attack), which means flooding the network with new relays in an effort to deanonymize users. If you want to run multiple relays then that's great! But please be sure to set the [MyFamily parameter](https://www.torproject.org/docs/tor-manual.html.en#MyFamily). * Exit relays routing their exit traffic back into the tor network (not actually exiting any traffic) -Also, if your relay is stolen or goes missing, please report it as well, so we can blacklist it in case whoever took it puts it back online. +Also, if your relay is stolen or goes missing, please report it as well, so we can blocklist it in case whoever took it puts it back online. The following are currently permitted yet do have some discussion for prohibition (as such, they should not be reported at this time)... diff --git a/content/relay-operations/technical-setup/bridge/dragonflybsd/contents.lr b/content/relay-operations/technical-setup/bridge/dragonflybsd/contents.lr index b12ef7e..22d58ad 100644 --- a/content/relay-operations/technical-setup/bridge/dragonflybsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/dragonflybsd/contents.lr @@ -103,7 +103,7 @@ Don't forget to change the `ORPort`, `ServerTransportListenAddr`, `ContactInfo`, * Note that both Tor's OR port and its obfs4 port must be reachable. If your bridge is behind a firewall or NAT, make sure to open/forward both ports. You can use [our reachability test](https://bridges.torproject.org/scan/) to see if your obfs4 port is reachable from the Internet. -* Are you firewalling your DragonflyBSD? If so, make sure that `obfs4proxy` can talk to `tor` over the loopback interface - do not forget to whitelist the **ExtORPort**. +* Are you firewalling your DragonflyBSD? If so, make sure that `obfs4proxy` can talk to `tor` over the loopback interface - do not forget to allow the **ExtORPort**. ### 4. Start `tor`: diff --git a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr index 93f7aec..073fb68 100644 --- a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr @@ -54,7 +54,7 @@ Don't forget to change the `ORPort`, `ServerTransportListenAddr`, `ContactInfo`, * Note that both Tor's OR port and its obfs4 port must be reachable. If your bridge is behind a firewall or NAT, make sure to open both ports. You can use [our reachability test](https://bridges.torproject.org/scan/) to see if your obfs4 port is reachable from the Internet. -* Are you using FreeBSD's firewall with a "default deny" policy? If so, make sure that your obfs4proxy can talk to your Tor process over the loopback interface. Don't forget to whitelist Tor's `ExtORPort`. +* Are you using FreeBSD's firewall with a "default deny" policy? If so, make sure that your obfs4proxy can talk to your Tor process over the loopback interface. Don't forget to allow Tor's `ExtORPort`. ### 3. Ensure that the `random_id` sysctl setting is enabled: diff --git a/content/relay-operations/technical-setup/bridge/netbsd/contents.lr b/content/relay-operations/technical-setup/bridge/netbsd/contents.lr index 91eb156..a9799cd 100644 --- a/content/relay-operations/technical-setup/bridge/netbsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/netbsd/contents.lr @@ -60,7 +60,7 @@ Don't forget to change the `ORPort`, `ServerTransportListenAddr`, `ContactInfo`, * Note that both Tor's OR port and its obfs4 port must be reachable. If your bridge is behind a firewall or NAT, make sure to open/forward both ports. You can use [our reachability test](https://bridges.torproject.org/scan/) to see if your obfs4 port is reachable from the Internet. -* Are you firewalling your NetBSD? If so, make sure that `obfs4proxy` can talk to `tor` over the loopback interface - do not forget to whitelist the **ExtORPort**. +* Are you firewalling your NetBSD? If so, make sure that `obfs4proxy` can talk to `tor` over the loopback interface - do not forget to allow the **ExtORPort**. ### 3. Start `tor`: diff --git a/content/relay-operations/types-of-relays/contents.lr b/content/relay-operations/types-of-relays/contents.lr index dccab39..3dc30aa 100644 --- a/content/relay-operations/types-of-relays/contents.lr +++ b/content/relay-operations/types-of-relays/contents.lr @@ -55,7 +55,7 @@ If you are considering running an exit relay, please read the [section on legal # Bridge The design of the Tor network means that the IP address of Tor relays is public. -However, one of the ways Tor can be blocked by governments or ISPs is by blacklisting the IP addresses of these public Tor nodes. +However, one of the ways Tor can be blocked by governments or ISPs is by blocklisting the IP addresses of these public Tor nodes. Tor bridges are nodes in the network that are not listed in the public Tor directory, which make it harder for ISPs and governments to block them. Bridges are useful for Tor users under oppressive regimes or for people who want an extra layer of security because they're worried somebody will recognize that they are contacting a public Tor relay IP address.