Merge branch 'bug40080_035'
commit148b5b03a365eae7d8e527d337f9df91d6350f9b
authorNick Mathewson <nickm@torproject.org>
Fri, 30 Oct 2020 14:51:20 +0000 (30 10:51 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 30 Oct 2020 14:51:20 +0000 (30 10:51 -0400)
tree43e6dbdf047ef963b0b2e06ea0a38635941cabf0
parent54e6109499c2ba11ef9c99073bee449c61ebc080
parentafb6ff17390cb13780c6e813ad0535048dbd9d3c
Merge branch 'bug40080_035'
src/core/or/channel.c
src/core/or/channel.h
src/core/or/circuitbuild.c