Messages may need to stay in the controller for considerable

amount of time. Don't use a timeout waiting for the controller response.
Example where this happens is intercepted flows.

libmproxy/controller.py

@@ -31,7 +31,7 @@ class Msg:
         self.acked = False
         try:
             masterq.put(self, timeout=3)
-            return self.q.get(timeout=3)
+            return self.q.get()
         except (Queue.Empty, Queue.Full):
             return None