diff options
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/torrc.minimal.in-staging | 12 | ||||
| -rw-r--r-- | src/config/torrc.sample.in | 19 |
2 files changed, 28 insertions, 3 deletions
diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging index c537c51f9b..90f91e5cb9 100644 --- a/src/config/torrc.minimal.in-staging +++ b/src/config/torrc.minimal.in-staging @@ -1,5 +1,5 @@ ## Configuration file for a typical Tor user -## Last updated 22 September 2015 for Tor 0.2.7.3-alpha. +## Last updated 22 December 2017 for Tor 0.3.2.8-rc. ## (may or may not work for much older or much newer versions of Tor.) ## ## Lines that begin with "## " try to explain what's going on. Lines @@ -132,6 +132,9 @@ ## spammers might also collect them. You may want to obscure the fact that ## it's an email address and/or generate a new address for this purpose. ## Notice that "<" and ">" are recommended. +## +## If you are running multiple relays, you MUST set this option. +## #ContactInfo Random Person <nobody AT example dot com> ## You might also include your PGP or GPG fingerprint if you have one. ## Use the full fingerprint, not just a (short) KeyID: KeyIDs are easy @@ -161,8 +164,15 @@ ## See https://www.torproject.org/docs/faq#MultipleRelays ## However, you should never include a bridge's fingerprint here, as it would ## break its concealability and potentially reveal its IP/TCP address. +## +## If you are running multiple relays, you MUST set this option. +## #MyFamily $keyid,$keyid,... +## Uncomment this if you want your relay to allow IPv6 exit traffic. +## (Relays only allow IPv4 exit traffic by default.) +#IPv6Exit 1 + ## A comma-separated list of exit policies. They're considered first ## to last, and the first match wins. ## diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 8f3597f3f6..4e183478eb 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -1,5 +1,5 @@ ## Configuration file for a typical Tor user -## Last updated 22 September 2015 for Tor 0.2.7.3-alpha. +## Last updated 22 December 2017 for Tor 0.3.2.8-rc. ## (may or may not work for much older or much newer versions of Tor.) ## ## Lines that begin with "## " try to explain what's going on. Lines @@ -96,7 +96,8 @@ ## If you have multiple network interfaces, you can specify one for ## outgoing traffic to use. ## OutboundBindAddressExit will be used for all exit traffic, while -## OutboundBindAddressOR will be used for all other connections. +## OutboundBindAddressOR will be used for all OR and Dir connections +## (DNS connections ignore OutboundBindAddress). ## If you do not wish to differentiate, use OutboundBindAddress to ## specify the same address for both in a single line. #OutboundBindAddressExit 10.0.0.4 @@ -135,6 +136,9 @@ ## descriptors containing these lines and that Google indexes them, so ## spammers might also collect them. You may want to obscure the fact that ## it's an email address and/or generate a new address for this purpose. +## +## If you are running multiple relays, you MUST set this option. +## #ContactInfo Random Person <nobody AT example dot com> ## You might also include your PGP or GPG fingerprint if you have one: #ContactInfo 0xFFFFFFFF Random Person <nobody AT example dot com> @@ -161,8 +165,19 @@ ## https://www.torproject.org/docs/faq#MultipleRelays ## However, you should never include a bridge's fingerprint here, as it would ## break its concealability and potentially reveal its IP/TCP address. +## +## If you are running multiple relays, you MUST set this option. +## #MyFamily $keyid,$keyid,... +## Uncomment this if you do *not* want your relay to allow any exit traffic. +## (Relays allow exit traffic by default.) +#ExitRelay 0 + +## Uncomment this if you want your relay to allow IPv6 exit traffic. +## (Relays only allow IPv4 exit traffic by default.) +#IPv6Exit 1 + ## A comma-separated list of exit policies. They're considered first ## to last, and the first match wins. ## |