Merge branch 'ticket31343_035' into ticket31343_040
commit79569d86b36ae1a89b5656bf8356247574b32e95
authorNick Mathewson <nickm@torproject.org>
Tue, 6 Aug 2019 15:18:40 +0000 (6 11:18 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 6 Aug 2019 15:18:40 +0000 (6 11:18 -0400)
tree9d58605717a7156ed0ebdf699e6b90312e36436a
parent2a42d6be2707bbc28ad9d68055799297d1d07daf
parentbc9492a938f0bc2ee8dfb6f94f0f8d81f16b9575
Merge branch 'ticket31343_035' into ticket31343_040
src/core/or/channeltls.c