Merge pull request #27 from m-lab/replace-tcpconn-with-interface

Merge pull request #27 from m-lab/replace-tcpconn-with-interface #166