Merge branch 'maint-0.4.3' into maint-0.4.4
commitec0f000445fdc3fd7809032c763b67880a6391c4
authorNick Mathewson <nickm@torproject.org>
Mon, 9 Nov 2020 21:17:42 +0000 (9 16:17 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 9 Nov 2020 21:17:42 +0000 (9 16:17 -0500)
tree68cb7c590ff782ee7388f5267345abca42bdb0cc
parentb0e6ec627cb76478507a746090b64c0458723460
parent0b2c64effd7b4c1238e3b4da34f09d670dafd52d
Merge branch 'maint-0.4.3' into maint-0.4.4
src/core/or/channel.c
src/core/or/channel.h
src/core/or/circuitbuild.c