Merge pull request #267 from rod-hynes/master

Minor fixes

psiphon/common/net.go

@@ -225,9 +225,9 @@ func NewActivityMonitoredConn(
 }
 
 // GetStartTime gets the time when the ActivityMonitoredConn was
-// initialized.
+// initialized. Reported time is UTC.
 func (conn *ActivityMonitoredConn) GetStartTime() time.Time {
-	return conn.realStartTime
+	return conn.realStartTime.UTC()
 }
 
 // GetActiveDuration returns the time elapsed between the initialization

psiphon/meekConn.go

@@ -34,10 +34,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/Psiphon-Inc/crypto/nacl/box"
 	"github.com/Psiphon-Inc/goarista/monotime"
 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common"
 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/upstreamproxy"
-	"golang.org/x/crypto/nacl/box"
 )
 
 // MeekConn is based on meek-client.go from Tor and Psiphon:

psiphon/server/config.go

@@ -32,10 +32,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/Psiphon-Inc/crypto/nacl/box"
 	"github.com/Psiphon-Inc/crypto/ssh"
 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon"
 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common"
-	"golang.org/x/crypto/nacl/box"
 )
 
 const (

psiphon/server/meek.go

@@ -33,10 +33,10 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/Psiphon-Inc/crypto/nacl/box"
 	"github.com/Psiphon-Inc/goarista/monotime"
 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon"
 	"github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/common"
-	"golang.org/x/crypto/nacl/box"
 )
 
 // MeekServer is based on meek-server.go from Tor and Psiphon:

psiphon/server/tunnelServer.go

@@ -771,7 +771,6 @@ func (sshClient *sshClient) stop() {
 		sshClient.handshakeState.apiParams,
 		baseRequestParams)
 
-	// TODO: match legacy log field naming convention?
 	logFields["handshake_completed"] = sshClient.handshakeState.completed
 	logFields["start_time"] = sshClient.activityConn.GetStartTime()
 	logFields["duration"] = sshClient.activityConn.GetActiveDuration()