despair d26141d433 Merge branch 'dev' into reeeee-divergence ... ok hope this works -rick # Conflicts: # .gitignore # .vscode/settings.json # include/llarp/service/context.hpp # llarp/dns.cpp # llarp/dnsc.cpp # llarp/ev.cpp # llarp/ev.hpp # llarp/ev_win32.hpp # llarp/net.cpp # llarp/router.cpp # llarp/router.hpp # llarp/service/context.cpp		2018-12-03 12:24:56 -06:00
..
llarp	Merge branch 'dev' into reeeee-divergence	2018-12-03 12:24:56 -06:00
tl	Merge branch 'master' of https://github.com/loki-project/loki-network	2018-11-26 15:54:52 +00:00
llarp.h	fix crash on premature close of event loop (also make format)	2018-12-02 13:07:07 -05:00
llarp.hpp	fix crash on premature close of event loop (also make format)	2018-12-02 13:07:07 -05:00
tuntap.h	Merge branch 'dev' into reeeee-divergence	2018-12-03 12:24:56 -06:00
utp_types.h	strip extra unneeded code from libutp	2018-09-19 20:39:45 -05:00
utp.h	implement utp link protocol	2018-09-04 08:41:25 -04:00