Merge remote-tracking branch 'jzombi/python3.4_tls'
authorW. Trevor King <wking@tremily.us>
Mon, 14 Dec 2015 15:54:14 +0000 (07:54 -0800)
committerW. Trevor King <wking@tremily.us>
Mon, 14 Dec 2015 15:56:12 +0000 (07:56 -0800)
Avoid [1]:

  ssl.SSLError: [SSL: TLSV1_ALERT_DECODE_ERROR] tlsv1 alert decode error (_ssl.c:598)

when using .starttls() after an explicit .connect(host=...) on Python
3.4+ (where they start verifying hostnames).

[1]: http://bugs.python.org/issue25852

* jzombi/python3.4_tls:
  Fix tls bug in python 3.4+

Signed-off-by: W. Trevor King <wking@tremily.us>

Trivial merge