Merge branch 'master' of github.com:jedisct1/dnscrypt-proxy

jedisct1 · jedisct1 · commit fe3b8b6321e6 · 2019-10-27T23:36:42.000+01:00
* 'master' of github.com:jedisct1/dnscrypt-proxy:
  Fix travis build
diff --git a/dnscrypt-proxy/systemd_android.go b/dnscrypt-proxy/systemd_android.go
@@ -1,7 +1,10 @@
+// +build android
+
 package main
 
 import (
 	"io"
+	"io/ioutil"
 )
 
 func (proxy *Proxy) SystemDListeners() (io.Closer, error) {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,10 @@`
	`1`	`+// +build android`
	`2`	`+`
`1`	`3`	`package main`
`2`	`4`
`3`	`5`	`import (`
`4`	`6`	`"io"`
	`7`	`+ "io/ioutil"`
`5`	`8`	`)`
`6`	`9`
`7`	`10`	`func (proxy *Proxy) SystemDListeners() (io.Closer, error) {`