commit 622231ce2e3abc033172d5c82df7fb6bfd374db0 Merge: b1d0fa04f 7a5896d5d Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 24 12:44:46 2018 -0400

Merge remote-tracking branch 'teor/bug27237'

changes/bug27237 | 4 ++++ src/feature/nodelist/nodelist.c | 11 ++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-)

diff --cc src/feature/nodelist/nodelist.c index a0f068cf9,07edc5aba..d6bc47448 --- a/src/feature/nodelist/nodelist.c +++ b/src/feature/nodelist/nodelist.c @@@ -2399,8 -2383,8 +2404,8 @@@ compute_frac_paths_available(const netw (int)(f_mid*100), (int)(f_exit*100), (router_have_consensus_path() == CONSENSUS_PATH_EXIT ? - "" : - " (no exits in consensus, using mid)"), + "exit bw" : - "end bw (no exits in consensus)"), ++ "end bw (no exits in consensus, using mid)"), (int)(f_path*100));

return f_path;