Merge branch 'ticket31343_029' into ticket31343_035
commitbc9492a938f0bc2ee8dfb6f94f0f8d81f16b9575
authorNick Mathewson <nickm@torproject.org>
Tue, 6 Aug 2019 15:15:20 +0000 (6 11:15 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 6 Aug 2019 15:15:20 +0000 (6 11:15 -0400)
tree73a245e94976d815f101efa3dde45bb475e62776
parent1dd95278970f9f32d83a31fe73e0258a30523539
parent0849d2a2fdaeea2871f32bed35d410f19703aae1
Merge branch 'ticket31343_029' into ticket31343_035
src/core/or/channeltls.c