Fixed sub-package references. Commented out broken top-level test code.
Added tests for relative and absolute paths
Fixed merge conflict
Merge remote-tracking branch 'rod/master'
Merge remote-tracking branch 'rod/master'
merged rod/master
Merge remote-tracking branch 'rod/master'
Merge remote-tracking branch 'rod/master'
Removed error type checks. They were failing, and there's no point in doing them.
Merge remote-tracking branch 'rod/master'
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
Merge remote-tracking branch 'upstream/master'
Fix time.After leaking.
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