tor

commit 9b2d179d9537b2f3e3275d22f014cf7385349553
parent b9f6eb68d999a72704b7fa686eda88b602049e37
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu,  8 Jul 2021 14:17:54 -0400

Merge remote-tracking branch 'tor-gitlab/mr/410'

Diffstat:
M
src/config/torrc.minimal.in-staging
 | 
2
+-
M
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
@@ -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
@@ -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