Merge pull request #3178 from matrix-org/rav/fix_request_timeouts

fix http request timeout code

synapse/http/__init__.py

@@ -25,7 +25,7 @@ def __init__(self):
         super(RequestTimedOutError, self).__init__(504, "Timed out")
 
 
-def cancelled_to_request_timed_out_error(value):
+def cancelled_to_request_timed_out_error(value, timeout):
     """Turns CancelledErrors into RequestTimedOutErrors.
 
     For use with async.add_timeout_to_deferred