Merge pull request #141 from rod-hynes/master

Fix build constraints syntax

psiphon/config.go

@@ -149,8 +149,9 @@ type Config struct {
 	EgressRegion string
 
 	// TunnelProtocol indicates which protocol to use. Valid values include:
-	// "SSH", "OSSH", "UNFRONTED-MEEK-OSSH", "FRONTED-MEEK-OSSH". For the default,
-	// "", the best performing protocol is used.
+	// "SSH", "OSSH", "UNFRONTED-MEEK-OSSH", "UNFRONTED-MEEK-HTTPS-OSSH",
+	// "FRONTED-MEEK-OSSH". For the default, "", the best performing protocol
+	// is used.
 	TunnelProtocol string
 
 	// EstablishTunnelTimeoutSeconds specifies a time limit after which to halt

psiphon/opensslConn_unsupported.go

@@ -1,4 +1,4 @@
-// +build !android, !windows
+// +build !android,!windows
 
 /*
  * Copyright (c) 2015, Psiphon Inc.

psiphon/upgradeDownload.go

@@ -128,6 +128,8 @@ func DownloadUpgrade(config *Config, clientUpgradeVersion string, tunnel *Tunnel
 	// succeeds in this one request.
 	ioutil.WriteFile(partialETagFilename, []byte(response.Header.Get("ETag")), 0600)
 
+	// A partial download occurs when this copy is interrupted. The io.Copy
+	// will fail, leaving a partial download in place (.part and .part.etag).
 	n, err := io.Copy(NewSyncFileWriter(file), response.Body)
 	if err != nil {
 		return ContextError(err)