Fix imports for the new version of trollius, which changed its package name.
Small security improvements to xsrf tokens; add tests.

Use os.urandom(16) instead of uuid.uuid4(), to reclaim a few bits of
entropy.  Use _time_independent_equals for comparison.
Change the xsrf cookie format to be masked with a random salt.

This protects against the BREACH attack.
Add the option to request an older xsrf cookie version.

Fix an issue with v1 cookies on py32.
Merge pull request #1069 from drewbrew/master

ioloop.py: use itertools.count() as tiebreaker to preserve FIFO in case of tie
Docs for xsrf cookie change; 3.2.2 release notes.
Set version number to 3.2.2
Merge branch 'branch3.2'

Conflicts:
	docs/releases.rst
	setup.py
	tornado/__init__.py
	tornado/websocket.py
Merge branch 'master' of github.com:tornadoweb/tornado
Broaden catch clause in extension building.

This should allow Tornado to be installed again on OSX with no
compiler available.

Closes #1074.
The next version will be 4.0, not 3.3, so update all references to 3.3.
When a function on the IOLoop returns a Future, log its exception.
Add ETIMEDOUT to the list of relatively benign unclean-close errnos.
Remove async_callback wrapper functions, which have been obsolete since 1.1.

Closes #283.
Improve callback scheduling.

Collect all timeouts to be run before running any of them; this
prevents starvation when a slow callback reschedules itself.

Call time() again before setting poll_timeout to avoid scheduling
anomalies with slow callbacks.

Closes #947.
Document AsyncHTTPClient's defaults argument.

Closes #762.
Add clearer message for fetch() on closed AsyncHTTPClient.

Closes #866.
Document that IOStream.connect blocks on DNS and recommend TCPClient instead.

Closes #861.
Relax restrictions on HTTP methods in WebSocketHandler.

Methods like set_status are now disallowed once the websocket handshake
has begun, but may be used before then.  This applies to application
overrides of prepare() and to WebSocketHandler.get's internal error
handling.

Closes #1065.
Rename HTTP{In,Out}putException to HTTP{In,Out}putError.

This follows the standard python naming convention for exceptions.