Commit 9b2d179d authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

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

parents b9f6eb68 16e51724

src/config/torrc.minimal.in-staging

+1 −1
Original line number Original line Diff line number Diff line
@@ -224,4 +224,4 @@ 
## mechanisms like https://bridges.torproject.org/. If you want to run

## mechanisms like https://bridges.torproject.org/. If you want to run

## a private bridge, for example because you'll give out your bridge

## a private bridge, for example because you'll give out your bridge

## address manually to your friends, uncomment this line:

## address manually to your friends, uncomment this line:

#PublishServerDescriptor 0
 
#BridgeDistribution none

src/config/torrc.sample.in

+1 −1
Original line number Original line Diff line number Diff line
@@ -239,7 +239,7 @@ 
## mechanisms like https://bridges.torproject.org/. If you want to run

## mechanisms like https://bridges.torproject.org/. If you want to run

## a private bridge, for example because you'll give out your bridge

## a private bridge, for example because you'll give out your bridge

## address manually to your friends, uncomment this line:

## address manually to your friends, uncomment this line:

#PublishServerDescriptor 0

#BridgeDistribution none





## Configuration options can be imported from files or folders using the %include

## 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 

## option with the value being a path. This path can have wildcards. Wildcards are