Merge pull request #40 from rod-hynes/master

Updated README to point to binary releases

AndroidLibrary/README.md

@@ -52,7 +52,7 @@ NOTE: may change after Go 1.4 is released.
 Using
 --------------------------------------------------------------------------------
 
-1. Build from source or use the [provided shared object binary](TODO: link to release) and Java source files
+1. Build the shared object library from source or use the [binary release](https://github.com/Psiphon-Labs/psiphon-tunnel-core/releases) and Java source files
 1. Add Go/Java integration files `java_golang/go/*.java` to your `$src/go`
 1. Add `java_psi/go/psi/Psi.java` to your `$src/go/psi`
 1. Add `libgojni.so` to your Android app

psiphon/LookupIP_nobind.go

@@ -30,7 +30,7 @@ import (
 // simply uses net.LookuIP.
 func LookupIP(host string, config *DialConfig) (addrs []net.IP, err error) {
 	if config.BindToDeviceProvider != nil {
-		return nil, errors.New("LookupIP with bind not supported on this platform")
+		return nil, ContextError(errors.New("LookupIP with bind not supported on this platform"))
 	}
 	return net.LookupIP(host)
 }

psiphon/TCPConn_windows.go

@@ -43,8 +43,8 @@ type interruptibleDialResult struct {
 }
 
 func interruptibleTCPDial(addr string, config *DialConfig) (conn *TCPConn, err error) {
-	if config.BindToDevice != nil {
-		Fatal("psiphon.interruptibleTCPDial with bind not supported on Windows")
+	if config.BindToDeviceProvider != nil {
+		return nil, ContextError(errors.New("psiphon.interruptibleTCPDial with bind not supported on Windows"))
 	}
 
 	conn = &TCPConn{