summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2018-08-25 01:08:53 +1000
committerNick Mathewson <nickm@torproject.org>2018-08-24 12:05:29 -0400
commit3ebbc1c84d2daf2853a496d0c997ea7ee883d5e8 (patch)
treecb5c790102972d72f6466a7d195b55211b4fbb4a
parent4748fd23da9f833b50207915f605499b71b3f819 (diff)
downloadtor-3ebbc1c84d2daf2853a496d0c997ea7ee883d5e8.tar.gz
tor-3ebbc1c84d2daf2853a496d0c997ea7ee883d5e8.zip
Bootstrap: allow internal-only onion service networks to bootstrap
This fix requires chutney's 27230 fix to bridge client bootstrap. Part of 27236.
-rw-r--r--src/or/nodelist.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 07632861d1..392931d57d 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -2240,11 +2240,11 @@ compute_frac_paths_available(const networkstatus_t *consensus,
np,
nu);
- /* We need at least 1 exit usable in the consensus to consider
+ /* We need at least 1 exit (flag and policy) in the consensus to consider
* building exit paths */
/* Update our understanding of whether the consensus has exits */
consensus_path_type_t old_have_consensus_path = have_consensus_path;
- have_consensus_path = ((nu > 0) ?
+ have_consensus_path = ((np > 0) ?
CONSENSUS_PATH_EXIT :
CONSENSUS_PATH_INTERNAL);
@@ -2342,14 +2342,14 @@ compute_frac_paths_available(const networkstatus_t *consensus,
tor_asprintf(status_out,
"%d%% of guards bw, "
"%d%% of midpoint bw, and "
- "%d%% of exit bw%s = "
+ "%d%% of %s = "
"%d%% of path bw",
(int)(f_guard*100),
(int)(f_mid*100),
(int)(f_exit*100),
(router_have_consensus_path() == CONSENSUS_PATH_EXIT ?
- "" :
- " (no exits in consensus)"),
+ "exit bw" :
+ "end bw (no exits in consensus)"),
(int)(f_path*100));
return f_path;