commit 8633713a88f661c70820dd69af61472ba877a8e4 Author: teor teor2345@gmail.com Date: Fri Feb 24 11:21:35 2017 +1100

Don't set DirPort on bridge relays

Closes #17088. --- torrc_templates/bridge.tmpl | 7 +++++-- torrc_templates/relay-non-dir.tmpl | 17 +++++++++++++++++ torrc_templates/relay-non-exit.tmpl | 18 +----------------- 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/torrc_templates/bridge.tmpl b/torrc_templates/bridge.tmpl index 34c7f14..e33cb48 100644 --- a/torrc_templates/bridge.tmpl +++ b/torrc_templates/bridge.tmpl @@ -1,4 +1,7 @@ -${include:relay-non-exit.tmpl} +${include:relay-non-dir.tmpl}

BridgeRelay 1 -ExitPolicy reject *:* +# Bridges don't have a DirPort +DirPort 0 +# Nor do we have GEOIP files in any reliable location +BridgeRecordUsageByCountry 0 diff --git a/torrc_templates/relay-non-dir.tmpl b/torrc_templates/relay-non-dir.tmpl new file mode 100644 index 0000000..b2899f7 --- /dev/null +++ b/torrc_templates/relay-non-dir.tmpl @@ -0,0 +1,17 @@ +${include:common.i} +SocksPort 0 +OrPort $orport +Address $ip + +# Must be included before exit-v{4,6}.i +ExitRelay 0 + +#NOTE: Setting TestingServerConsensusDownloadSchedule doesn't +# help -- dl_stats.schedule is not DL_SCHED_CONSENSUS +# at boostrap time. +# Try to download after: +# the minimum initial consensus time to start with, +# a few eager fetches, +# then half the minimum testing consensus interval +TestingServerDownloadSchedule 0, 5 +TestingServerConsensusDownloadSchedule 0, 5 diff --git a/torrc_templates/relay-non-exit.tmpl b/torrc_templates/relay-non-exit.tmpl index b19b155..00e3b0a 100644 --- a/torrc_templates/relay-non-exit.tmpl +++ b/torrc_templates/relay-non-exit.tmpl @@ -1,18 +1,2 @@ -${include:common.i} -SocksPort 0 -OrPort $orport -Address $ip +${include:relay-non-dir.tmpl} DirPort $dirport - -# Must be included before exit-v{4,6}.i -ExitRelay 0 - -#NOTE: Setting TestingServerConsensusDownloadSchedule doesn't -# help -- dl_stats.schedule is not DL_SCHED_CONSENSUS -# at boostrap time. -# Try to download after: -# the minimum initial consensus time to start with, -# a few eager fetches, -# then half the minimum testing consensus interval -TestingServerDownloadSchedule 0, 5 -TestingServerConsensusDownloadSchedule 0, 5