From 5fb26ba2d8d96479a42b1ac286129351a0d09b92 Mon Sep 17 00:00:00 2001
From: teor <teor2345@gmail.com>
Date: Fri, 22 Dec 2017 11:10:30 +1100
Subject: [PATCH] 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 c537c51f9b..223e559f1d 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 8f3597f3f6..47e4ef9eb0 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.
 ##
-- 
GitLab