Merge branch 'branch3.2'

Conflicts:
	tornado/tcpserver.py

diff --cc README.rst
index d24a6ba8c6ec9f28438d86a046be0a8701f71292,8b28d506502a6be287674e96d50a017ed8aedf41..680f15f241f9be94b390da3e30ac4ba625893850
--- 1/README.rst
--- 2/README.rst
+++ b/README.rst
@@@ -75,14 -75,14 +75,14 @@@ copy of the source tarball as well
      sudo python setup.py install
  
  The Tornado source code is `hosted on GitHub
- <https://github.com/facebook/tornado>`_.
+ <https://github.com/tornadoweb/tornado>`_.
  
 -**Prerequisites**: Tornado runs on Python 2.6, 2.7, 3.2, and 3.3.  On
 -Python 2, the `backports.ssl_match_hostname
 +**Prerequisites**: Tornado runs on Python 2.6, 2.7, 3.2, 3.3, and 3.4.  It
 +requires the `certifi <https://pypi.python.org/pypi/certifi>`_ package
 +on all Python versions, and the `backports.ssl_match_hostname
  <https://pypi.python.org/pypi/backports.ssl_match_hostname>`_ package
 -must be installed (This will be installed automatically when using
 -``pip`` or ``easy_install``); on Python 3 there are no strict
 -dependencies outside the standard library.  Some Tornado features may
 +on Python 2.  These will be installed automatically when using
 +``pip`` or ``easy_install``).  Some Tornado features may
  require one of the following optional libraries:
  
  * `unittest2 <https://pypi.python.org/pypi/unittest2>`_ is needed to run

diff --cc docs/index.rst
index d2bcdae3c0d312c3d80e132f89a4ed5242371099,4b48cbaac19ebf11991743fcfcdb4278ef15ce37..c122c7f85f76928e0617383b65a38d36fc788f6e
--- 1/docs/index.rst
--- 2/docs/index.rst
+++ b/docs/index.rst
@@@ -84,14 -84,14 +84,14 @@@ copy of the source tarball as well
      sudo python setup.py install
  
  The Tornado source code is `hosted on GitHub
- <https://github.com/facebook/tornado>`_.
+ <https://github.com/tornadoweb/tornado>`_.
  
 -**Prerequisites**: Tornado runs on Python 2.6, 2.7, 3.2, and 3.3.  On
 -Python 2, the `backports.ssl_match_hostname
 +**Prerequisites**: Tornado runs on Python 2.6, 2.7, 3.2, 3.3, and 3.4.  It
 +requires the `certifi <https://pypi.python.org/pypi/certifi>`_ package
 +on all Python versions, and the `backports.ssl_match_hostname
  <https://pypi.python.org/pypi/backports.ssl_match_hostname>`_ package
 -must be installed (This will be installed automatically when using
 -``pip`` or ``easy_install``); on Python 3 there are no strict
 -dependencies outside the standard library.  Some Tornado features may
 +on Python 2.  These will be installed automatically when using
 +``pip`` or ``easy_install``).  Some Tornado features may
  require one of the following optional libraries:
  
  * `unittest2 <https://pypi.python.org/pypi/unittest2>`_ is needed to run

diff --cc docs/overview.rst
Simple merge

diff --cc tornado/tcpserver.py
index ffe62bc20f8b7701abe199f05dba0b0ac3226535,9370cbacb464f1bcd744cc70816546171505edad..74326c1f1bbb6b4dd7a5cae6a3a3a0277068eb88
--- 1/tornado/tcpserver.py
--- 2/tornado/tcpserver.py
+++ b/tornado/tcpserver.py
@@@ -233,8 -230,8 +233,8 @@@ class TCPServer(object)
                  # catch another error later on (AttributeError in
                  # SSLIOStream._do_ssl_handshake).
                  # To test this behavior, try nmap with the -sT flag.
-                 # https://github.com/facebook/tornado/pull/750
+                 # https://github.com/tornadoweb/tornado/pull/750
 -                if err.args[0] in (errno.ECONNABORTED, errno.EINVAL):
 +                if errno_from_exception(err) in (errno.ECONNABORTED, errno.EINVAL):
                      return connection.close()
                  else:
                      raise

diff --cc tornado/wsgi.py
Simple merge