tree a4d328553dec756c694de77777e8bad2daf486bd
parent 1de6311425f847007410753f46c3baf1da987561
author Pete Bentley <prb@google.com> 1680194507 +0100
committer Pete Bentley <prb@google.com> 1680705941 +0100

Merge Conscrypt upstream master.

Contains the following upstream changes:
    Tidy ConscryptEngineSocket state machine. (#1120)
    Add missing close() calls. (#1122)

Bug: 276304877
Test: MtsConscryptTestCases
Change-Id: Iadb7295b1fa0925dd8b966b48bca3040f858196f
Merged-In: Iadb7295b1fa0925dd8b966b48bca3040f858196f
(cherry picked from commit af289bed7ed17dc6138da62db42370b1c3472172)