From 5fb26ba2d8d96479a42b1ac286129351a0d09b92 Mon Sep 17 00:00:00 2001 From: teor Date: Fri, 22 Dec 2017 11:10:30 +1100 Subject: [PATCH 1/3] Document IPv6Exit in the sample torrcs Sample config-only change. Implements 24703. --- src/config/torrc.minimal.in-staging | 4 ++++ src/config/torrc.sample.in | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging index c537c51f9..223e559f1 100644 --- a/src/config/torrc.minimal.in-staging +++ b/src/config/torrc.minimal.in-staging @@ -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 8f3597f3f..47e4ef9eb 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -163,6 +163,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. ## From d10c2d66686180f774ae946e7dc65070dd33cac1 Mon Sep 17 00:00:00 2001 From: teor Date: Fri, 22 Dec 2017 11:22:10 +1100 Subject: [PATCH 2/3] Clarify the OutboundBindAddressOR documentation in the sample torrc Part of 22145 --- src/config/torrc.sample.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 47e4ef9eb..4728aff9b 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -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 From a8e8ce8602b688cdf411e372e1b7458c76344373 Mon Sep 17 00:00:00 2001 From: teor Date: Fri, 22 Dec 2017 11:22:48 +1100 Subject: [PATCH 3/3] Bump the dates and Tor versions on the sample torrcs --- src/config/torrc.minimal.in-staging | 2 +- src/config/torrc.sample.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging index 223e559f1..4fede6dcf 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 diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 4728aff9b..865e9f660 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