commit a2e79fa4ad0d21f8cba98371fc80493e0c6606a8 Author: David Fifield david@bamsoftware.com Date: Tue Apr 11 02:21:12 2017 -0700

Log dates in UTC. --- meek-client-torbrowser/meek-client-torbrowser.go | 1 + meek-client/meek-client.go | 1 + meek-server/meek-server.go | 1 + 3 files changed, 3 insertions(+)

diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index 4592495..cbbf9ca 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -286,6 +286,7 @@ func main() { flag.StringVar(&logFilename, "log", "", "name of log file") flag.Parse()

+ log.SetFlags(log.LstdFlags | log.LUTC) if logFilename != "" { f, err := os.OpenFile(logFilename, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) if err != nil { diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 9de4056..9706c66 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -363,6 +363,7 @@ func main() { flag.StringVar(&options.URL, "url", "", "URL to request if no url= SOCKS arg") flag.Parse()

+ log.SetFlags(log.LstdFlags | log.LUTC) if logFilename != "" { f, err := os.OpenFile(logFilename, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) if err != nil { diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index cb07f6e..ee53d83 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -359,6 +359,7 @@ func main() { flag.IntVar(&port, "port", 0, "port to listen on") flag.Parse()

+ log.SetFlags(log.LstdFlags | log.LUTC) if logFilename != "" { f, err := os.OpenFile(logFilename, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) if err != nil {