commit 63988be2f1deb6f1e9317c2667bde416f040f329 Author: David Fifield david@bamsoftware.com Date: Fri Sep 20 22:26:24 2013 -0700

I think of these params as switched. --- facilitator/facilitator | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/facilitator/facilitator b/facilitator/facilitator index 21a9572..89312b7 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -55,7 +55,7 @@ class options(object): return num_relays

@staticmethod - def add_relay(transport, addr): + def add_relay(addr, transport): options.relays.setdefault(transport, []) options.relays[transport].append(fac.format_addr(addr))

@@ -477,7 +477,7 @@ def handle_relay_file(fname): raise ValueError("Wrong line format: %s" % line)

addr = fac.parse_addr_spec(words_list[1], defport = DEFAULT_RELAY_PORT, resolve = True) - options.add_relay(parse_transport_chain(words_list[0]), addr) + options.add_relay(addr, parse_transport_chain(words_list[0]))

def main(): opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:p:r:",