Michael
89ae60cfab
llarp::Context uses AbstractRouter now
2019-02-22 16:21:05 +00:00
Jeff Becker
1a283c0176
try addressing issue #324
2019-02-22 11:18:53 -05:00
Michael
13a9f65520
Fully define interface for dht::Context
2019-02-22 15:08:08 +00:00
Jeff Becker
5642179019
publish retry on failure for introset publishing
2019-02-21 14:55:31 -05:00
Jeff Becker
a81a483cc2
build paths if we don't have enough
2019-02-21 14:26:59 -05:00
Jeff Becker
068b60221c
don't ever fail on dht messages
2019-02-21 13:34:10 -05:00
Jeff Becker
21ab744b17
build one path if we don't have a path for remote intro on send
2019-02-21 13:21:16 -05:00
Jeff Becker
c7e100787b
swap intros should only swap intros
2019-02-21 13:00:37 -05:00
Jeff Becker
eecc00211f
squash commits and make convotags more "reliable" (probably)
2019-02-21 12:47:35 -05:00
Jeff Becker
5dde4e6351
use source path's intro as being able to reply on convo tags
2019-02-21 12:46:08 -05:00
Jeff Becker
762728c7ec
fix
2019-02-21 12:13:27 -05:00
Jeff Becker
3baf89e8ce
more
2019-02-21 11:45:33 -05:00
Jeff Becker
262000570b
use source path's intro as being able to reply on convo tags
2019-02-21 11:21:41 -05:00
Michael
c6e6bdb90f
Fix for windows just being the Worst
2019-02-20 22:09:29 +00:00
Michael
4132f883a7
Make libabyss mandatory
2019-02-20 22:08:49 +00:00
Michael
de13ab3adc
Fix warning in bencode
2019-02-20 22:05:40 +00:00
Ryan Tharp
06af3ca95b
Merge pull request #332 from neuroscr/master
...
make macos 10.12 happy
2019-02-20 05:47:10 -08:00
Ryan Tharp
547cf96606
make macos 10.12 happy
2019-02-20 05:46:23 -08:00
Jeff Becker
b511242632
increment sequence number on good send only
2019-02-20 08:42:50 -05:00
Jeff
652d8cd036
Merge pull request #330 from majestrate/unfuck-dht
...
unbreak dht
2019-02-20 08:30:17 -05:00
Jeff Becker
b9a0531057
make dht work again ._.
2019-02-20 08:29:12 -05:00
Jeff Becker
ee95c1ed0c
make dht work again ._.
2019-02-20 08:28:35 -05:00
Jeff Becker
f67ffaf900
fix typo
2019-02-20 07:22:39 -05:00
Jeff Becker
7428855698
try fixing timeout bug after 6 or so hours
2019-02-20 07:09:18 -05:00
Jeff Becker
be30516986
use std::string for integers because i am tired of fixing formatting strings
2019-02-20 07:09:00 -05:00
Ryan Tharp
2b433f046d
Oh it was a typo
2019-02-19 16:13:16 -08:00
Ryan Tharp
8e000c8321
linux gcc 7.3 support
2019-02-19 16:10:19 -08:00
Ryan Tharp
f06b275193
make macos happy
2019-02-19 16:03:20 -08:00
Jeff Becker
6435951e86
Merge remote-tracking branch 'origin/staging' into staging
2019-02-19 17:16:56 -05:00
Ryan Tharp
413843bab1
Merge branch 'staging' into dev
2019-02-19 14:10:35 -08:00
Jeff
9ddc74fc3f
Merge pull request #317 from neuroscr/master
...
Fix undefined behaviors and misaligned member access / macos compile fix
2019-02-19 17:09:56 -05:00
Jeff Becker
b1dd10c007
fix previous commit
2019-02-19 12:04:06 -05:00
Jeff Becker
393e70dfa6
publish new introset on path death
2019-02-19 11:58:58 -05:00
Jeff Becker
591f3c92a9
make build records smaller
2019-02-19 10:06:39 -05:00
Jeff Becker
41bb83aaba
more
2019-02-19 08:32:26 -05:00
Rick V
5a3947ca5c
clang-format
2019-02-18 17:58:12 -06:00
Rick V
0f45e286ff
XXX: the inline string_view constructors *should* be harmless on pre-C++17 platforms...
...
fix windows build
2019-02-18 17:50:04 -06:00
Jeff Becker
445ed05b32
make format
2019-02-18 14:44:41 -05:00
Jeff
f941025d7c
Merge pull request #319 from majestrate/staging
...
Staging
2019-02-18 07:09:55 -05:00
Jeff Becker
dfbd878dfb
Merge remote-tracking branch 'origin/staging' into staging
2019-02-18 06:51:33 -05:00
Jeff Becker
a23a61717b
Merge remote-tracking branch 'origin/staging' into staging
2019-02-18 06:44:43 -05:00
Michael
887fb4ac62
Replace insert(make_pair()) with emplace()
2019-02-18 10:35:23 +00:00
Ryan Tharp
f247a3623c
So lu on linux gcc 7.3 but llu everywhere else?
2019-02-18 02:13:42 -08:00
Ryan Tharp
25d00e2974
Merge remote-tracking branch 'origin/master'
2019-02-18 02:00:36 -08:00
Ryan Tharp
ad91071633
Fix undefined behaviors and misaligned member access
2019-02-18 01:59:33 -08:00
Ryan Tharp
8e51d3a491
fix linux gcc 7.3 error (warning)
2019-02-18 09:39:18 +00:00
Jeff Becker
8d96c0945e
Merge remote-tracking branch 'origin/staging' into staging
2019-02-17 17:02:01 -05:00
Jeff
bbbad826ef
Merge pull request #316 from michael-loki:buffer_obj
...
Convert llarp_buffer_t to be a class with methods
2019-02-17 16:59:31 -05:00
Jeff Becker
90507337ce
compute number of connected routers
2019-02-17 16:08:14 -05:00
Michael
a00d6afc5e
Convert llarp_buffer_t to be a class with methods
2019-02-17 13:09:48 +00:00
Michael
a0125ffe86
Move abyss/json to llarp/util/json
2019-02-15 23:43:26 +00:00
Jeff Becker
b5a1637224
make shared lib compile
2019-02-15 17:55:52 -05:00
Jeff Becker
1d958d95de
* make rpc compile right
...
* make link sessions introspectable
* make utp write buffers fully flush each tick
2019-02-15 17:19:19 -05:00
Michael
90373b806c
Fix log tag after cmake changes
2019-02-15 20:49:10 +00:00
Jeff
cdc19c52fa
Merge branch 'staging' into abstract_router_replacement
2019-02-15 12:10:18 -05:00
Jeff
03b8f1429e
Merge pull request #311 from majestrate/staging
...
Staging
2019-02-15 08:48:32 -05:00
Jeff Becker
22b63fba38
close and shutdown utp socket on timeout
2019-02-15 08:45:56 -05:00
Michael
048fa83c39
Finish replacement of Router with AbstractRouter
2019-02-14 22:31:31 +00:00
Jeff
a204d7c42e
Merge pull request #309 from majestrate/staging
...
Staging
2019-02-14 08:50:25 -05:00
Jeff Becker
550fc3c439
Revert "tweaking handover logic"
...
This reverts commit 50bfe5d810
.
2019-02-14 08:49:07 -05:00
Michael
ebf2800c3f
Fixup windows
2019-02-14 00:22:21 +00:00
Jeff Becker
50bfe5d810
tweaking handover logic
2019-02-12 09:24:36 -05:00
Jeff Becker
1921704b78
tweak timeout
2019-02-12 07:41:13 -05:00
Michael
2997b38e35
Fixup after rebase
2019-02-12 10:24:43 +00:00
Ryan Tharp
1114ba1295
fix staging
2019-02-12 01:28:12 +00:00
Michael
656843e9a3
Fix issues on debian
2019-02-12 01:19:38 +00:00
Michael
1aeacb0043
Refactor CMakeLists into distinct directories
2019-02-12 01:19:37 +00:00
Ryan Tharp
d17383aba6
Merge branch 'cmake_refactor' of https://github.com/michael-loki/loki-network
2019-02-12 00:54:18 +00:00
Michael
4fc582af96
Fix annoying typo
2019-02-12 00:33:19 +00:00
Ryan Tharp
420a52c4ea
linux gcc 7.3 fix
2019-02-11 23:40:36 +00:00
Jeff Becker
24de7f052a
make outbound port configurable on runtime
2019-02-11 13:40:20 -05:00
Jeff
555711b70d
Merge pull request #303 from michael-loki/no_new
...
Replace usage of new/delete with unique_ptr/stack allocation
2019-02-11 13:38:06 -05:00
Jeff Becker
62c200c6fa
disable rc expiration
2019-02-11 12:26:52 -05:00
Jeff Becker
46222df421
refactor
2019-02-11 12:14:43 -05:00
Michael
8dc4ffbae7
Use forward_list over list
2019-02-11 16:38:56 +00:00
Michael
67b5d48095
Replace usage of new/delete with unique_ptr/stack allocation
2019-02-11 16:24:05 +00:00
Michael
057365d40c
Fix issues on debian
2019-02-11 00:02:20 +00:00
Michael
3b3926a0ea
Refactor CMakeLists into distinct directories
2019-02-09 16:30:29 +00:00
Jeff Becker
05cd1b7f8e
extract more status info for outbound context
2019-02-09 10:39:39 -05:00
Jeff Becker
1a929f9383
send control messages if too quiet to keep convotags alive as needed
2019-02-09 10:26:20 -05:00
Jeff Becker
9a2f11a212
try expiring convos
2019-02-09 09:37:24 -05:00
Jeff Becker
6df133cab2
remove dead sessions when done
2019-02-09 09:15:54 -05:00
Jeff Becker
e1fceb3636
fix it (again)
2019-02-08 17:44:21 -05:00
Jeff Becker
66753430ad
fix it
2019-02-08 16:29:56 -05:00
Jeff Becker
e1522faeaa
add introspection rpc endpoint
2019-02-08 14:43:25 -05:00
Jeff Becker
6fa10019d0
testnet tweak
2019-02-08 09:12:31 -05:00
Jeff Becker
e24b595191
more dht fixing, only pick the most up to date entity for reply
2019-02-08 08:42:12 -05:00
Jeff Becker
d7f715c632
don't send more than 1 introset in reply
2019-02-08 08:21:55 -05:00
Jeff Becker
871a10b38b
Merge branch 'staging' of ssh://github.com/majestrate/loki-network into staging
2019-02-08 08:05:29 -05:00
Jeff Becker
27ce591f52
add note
2019-02-08 08:05:09 -05:00
Jeff Becker
2dfb53ef13
prevent deadlock
2019-02-08 08:04:12 -05:00
Jeff
f0dc5f2b48
unbreak build
2019-02-07 18:04:28 -05:00
Jeff
0f777d822b
Merge branch 'staging' of ssh://github.com/majestrate/loki-network into staging
2019-02-07 17:49:29 -05:00
Jeff
ba8313e57e
limit replies on introset lookup, pick newest
2019-02-07 17:48:41 -05:00
Jeff Becker
faf8149502
make testnet ini files work
2019-02-07 09:35:02 -05:00
Jeff Becker
2f656de767
take in public-ip as parameter in addition to public-address
2019-02-07 09:30:43 -05:00
Jeff Becker
32ecf64c57
fix testnet
2019-02-07 09:27:28 -05:00
Jeff Becker
10f9d6444d
actually insert entries when they exist
2019-02-07 07:40:44 -05:00
Jeff Becker
fae2b1a444
make it compile on debian and ubuntu
2019-02-07 07:31:14 -05:00
Jeff Becker
914c9566b8
Merge remote-tracking branch 'origin/staging' into staging
2019-02-07 07:28:24 -05:00
Jeff Becker
d5caec719f
make it compile
2019-02-07 07:25:22 -05:00
Jeff Becker
cff6bc1c8d
don't hang
2019-02-07 07:23:02 -05:00
Jeff
1369c3b23c
Merge pull request #283 from despair86/dev
...
more windows fixes
2019-02-06 21:10:30 -05:00
Rick V
4c19f562f0
A compromise for C++17 ports.
...
Remove abseil build config for such targets.
Include headers (which should fall through by definition).
Macintosh can go fuck itself.
2019-02-06 19:53:15 -06:00
Rick V
72d0720da0
use c++17 stl on windows
...
While the absl:: namespace is aliased to std:: in a
standard win32 build, it also needlessly adds the
library to the build process, only to discard most
of it at link time. This also makes the distinction
between Abseil STL and G++ STL more explicit, to avoid
some forms of confusion.
From the product page:
"...We think not: if you look at the preprocessor conditional
structure in our string_view.h you'll see that we are trying
to identify whether your C++ installation has std::string_view.
If you do, absl::string_view is defined only as an alias to the
standard type. If you don't, you get a C++11/C++14 compatible
implementation of the type. This means you can adopt Abseil,
and for types we are b you can use the type from the absl
namespace. As soon as your project is built with the appropriate
compiler/standard library version, we'll fall away and leave you
with the standard type, albeit spelled funny. Better: as soon as
you know that your project will only build with the appropriate
language version you can run tools that we will provide to change
the places that refer to absl::string_view to spell it std::string_view
-- since those are the same type, this is safe to do, even across
API boundaries.
So, one reason you might want to adopt Abseil: early access to facilities
from upcoming C++ standard library releases, with a clear migration path."
2019-02-06 19:53:14 -06:00
Rick V
8800cee785
fix crash on exit
2019-02-06 19:53:13 -06:00
Rick V
ea7301fecf
finally unfuck windows bits
2019-02-06 19:53:12 -06:00
Rick V
69189214e0
rebase on current upstream staging
2019-02-06 19:53:12 -06:00
Rick V
3931b7d9d7
implement missing libabyss functionality
...
remove some finished TODOs
2019-02-06 19:53:11 -06:00
Rick V
d0448dfb64
finish moving event loop implementations out of headers
...
ok
ah so that was the mac build problem
2019-02-06 19:53:08 -06:00
Rick V
dd52f13c7c
turn off text translation on windows
...
(std::ios::binary does nothing on unix btw)
2019-02-06 19:53:07 -06:00
Michael
6d8d910aff
Refactor and add tests for bits.hpp
2019-02-07 00:23:22 +00:00
Jeff
4c4f3faf83
Merge pull request #284 from michael-loki/abstract_router
...
Convert llarp::Router into an abstract base class
2019-02-06 19:09:31 -05:00
Jeff
d10ddd7afd
Merge remote-tracking branch 'github/staging' into staging
2019-02-06 11:39:55 -05:00
Jeff Becker
90e45a810a
limit number of concurrent dht lookups from dns to 4
2019-02-06 10:52:00 -05:00
Jeff Becker
f84256d554
* lower lookup timeout for introsets
...
* correct previous commit for dns stuff
* allow for multiple parallel introset lookups
2019-02-06 10:05:25 -05:00
Jeff Becker
2f369a3399
dont send latency tests while building
2019-02-06 08:51:05 -05:00
Jeff Becker
b40055181d
lower path build timeout to 15s
...
tweak various dns stuff
2019-02-06 08:02:17 -05:00
Michael
729cd045f1
Convert llarp::Router into an abstract base class
2019-02-06 09:59:47 +00:00
Ryan Tharp
5769e5c716
Merge pull request #259 from michael-loki/more_dht_tests
...
More dht tests
2019-02-05 14:06:29 -08:00
Ryan Tharp
8614911e17
Merge pull request #278 from majestrate/staging
...
lower utp fragment size by 512 bytes
2019-02-05 14:06:17 -08:00
Ryan Tharp
6446074881
Merge pull request #267 from michael-loki/abseil
...
Import abseil LTS 20181200
2019-02-05 14:06:02 -08:00
Michael
1ba6507a2f
Tests for dht::ServiceAddressLookup
2019-02-05 21:35:46 +00:00
Michael
b1213c7a7c
Tests for dht::TagLookup
2019-02-05 21:18:38 +00:00
Michael
24066ea9e0
Fix warning on macOS
2019-02-05 21:18:38 +00:00
Jeff Becker
5743ca7fba
revert dns behavior
2019-02-05 16:04:30 -05:00
Jeff Becker
be74589c41
remove logging
2019-02-05 13:44:14 -05:00
Jeff Becker
96006a061a
correct logging
2019-02-05 13:44:05 -05:00
Jeff Becker
b76a227897
call path built hook AFTER latency is confirmed
2019-02-05 13:43:55 -05:00
Jeff Becker
cd36d126d8
!!! breaking change !!!
...
half the utp fragment size
2019-02-05 10:07:57 -05:00
Jeff Becker
a953b34a45
fix crash
2019-02-05 10:06:53 -05:00
Jeff Becker
2c2b31f4b9
make it compile
2019-02-05 09:23:51 -05:00
Jeff Becker
25fa4817ba
hook mx records for all hooked domains
2019-02-05 09:22:02 -05:00
Jeff Becker
41c993a237
disable A records for random.snode, use CNAME queries instead.
2019-02-05 09:08:17 -05:00
Jeff Becker
8c77c53675
reply with cname
2019-02-05 09:03:38 -05:00
Jeff Becker
0bbd1ecbe4
fix previous commit
2019-02-05 08:42:57 -05:00
Jeff Becker
67282f03c0
disable recursion on nxdomain responses
2019-02-05 08:01:56 -05:00
Jeff Becker
5a33d2c84a
Merge remote-tracking branch 'origin/staging' into staging
2019-02-05 07:57:57 -05:00
Jeff Becker
804df24a87
remove stray semicolin
2019-02-05 07:56:41 -05:00
Jeff Becker
a7ff62f668
set dns flags correctly (probably)
2019-02-05 07:52:57 -05:00
Ryan Tharp
2bba8f01e8
don't return unknown IPs
2019-02-04 19:54:44 -08:00
Ryan Tharp
54549724d0
fix random.snode
2019-02-04 19:19:06 -08:00
Ryan Tharp
506a1f8ae6
Revert "fix scoping issue"
...
This reverts commit 93af0978a3
.
2019-02-04 16:43:37 -08:00
Ryan Tharp
4bf4faa956
make format
2019-02-04 16:41:33 -08:00
Ryan Tharp
fefb012bf8
fix llvm 3.8
2019-02-04 16:29:09 -08:00
Ryan Tharp
c442af02dc
Merge branch 'staging' of https://github.com/loki-project/loki-network
2019-02-05 00:02:21 +00:00
Jeff Becker
b7b346cc7c
make it compile
2019-02-04 18:18:43 -05:00
Jeff Becker
00eede9160
Merge remote-tracking branch 'origin/staging' into staging
2019-02-04 18:13:57 -05:00
Ryan Tharp
144b3f4ec3
Merge branch 'staging' of https://github.com/loki-project/loki-network
2019-02-04 23:04:38 +00:00
Michael
6055829df4
Remove tl::optional and use absl::optional always
2019-02-03 02:13:31 +00:00
Michael
7212baa062
Add implicit conversion from ManagedBuffer to llarp_buffer_t
2019-02-03 01:44:09 +00:00
Michael
7ca3e13e78
Rename to ManagedBuffer
2019-02-03 00:48:10 +00:00
Michael
47380ba64b
Simplify some code
2019-02-03 00:31:10 +00:00
Michael
6f0ce07571
Fix cause of issue with LinkLayerTest.TestUTPAliceConnectToBob
2019-02-02 23:22:41 +00:00
Michael
f3b0af9d2f
Create CopyableBuffer type
2019-02-02 23:21:35 +00:00
Michael
2de621b0ad
Disable copy constructing llarp_buffer_t
2019-02-01 01:58:13 +00:00
Jeff Becker
c31c8ce889
Merge remote-tracking branch 'origin/staging' into staging
2019-01-31 07:56:54 -05:00
Ryan Tharp
c64df4ba95
Merge branch 'staging' of https://github.com/loki-project/loki-network
2019-01-31 00:09:39 -08:00
Ryan Tharp
ed8df1dbcb
fix read/write order, so the read doesn't overwrite the data to be written
2019-01-31 00:07:00 -08:00
Ryan Tharp
9c37f1b9f2
Merge branch 'staging' of https://github.com/loki-project/loki-network
2019-01-31 00:00:04 -08:00
Ryan Tharp
c7e126a426
fix buffer overrun
2019-01-30 23:53:43 -08:00
Ryan Tharp
93af0978a3
fix scoping issue
2019-01-30 23:22:50 -08:00
Ryan Tharp
544f0812cc
fix MacOS build
2019-01-29 14:19:17 -08:00
Michael
e9f6ca339a
Fix minor warning
2019-01-29 22:08:51 +00:00
Ryan Tharp
1372d029f6
Merge branch 'staging' of https://github.com/loki-project/loki-network
2019-01-29 22:04:11 +00:00
Ryan Tharp
70a7481ab7
Merge pull request #245 from majestrate/abyss_rpc_update
...
update libabyss rpc endpoints for service nodes
2019-01-29 14:00:47 -08:00
Ryan Tharp
c3bf68b502
Merge branch 'staging' into dht_tests
2019-01-29 13:59:54 -08:00
Ryan Tharp
f20ac0f6e9
Merge branch 'staging' into crypto_interface
2019-01-29 13:59:05 -08:00
Ryan Tharp
07f536efad
Merge pull request #249 from majestrate/enable-xi
...
enable exit info serialization
2019-01-29 13:58:17 -08:00
Ryan Tharp
175fdbc89c
Merge pull request #250 from majestrate/add-localhost-loki
...
add initial localhost.loki handling in dns
2019-01-29 13:57:56 -08:00
Jeff Becker
88285de3af
save new onion key
2019-01-29 08:20:27 -05:00
Ryan Tharp
aa2ca6c8d5
Merge branch 'staging' of https://github.com/majestrate/loki-network
2019-01-29 13:05:47 +00:00
Jeff Becker
828f1f82d7
disable key rotation
2019-01-29 07:56:02 -05:00
Ryan Tharp
1a62382ce7
Merge branch 'staging' of https://github.com/majestrate/loki-network
2019-01-29 12:48:30 +00:00
Jeff Becker
fd507e4194
fix hop selection and disable onion key rotation
2019-01-29 07:34:07 -05:00
Ryan Tharp
e94a7b88e7
fix typo in log message
2019-01-29 03:49:02 -08:00
Ryan Tharp
2ac41a226f
delay autodetection to ev
2019-01-29 03:23:10 -08:00
Ryan Tharp
9b6008db1d
downgrade DNS server failure to a warning
2019-01-29 03:17:21 -08:00
Ryan Tharp
1b673c9afa
fix UX bug: don't always configured automatically
2019-01-29 03:12:21 -08:00
Ryan Tharp
ac2c1ad434
another build fix
2019-01-29 03:11:54 -08:00
Jeff Becker
9e50e2d34a
try fixing AAAA record handling, return NOERROR with no records.
2019-01-28 11:16:17 -05:00
Jeff Becker
7489ab1380
only hook cname for random.snode
2019-01-28 10:46:49 -05:00
Jeff Becker
f1cf63fce7
add initial localhost.loki handling in dns
2019-01-28 10:26:35 -05:00
Jeff Becker
4406ef9c9c
enable xi serialization
2019-01-28 08:52:18 -05:00
Jeff Becker
18c4107ff6
* wire up jsonrpc caller for lokid integration
...
* add jsonrpc caller http basic auth
2019-01-28 08:04:45 -05:00
Michael
f24f554a01
Convert llarp::Crypto into an abstract base class
2019-01-26 15:40:58 +00:00
Michael
4b25dd901b
Fix warning on macOS
2019-01-26 11:12:48 +00:00
Michael
1f95f1e78f
More unit tests of dht internals
2019-01-26 00:40:40 +00:00
Michael
3f320009d7
Introduce abstract class for dht::Context
2019-01-26 00:40:40 +00:00
Michael
40449df0f1
Split classes out of dht::Context
2019-01-26 00:40:40 +00:00
Ryan Tharp
5b5ea74c40
Merge pull request #246 from majestrate/fix-issue-233
...
Fix issue 233
2019-01-25 14:57:54 -08:00
Jeff Becker
e164970b00
make format
2019-01-24 10:14:54 -05:00
Jeff Becker
7bc0b5f82b
try addressing issue #233
2019-01-24 10:13:41 -05:00
Jeff Becker
519cec50ac
update libabyss rpc endpoints for service nodes
2019-01-24 08:55:44 -05:00
Jeff Becker
1e0d82848f
revert to use u instead of t for timestamp in RC for backwards compat reasons
2019-01-24 08:18:15 -05:00
Michael
9d0d3a4cc9
Fix build on darwin
2019-01-23 22:16:21 +00:00
Michael
f4e0cb2d4b
Import latest gtest from upstream - commit 569fba4d742b67753b5374b6686170afb74acb0c
2019-01-23 22:16:21 +00:00
Jeff
832ad942aa
Merge pull request #237 from despair86/dev
...
separate header and implementation
2019-01-23 15:27:19 -05:00
Jeff Becker
cbfbdc506d
Merge branch 'staging' of ssh://github.com/loki-project/loki-network into staging
2019-01-23 12:33:00 -05:00
Jeff Becker
9d3484f797
make it compile
2019-01-23 12:31:00 -05:00