diff options
| -rw-r--r-- | changes/bug20591 | 3 | ||||
| -rw-r--r-- | src/or/networkstatus.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug20591 b/changes/bug20591 new file mode 100644 index 0000000000..deaa738f5e --- /dev/null +++ b/changes/bug20591 @@ -0,0 +1,3 @@ + o Minor bugfixes (relay bootstrap): + - Ensure relays don't make multiple connections during bootstrap. + Fixes bug 20591; bugfix on 0.2.8.1-alpha. diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 49baeb83b7..a6656f5596 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -880,7 +880,7 @@ update_consensus_networkstatus_downloads(time_t now) resource = networkstatus_get_flavor_name(i); /* Check if we already have enough connections in progress */ - if (we_are_bootstrapping) { + if (we_are_bootstrapping && use_multi_conn) { max_in_progress_conns = options->ClientBootstrapConsensusMaxInProgressTries; } |