Update tunnel implementation for relay v1.0-draft2