From: Ben Darnell <ben@bendarnell.com>
Date: Tue, 17 Mar 2015 01:53:18 +0000 (-0400)
Subject: Merge pull request #1381 from ajdavis/locks-cancel-timeouts
X-Git-Tag: v4.2.0b1~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14ae309f08f5e8d8de13aa5c71dd6bc43d8ace66;p=thirdparty%2Ftornado.git

Merge pull request #1381 from ajdavis/locks-cancel-timeouts

Cancel timeouts in Condition.wait and Semaphore.acquire.
---

14ae309f08f5e8d8de13aa5c71dd6bc43d8ace66