Merge pull request #268 from rod-hynes/master

Fix automated test

psiphon/common/net_test.go

@@ -111,7 +111,7 @@ func TestActivityMonitoredConn(t *testing.T) {
 		t.Fatalf("NewActivityMonitoredConn failed")
 	}
 
-	realStartTime := time.Now()
+	realStartTime := time.Now().UTC()
 
 	monotonicStartTime := monotime.Now()