Make the goptlib patch actually apply with "git am".

This likewise should be reverted once goptlib supports SOCKS5.