Merge tag '0.4.2' into debian/experimental

Tag leap.common version 0.4.2

Conflicts:
	pkg/requirements-testing.pip
	setup.cfg
	src/leap/common/_version.py
	src/leap/common/events/events_pb2.py

1 files changed, 7 insertions, 0 deletions

diff --git a/setup.py b/setup.py
index a7de8f9..ca83017 100644
--- a/setup.py
+++ b/setup.py
@@ -138,4 +138,11 @@ setup(
     tests_require=tests_requirements,
     include_package_data=True,
     zip_safe=False,
+
+    extras_require={
+        # needed for leap.common.http
+        #  service_identity needed for propper hostname identification,
+        #  see http://twistedmatrix.com/documents/current/core/howto/ssl.html
+        'Twisted':  ["Twisted>=14.0.2", "service_identity", "zope.interface"]
+    },
 )