Merge "Improve timeouts in MultiHttpClient"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 15 Jun 2018 23:28:12 +0000 (23:28 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 15 Jun 2018 23:28:12 +0000 (23:28 +0000)

Trivial merge