tree 3c49145db0268c07349a42bafc7352c80c12305c
parent 5cf4b44fff8755edc9bdc46284d6cd270bc4a162
parent 37575810523b10fb82fe7093629d2efc53044a18
author Mark D. Roth <roth@google.com> 1512511428 -0800
committer GitHub <noreply@github.com> 1512511428 -0800
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsBcBAABCAAQBQJaJxfECRBK7hj4Ov3rIwAAdHIIAKu7EQrJ5cLFrrDKOpqD8Wu8
 sVciKL7vnvFHIXL8zBDNeJjkMKCqxAtUwuBeZ5yoafVWkadVTI6JlHfFcQrnWXBQ
 PQVybsZvm04+ulalqE4wCnteH6bEJSGoalD2i4eNcosrmkbmWIpAWHyyHU1y1HIf
 FYh6gdJPMW0Sx4jza+wWqqpjll2yMn3/l3Oqj/swjnpavpYPepe5jWmxxE0AwhoA
 GE7zLEdzZGNVaLRZreV24THqz9NqWjMFvSdx/8nnXZkz4wF+N+RQck9cx4oNfnch
 lR8jed443H8mNBnGfO3a5CZhaJKewpxgpr0SM0uU02wLuXBI22PJ0MBM2FbqdkI=
 =ImZV
 -----END PGP SIGNATURE-----
 

Merge pull request #13642 from markdroth/server_connection_timeout_1.7

Apply #13336 to v1.7.x branch.