ProxyClient is now a TunnelObserver
Merge remote-tracking branch 'origin/member_gumby_thingy' into member_gumby_thingy