Merge branch 'master' into v1

README.md

@@ -5,6 +5,7 @@ Because friends don't let friends localhost™
 | Sponsored by [ppl](https://ppl.family)
 | **Telebit Remote**
 | [Telebit Relay](https://git.coolaj86.com/coolaj86/telebit-relay.js)
+| [sclient](https://telebit.cloud/sclient)
 |
 
 <img align="center" src="https://git.coolaj86.com/coolaj86/telebit.js/raw/branch/master/usr/share/docs/terminal-example-1.png">

bin/telebit.js

@@ -166,7 +166,7 @@ function askForConfig(state, mainCb) {
         });
       }
 
-      if (state.config.relay) { checkRelay(); return; }
+      if (state.config.relay) { checkRelay(state.config.relay); return; }
       console.info("");
       console.info("");
       console.info("What relay will you be using? (press enter for default)");

lib/remote.js

@@ -323,6 +323,7 @@ function _connect(state) {
     }
 
   , onconnection: function (tun) {
+      console.log("[debug] got connection event");
       var cid = tun._id = Packer.addrToId(tun);
 
       // this data should have been gathered already as part of the proxy protocol
@@ -352,7 +353,7 @@ function _connect(state) {
       handled = clientHandlers.write(cid, tun);
 
       // quasi backwards compat
-      if (!handled) { clientHandlers.onconnection(tun); }
+      if (!handled) { console.log("[debug] did not get connection event"); packerHandlers.onconnection(tun); }
     }
 
   , onpause: function (opts) {