Commit 12ad99d0 authored by juga's avatar juga
Browse files

Merge branch 'bug28870'

parents c38cf733 ca463e5e

sbws/core/scanner.py

+2 −1
Original line number Diff line number Diff line
@@ -164,7 +164,8 @@ def _pick_ideal_second_hop(relay, dest, rl, cont, is_exit): 
                len(new_candidates), min_bw_factor, relay.nickname,

                chosen.nickname, chosen.consensus_bandwidth)

            return chosen

    candidates = sorted(candidates, key=lambda r: r.bandwidth, reverse=True)

    candidates = sorted(candidates, key=lambda r: r.consensus_bandwidth,

                        reverse=True)

    chosen = candidates[0]

    log.debug(

        'Didn\'t find any 2nd hops at least as fast as %s (bw=%s). It\'s '

sbws/lib/relaylist.py

+2 −4
Original line number Diff line number Diff line
@@ -42,14 +42,12 @@ class Relay: 
    def _from_desc(self, attr):

        if not self._desc:

            return None

        assert hasattr(self._desc, attr)

        return getattr(self._desc, attr)

        return getattr(self._desc, attr, None)



    def _from_ns(self, attr):

        if not self._ns:

            return None

        assert hasattr(self._ns, attr)

        return getattr(self._ns, attr)

        return getattr(self._ns, attr, None)



    @property

    def nickname(self):