3083 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
sachaaaaa	608efeaa96	Add missing reference operator in profiling.cpp	2019-03-06 11:54:35 +11:00
sachaaaaa	1f95e2ef28	Fix typo in ev_kqueue	2019-03-06 11:52:45 +11:00
Jeff	cf9d6a1793	Merge pull request #380 from majestrate/staging ... Staging	2019-03-05 17:08:25 -05:00
Jeff	0416800de1	Merge pull request #371 from michael-loki/absl_mutex ... Convert to use abseil synchronisation primitives	2019-03-05 17:06:36 -05:00
Jeff	1a09a12ee0	Merge branch 'staging' into absl_mutex	2019-03-05 17:06:23 -05:00
Jeff Becker	4dbeae63ee	handle kqueue code more like epoll's code	2019-03-05 08:39:06 -05:00
Jeff Becker	a1bd26a165	update profiling code to decay instead of clearing all stats	2019-03-05 08:38:50 -05:00
Jeff	33349fc7e5	Merge pull request #376 from majestrate/staging ... update profiles on path build	2019-03-04 12:05:41 -05:00
Jeff Becker	8331449ab9	update profiles on path build	2019-03-04 12:03:18 -05:00
Jeff	04f3912ca1	Merge pull request #375 from majestrate/staging ... fix unit test	2019-03-04 11:31:55 -05:00
Jeff Becker	b245453ef6	fix unit test	2019-03-04 11:31:05 -05:00
Jeff	83d6dcfb5c	Merge pull request #374 from majestrate/staging ... disable installing json headers	2019-03-04 11:11:40 -05:00
Jeff Becker	395228b8eb	disable installing json headers	2019-03-04 11:10:35 -05:00
Jeff	b3be5b8c8e	Merge pull request #373 from majestrate/staging ... fix limit	2019-03-04 11:06:13 -05:00
Jeff Becker	df0120f161	fix limit	2019-03-04 11:05:27 -05:00
Jeff	d75704739c	Merge pull request #370 from michael-loki:rapidjson ... Convert from using rapidjson to use nlohmann::json	2019-03-04 09:01:39 -05:00
Michael	61f3273dc4	Add threading annotations and fix potential deadlocks	2019-03-04 00:03:52 +00:00
Michael	c5a129ddff	Convert to use abseil synchronisation primitives	2019-03-03 21:20:38 +00:00
Michael	ab83d3d54e	Fixup build on debian	2019-03-03 21:17:03 +00:00
Michael	31441b46dc	Convert from rapidjson to use nlohmann::json	2019-03-02 02:32:50 +00:00
Michael	93399fdbb4	Make nlohmann::json part of the build	2019-03-02 02:32:18 +00:00
Michael	1b331ea6f7	Remove mention of rapidjson from readme/docker files etc	2019-03-02 02:32:18 +00:00
Michael	3e741e4b07	Import nlohmann json v3.5.0	2019-03-02 02:32:18 +00:00
Jeff	0a44d1b730	Merge pull request #367 from majestrate/staging ... delay dns resolution for snode until we have a session with it	2019-03-01 14:13:20 -05:00
Jeff Becker	159415c363	delay dns resolution for snode until we have a session with it	2019-03-01 14:10:42 -05:00
Jeff	f032f71026	Merge pull request #366 from sachaaaaa/missing_override ... Add missing override in evp.hpp	2019-02-28 18:03:57 -05:00
sachaaaaa	d08169f104	Add missing override in evp.hpp	2019-03-01 09:59:36 +11:00
Jeff	f034bfc184	Merge pull request #365 from majestrate/fix-libabyss-352 ... updates	2019-02-28 11:04:25 -05:00
Jeff Becker	86098b198f	clear errno and log invalid data	2019-02-28 11:02:36 -05:00
Jeff Becker	9e9818febe	Merge branch 'staging' into fix-libabyss-352	2019-02-28 10:47:50 -05:00
Jeff	db92d44a57	Merge pull request #356 from neuroscr/master ... output pubkey in base32z	2019-02-28 08:55:54 -05:00
Jeff	d255ce50ac	Merge branch 'staging' into master	2019-02-28 08:55:45 -05:00
Jeff	c0c3c20954	Merge pull request #362 from neuroscr/issue324 ... Fix cname lookups on mojave: issue #324	2019-02-28 08:54:44 -05:00
Jeff Becker	679a0cc7f0	update debian parts	2019-02-28 08:49:04 -05:00
Ryan Tharp	fd61ac2f6a	Merge branch 'issue324' of https://github.com/neuroscr/loki-network into issue324	2019-02-27 21:40:08 -08:00
Ryan Tharp	1757426d63	Merge branch 'staging' of https://github.com/loki-project/loki-network into issue324	2019-02-27 21:39:25 -08:00
Ryan Tharp	4d6451aaa2	fix mojave random.snode lookup issue #324	2019-02-27 21:39:24 -08:00
Ryan Tharp	5e37211f87	Merge branch 'staging' of https://github.com/loki-project/loki-network into issue324	2019-02-27 21:23:50 -08:00
Ryan Tharp	1ec1b132ea	Merge branch 'staging' of https://github.com/loki-project/loki-network	2019-02-27 21:21:42 -08:00
Ryan Tharp	58b54b96f9	fix mojave random.snode lookup issue #324	2019-02-27 21:17:40 -08:00
Ryan Tharp	f1ff247240	convert pubKey to RouterID	2019-02-27 21:11:52 -08:00
Ryan Tharp	6e4e6c997e	undo previous change	2019-02-27 21:11:17 -08:00
Jeff	c10f7d82cf	Merge pull request #359 from majestrate/fix-libabyss-352 ... Fix #352	2019-02-27 11:18:46 -05:00
Jeff Becker	46b80e465d	* fix jsonrpc endpoint path for caller ... * make epoll not crash and leak * correct key name in config	2019-02-27 10:19:55 -05:00
Jeff Becker	71302ee48b	Merge remote-tracking branch 'origin/staging' into fix-libabyss-352	2019-02-27 07:55:38 -05:00
Jeff Becker	f8d6becce8	make whitelist happy	2019-02-27 07:55:26 -05:00
Ryan Tharp	4b5e96c414	output in base32z	2019-02-26 17:22:12 -08:00
Ryan Tharp	6b763807e6	add missing include to make linux gcc 7.3 happy	2019-02-27 00:03:25 +00:00
Ryan Tharp	2906a89e62	make linux compile	2019-02-27 00:02:36 +00:00
Jeff	db504e8044	Merge pull request #354 from despair86/dev ... regression fixes	2019-02-26 17:40:48 -05:00