| commit | 7c3ed526ed9a4a508c3ae6d6e104f51dd9d7a1c1 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Mon Dec 15 11:04:09 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Dec 15 11:04:10 2014 +0000 |
| tree | 0cb862403d16bf8bdb77948329c470f9d8a89f5e | |
| parent | c489247c66f2995adcd56293c5cb925f525965dd [diff] | |
| parent | b3a4dd8402e39a4d1209515adaf01f6b288fcea9 [diff] |
Merge "When connecting to a SOCKS proxy, use the resolved IP"