Fix: race condition with reference to 'conn'
Don't log regexes; do log more info about port forward errors
Don't use a tunnel for port forwarding until it has started its server session (handshake, etc.)
Fix: count off by 1
Code/comment cleanups
Add graceful shutdown to psiphonClient; move log file initialization out of the "library" package as log.SetOutput has global effect
Merge branch 'master' of https://github.com/Psiphon-Labs/psiphon-tunnel-core
Merge pull request #31 from adam-p/master

Fix time.After leak
Merge branch 'master' of https://github.com/Psiphon-Labs/psiphon-tunnel-core

Conflicts:
	psiphon/meekConn.go
Fix duplicate tunnel check: the exclude list at SQL statement prepare time becomes too stale.
Move tunnel.SetSessionStarted() to operateTunnel() for readability.
Merge pull request #32 from rod-hynes/master

Bug fixes while testing controller
Stats implementation in progress.

Also merged upstream (required conflict resolution).
Use an explicit stop signal to gracefully exit the SOCKS proxy accept loop
Fix random range edge conditions and add comments for clarity
Meek session protocol v.2
Merge branch 'master' of https://github.com/Psiphon-Labs/psiphon-tunnel-core
Merge pull request #33 from efryntov/master

Meek session protocol v.2 in meekConn.go
Merge branch 'master' of https://github.com/Psiphon-Labs/psiphon-tunnel-core
Merge pull request #34 from rod-hynes/master

Bug fixes