3 commits

Author	SHA1	Message	Date
Michael	ba8c9295ac	Update golang.org/x/net dependency	2018-06-28 17:58:04 +02:00
Fernandez Ludovic	bf43149d7e	Merge branch 'v1.5' into master	2018-03-02 16:44:24 +01:00
Ludovic Fernandez	9ae808aac4	Fix panic when parsing resolv.conf	2018-03-02 10:46:04 +01:00