I would have to agree with @vieux here - I think we should only touch `vendor/` to update from upstream code.  If upstream can't move quickly enough, then we have to evaluate making our own fork and changing our upstream.  If this is a problem for this PR, then it needs to be blocked on #1422, and we need to resolve that upstream (ie kr/pty#9).