[tor-commits] [tor/main] Update torrc to encourage use of BridgeDistribution

[nickm at torproject.org]

commit 16e517245b764fa3a68e5ba398064ba28ddd4ac0
Author: Cecylia Bocovich <cohosh at torproject.org>
Date:   Tue Jul 6 13:09:24 2021 -0400

    Update torrc to encourage use of BridgeDistribution
    
    Bridge operators should generally publish their descriptors except for
    rare cases, and instead use the BridgeDistribution none setting to
    prevent their bridge from being distributed by BridgeDB.
---
 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 7f43cd324e..667ab294b4 100644
--- a/src/config/torrc.minimal.in-staging
+++ b/src/config/torrc.minimal.in-staging
@@ -224,4 +224,4 @@
 ## mechanisms like https://bridges.torproject.org/. If you want to run
 ## a private bridge, for example because you'll give out your bridge
 ## address manually to your friends, uncomment this line:
-#PublishServerDescriptor 0
+#BridgeDistribution none
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index 5d593871dd..edc30d043c 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -239,7 +239,7 @@
 ## mechanisms like https://bridges.torproject.org/. If you want to run
 ## a private bridge, for example because you'll give out your bridge
 ## address manually to your friends, uncomment this line:
-#PublishServerDescriptor 0
+#BridgeDistribution none
 
 ## Configuration options can be imported from files or folders using the %include
 ## option with the value being a path. This path can have wildcards. Wildcards are