Merge pull request #92 from rod-hynes/master

Bug fixes

psiphon/dataStore.go

@@ -71,7 +71,7 @@ func InitDataStore(config *Config) (err error) {
 			// temporary directory: https://www.sqlite.org/pragma.html#pragma_temp_store_directory.
 			// TODO: is there another way to restrict writing of temporary files? E.g. temp_store=3?
 			initialization += fmt.Sprintf(
-				"pragma temp_store_directory=\"%s\";\n", config.DataStoreDirectory)
+				"pragma temp_store_directory=\"%s\";\n", config.DataStoreTempDirectory)
 		}
 		initialization += `
         create table if not exists serverEntry

psiphon/meekConn.go

@@ -166,7 +166,7 @@ func DialMeek(
 			// For unfronted meek, we let the http.Transport handle proxying, as the
 			// target server hostname has to be in the HTTP request line. Also, in this
 			// case, we don't require the proxy to support CONNECT and so we can work
-			// throigh HTTP proxies that don't support it.
+			// through HTTP proxies that don't support it.
 			url, err := url.Parse(fmt.Sprintf("http://%s", meekConfig.UpstreamHttpProxyAddress))
 			if err != nil {
 				return nil, ContextError(err)

psiphon/net.go

@@ -26,7 +26,6 @@ import (
 	"io"
 	"net"
 	"net/http"
-	"strings"
 	"sync"
 	"time"
 
@@ -194,7 +193,7 @@ func HttpProxyConnect(rawConn net.Conn, addr string) (err error) {
 		return ContextError(err)
 	}
 	if response.StatusCode != 200 {
-		return ContextError(errors.New(strings.SplitN(response.Status, " ", 2)[1]))
+		return ContextError(errors.New(response.Status))
 	}
 
 	return nil