Merge pull request #10623 from seamuslee001/smtp_socket_fix_46
authorMark Hanna <mark@skvare.com>
Sat, 8 Jul 2017 22:13:29 +0000 (17:13 -0500)
committerGitHub <noreply@github.com>
Sat, 8 Jul 2017 22:13:29 +0000 (17:13 -0500)
Put back _ in socket and socket_options to refer correctly to static variables


Trivial merge