Tunnels updates done

Development
1

Robin,

I'm done with my tunnel and SOCKS updates. My topic/seth/tunnels-merge is ready to merged into your tunnels-merge branch.

  .Seth