Merge branch 'fix-appveyor'

.appveyor.yml

@@ -12,13 +12,20 @@ environment:
     # For Python versions available on Appveyor, see
     # http://www.appveyor.com/docs/installed-software#python
     - PYTHON: "C:\\Python27"
+      TOXENV: py27-nodilate
     - PYTHON: "C:\\Python27-x64"
       DISTUTILS_USE_SDK: "1"
+      TOXENV: py27-nodilate
     - PYTHON: "C:\\Python35"
+      TOXENV: py35
     - PYTHON: "C:\\Python35-x64"
+      TOXENV: py35
     - PYTHON: "C:\\Python36"
+      TOXENV: py36
     - PYTHON: "C:\\Python36-x64"
+      TOXENV: py36
     - PYTHON: "C:\\Python37-x64"
+      TOXENV: py37
 
 matrix:
   allow_failures:
@@ -42,7 +49,7 @@ test_script:
   # the interpreter you're using - Appveyor does not do anything special
   # to put the Python evrsion you want to use on PATH.
   - |
-    misc\windows-build.cmd %PYTHON%\Scripts\tox.exe -e py
+    misc\windows-build.cmd %PYTHON%\Scripts\tox.exe
 
 after_test:
   # This step builds your wheels.

src/wormhole/_dilation/connector.py

@@ -6,10 +6,11 @@ from attr.validators import instance_of, provides, optional
 from automat import MethodicalMachine
 from zope.interface import implementer
 from twisted.internet.task import deferLater
-from twisted.internet.defer import DeferredList
+from twisted.internet.defer import DeferredList, CancelledError
 from twisted.internet.endpoints import serverFromString
 from twisted.internet.protocol import ClientFactory, ServerFactory
 from twisted.internet.address import HostnameAddress, IPv4Address, IPv6Address
+from twisted.internet.error import ConnectingCancelledError
 from twisted.python import log
 from .. import ipaddrs  # TODO: move into _dilation/
 from .._interfaces import IDilationConnector, IDilationManager
@@ -308,6 +309,8 @@ class Connector(object):
         desc = describe_hint_obj(h, is_relay, self._tor)
         d = deferLater(self._reactor, delay,
                        self._connect, ep, desc, is_relay)
+        d.addErrback(lambda f: f.trap(ConnectingCancelledError,
+                                      CancelledError))
         d.addErrback(log.err)
         self._pending_connectors.add(d)