Merge branch 'log_future'

diff --cc tornado/http1connection.py
Simple merge

diff --cc tornado/iostream.py
Simple merge

diff --cc tornado/test/iostream_test.py
index bc69f1d0005126923c38df7b94efa452e7f18f05,5d13184baf0f3bb8c2cc8304550d40d9da132744..2a7e74b3174eda6624875ac8a244635b001d392d
--- 1/tornado/test/iostream_test.py
--- 2/tornado/test/iostream_test.py
+++ b/tornado/test/iostream_test.py
@@@ -880,24 -881,10 +881,26 @@@ class TestIOStreamStartTLS(AsyncTestCas
          with ExpectLog(gen_log, "SSL Error"):
              with self.assertRaises(ssl.SSLError):
                  yield client_future
+         with self.assertRaises(ssl.SSLError):
+             yield server_future
  
  
 +    @unittest.skipIf(not hasattr(ssl, 'create_default_context'),
 +                     'ssl.create_default_context not present')
 +    @gen_test
 +    def test_check_hostname(self):
 +        # Test that server_hostname parameter to start_tls is being used.
 +        # The check_hostname functionality is only available in python 2.7 and
 +        # up and in python 3.4 and up.
 +        self.server_start_tls(_server_ssl_options())
 +        client_future = self.client_start_tls(
 +            ssl.create_default_context(),
 +            server_hostname=b'127.0.0.1')
 +        with ExpectLog(gen_log, "SSL Error"):
 +            with self.assertRaises(ssl.SSLError):
 +                yield client_future
 +
 +
  @skipIfNonUnix
  class TestPipeIOStream(AsyncTestCase):
      def test_pipe_iostream(self):

diff --cc tornado/web.py
index 1080dea2d3970afb311f33c22df6d13944a7b8bd,fb4d439adff41aaef83564bd10607bf733ba33f8..df957c26f946f91be34080df9d7eb6c0de52475e
mode 100644,100755..100644
--- 1/tornado/web.py
--- 2/tornado/web.py
+++ b/tornado/web.py