diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-01-02 14:42:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-01-02 14:42:31 -0500 |
| commit | 99b4f868332b3ae304e669240657994022d69991 (patch) | |
| tree | ff62159bc99cad7642101073f6c24bc53b02d714 | |
| parent | fd46d8d0ad9e976cdae7676e9f27f572b78ac959 (diff) | |
| parent | 2aa1767b25e6b2b04892696c4c00e0257feb3812 (diff) | |
| download | tor-99b4f868332b3ae304e669240657994022d69991.tar.gz tor-99b4f868332b3ae304e669240657994022d69991.zip | |
Merge branch 'maint-0.3.2' into release-0.3.2
| -rw-r--r-- | src/config/torrc.minimal.in-staging | 6 | ||||
| -rw-r--r-- | src/config/torrc.sample.in | 13 |
2 files changed, 16 insertions, 3 deletions
diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging index c537c51f9b..4fede6dcf5 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 @@ -163,6 +163,10 @@ ## break its concealability and potentially reveal its IP/TCP address. #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..865e9f6606 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 @@ -163,6 +164,14 @@ ## break its concealability and potentially reveal its IP/TCP address. #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. ## |