Fixed sub-package references. Commented out broken top-level test code.
Added tests for relative and absolute paths
Merge pull request #18 from rod-hynes/master

Added local connection shutdown to SOCKS proxy; refactored PendingConns into a general conn tracker and closer used for pending conns and also HTTP and SOCKS proxy open conn management
Merge pull request #19 from rod-hynes/master

Absolute path for "psiphon" import; README updates.
Merge pull request #20 from rod-hynes/master

Fixed README links
Merge pull request #21 from rod-hynes/master

Sample Android app that uses Go client; support for Android VpnService in Go client: bind-to-device to ensure tunnel connections aren't routed through the VPN.
Fixed merge conflict
Merge pull request #22 from rod-hynes/master

Use active network DNS server for untunneled hostname resolution in bind-to-device case
Merge remote-tracking branch 'rod/master'
Merge pull request #23 from rod-hynes/master

Fix compile errors on Windows
Merge pull request #24 from rod-hynes/master

Fixed cross-platform compile errors; updated README with latest status and TODOs
Merge remote-tracking branch 'rod/master'
Merge pull request #25 from rod-hynes/master

Merge in "controller" feature branch
Merge pull request #26 from rod-hynes/master

Use forks of dns and sqlite3 libs (vendoring)
Merge pull request #27 from rod-hynes/master

Rename main package file; [temporarily] remove non-functioning test.
merged rod/master
Merge pull request #28 from rod-hynes/master

Added support for upstream HTTP proxy; fix missing BindToDevice support for fetch remote server list
Merge remote-tracking branch 'rod/master'
Merge pull request #29 from rod-hynes/master

Decouple Controller from HttpProxy and SocksProxy. Use a Tunneler interf...
Merge remote-tracking branch 'rod/master'