Archives/lokinet
2
0
Fork 0
mirror of https://github.com/oxen-io/lokinet.git synced 2024-11-09 13:10:25 +00:00
Code Issues Projects Releases Wiki Activity
3,631 Commits 25 Branches 59 Tags 39 MiB
5092a1fa85
Commit Graph

3631 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rick V
6caed8d8a5
jeff forgot to bump 
(cherry picked from commit 05c96c6ed2550a81a252a26ad57654da8e14b122)
 2019-05-22 05:14:16 -05:00
Rick V
f0a4b93431
fix 
(cherry picked from commit 0d2e1da774580917dcf6a05c6be81ebfe823adef)
 2019-05-22 05:14:04 -05:00
Rick V
43296127cd
bump version 
(cherry picked from commit 642be27c839d3b86bcb6ce40842add9dee165d65)

# Conflicts:
#	win32-setup/lokinet-win32.iss
 2019-05-22 05:13:53 -05:00
Michael
7ca0927d8f
Replace dict_reader/list_reader with version which doesn't involve indirection 2019-05-22 01:36:03 +01:00
Ryan Tharp
ad576f3b07 osx pkg updates 2019-05-21 14:59:30 -07:00
Jeff Becker
0f68e6b4dd
don't move, instead copy 2019-05-21 11:24:20 -04:00
Jeff Becker
7a5bb084da
more docs 2019-05-21 10:57:21 -04:00
Jeff
83ede0c961
Merge pull request #613 from michael-loki/minor_python_js_warnings 
Minor warnings fixes in python/javascript code
 2019-05-21 09:02:57 -04:00
Michael
aeec414990
Minor warnings fixes in python/javascript code 2019-05-21 09:58:43 +01:00
Jeff Becker
5bcb205a9f
try allowing ip addresses in bind section 2019-05-20 08:32:11 -04:00
Jeff Becker
b86e834e1b
Merge remote-tracking branch 'origin/master' 2019-05-20 08:25:57 -04:00
Jeff
009aa64a2e
Merge pull request #611 from michael-loki/rule_of_zero 
Apply rule of zero to code base
 2019-05-20 08:25:06 -04:00
Jeff Becker
73f1d34239
make format and revert stupid alloc changes 2019-05-20 08:19:33 -04:00
Michael
dd8a93a400
Apply rule of zero to code base 2019-05-19 23:11:07 +01:00
Jeff
65766a501f
Merge pull request #610 from michael-loki/more_thread_pool 
Convert more things to use thread::ThreadPool
 2019-05-19 17:16:14 -04:00
Jeff
a8941afbf4
Merge pull request #608 from michael-loki/fix_asan_build 
Fix ASAN build
 2019-05-19 17:15:57 -04:00
Jeff
43d4b72bd1
Merge pull request #609 from michael-loki/keyfile_error 
More explicit error when keyfile is not a valid file
 2019-05-19 17:15:46 -04:00
Jeff Becker
4862dec4be
commit recent stuff 2019-05-19 10:39:50 -04:00
Michael
06882338bb
Change ExecShellHookBackend to use a modern thread pool 2019-05-18 23:04:08 +01:00
Michael
b11bd01637
Drain diskworker pool on close 2019-05-18 23:04:08 +01:00
Michael
636bb2a17d
Convert router diskworker to use a modern ThreadPool 2019-05-18 23:04:08 +01:00
Michael
a83be769e2
More explicit error when keyfile is not a valid file 2019-05-18 18:34:25 +01:00
Michael
19578fa8fc
Fix ASAN build 2019-05-18 16:34:03 +01:00
Jeff Becker
5f823f8ba3
fix 2019-05-17 07:41:11 -04:00
Jeff Becker
a954f2000e
shift introduction 2019-05-17 07:36:08 -04:00
Jeff Becker
895e5659bb
Merge branch 'master' of ssh://github.com/loki-project/loki-network 2019-05-17 07:20:33 -04:00
Jeff Becker
8da3b51589
more hax 2019-05-17 07:18:42 -04:00
Rick V
7847094707
fix UI again 2019-05-17 03:27:25 -05:00
Rick V
538696a387
fix ui 2019-05-17 03:24:27 -05:00
Rick V
4815e0d04c
move tun autoconfig from config parser to tun setup 
refactor/combine common code

DRY

(cherry picked from commit 2e44d29d4a93aa22d99d62b457071b14516b83ac)
 2019-05-17 03:10:00 -05:00
Rick V
9c1c84d2a4
really remove line break 2019-05-17 03:02:35 -05:00
Jeff Becker
81f73bccc2
pick newer intros only 2019-05-16 19:37:32 -04:00
Jeff Becker
04499db0c5
add comment 2019-05-16 17:05:29 -04:00
Jeff Becker
baf4f5b495
hard code range for now as a /16 don't revert me 2019-05-16 17:05:03 -04:00
Jeff Becker
20efac9015
Merge remote-tracking branch 'origin/master' 2019-05-16 14:57:00 -04:00
Jeff Becker
a4e90ee769
hax to make it work. 2019-05-16 14:55:12 -04:00
Jeff Becker
cd85bd2c2d
re-enable unit test 2019-05-16 10:32:06 -04:00
Jeff Becker
6058b6f195
revert breaking change 2019-05-16 10:30:47 -04:00
Jeff
553ec4fca8
Merge pull request #606 from michael-loki/msvc_fixes 
Fixup MSVC build
 2019-05-15 20:00:24 -04:00
Michael
f734ffeae4 Fixup MSVC build 2019-05-15 23:03:24 +01:00
Jeff Becker
4bf2020839
whatever 2019-05-15 14:36:49 -04:00
Jeff Becker
a8f307dd09
fuck 2019-05-15 14:33:10 -04:00
Jeff Becker
351c241c0f
more 2019-05-15 12:15:20 -04:00
Jeff Becker
a793eee4b7
fix 2019-05-15 11:56:50 -04:00
Jeff Becker
5d388bc9f2
meh 2019-05-15 11:54:26 -04:00
Jeff Becker
d3a98db267
don't resize frames 2019-05-15 10:55:01 -04:00
Jeff Becker
0f6f03a77a
const 2019-05-14 13:35:01 -04:00
Jeff Becker
8bee0a3d5e
fix 2019-05-14 12:41:47 -04:00
Jeff Becker
06be908369
use 1 for dht exploration 2019-05-14 12:15:46 -04:00
Jeff Becker
ec100cffee
attempt every time 2019-05-14 11:51:56 -04:00