Backport new 5.0 implementation of connection timeout hints #349

Closed fbiville closed 2 years ago