4 commits

Author	SHA1	Message	Date
Jack Robison	f507d95198	always add fixed peers if configured after 2s	2019-01-28 22:01:43 -05:00
Jack Robison	778d3826ab	clean up settings and use them	2019-01-28 15:51:27 -05:00
Jack Robison	5596eac930	merge conflicts	2019-01-24 00:13:15 -05:00
Jack Robison	4bf7742c19	async lbrynet.stream	2019-01-24 00:13:15 -05:00