From 2575dbfad3435caf352304f4ae66bbdd9ab161cd Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Wed, 14 Jun 2017 23:41:49 +0100
Subject: [PATCH] setup.py: require txtorcon all the time, remove 'tor' extra

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 435bda3..29a10d5 100644
--- a/setup.py
+++ b/setup.py
@@ -36,11 +36,11 @@ setup(name="magic-wormhole",
           "click",
           "humanize",
           "ipaddress",
+          "txtorcon >= 0.19.3",
       ],
       extras_require={
           ':sys_platform=="win32"': ["pypiwin32"],
-          "tor": ["txtorcon >= 0.19.3"],
-          "dev": ["mock", "tox", "pyflakes", "txtorcon >= 0.19.3"],
+          "dev": ["mock", "tox", "pyflakes"],
       },
       test_suite="wormhole.test",
       cmdclass=commands,