Revert "Temporarily use a patch to make goptlib support SOCKS5."

This reverts commits:
 * 61a8df6a4579c12ac0346423edb1bd3bf8950edc
 * 30bc49eadcef7b2c536817c2f6740baaa1fc45f9

No longer needed because the test bundles seemed to be ok, and the
patch will eventually be part of goptlib.
Only include the obfs4 LICENSE, and not the Go LICENSE.

While both are needed, including the Go LICENSE is a general TBB issue,
and has little to do with obfs4 (as meek also requires distributing the
file).  See bug #13039.