Merge remote-tracking branch 'tor-gitlab/mr/189' into maint-0.3.5
commit52e439c13eac6982a605c698c49629b1da48563d
authorNick Mathewson <nickm@torproject.org>
Mon, 9 Nov 2020 21:13:24 +0000 (9 16:13 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 9 Nov 2020 21:13:24 +0000 (9 16:13 -0500)
tree6f557f261a53a531d5dd83b1c44e9fc097f5305d
parentdd63b972883f6c0b23ee2f7661b7897b229dd28f
parentafb6ff17390cb13780c6e813ad0535048dbd9d3c
Merge remote-tracking branch 'tor-gitlab/mr/189' into maint-0.3.5
src/core/or/channel.c
src/core/or/channel.h
src/core/or/circuitbuild.c