Merge branch 'maint-0.3.5' into maint-0.4.3
commit0b2c64effd7b4c1238e3b4da34f09d670dafd52d
authorNick Mathewson <nickm@torproject.org>
Mon, 9 Nov 2020 21:13:42 +0000 (9 16:13 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 9 Nov 2020 21:13:42 +0000 (9 16:13 -0500)
tree7844bcbf729549dfdea64af553c5753fa40d5753
parent4876409c2aa7deecd5f57474ee6de6ea9e90a855
parent52e439c13eac6982a605c698c49629b1da48563d
Merge branch 'maint-0.3.5' into maint-0.4.3
src/core/or/channel.c
src/core/or/channel.h
src/core/or/circuitbuild.c