Merge remote-tracking branch 'tor-gitlab/mr/77' into maint-0.3.5
commit5f5587ee500c86d2f0ccdb808dfc90201321fdd9
authorNick Mathewson <nickm@torproject.org>
Wed, 7 Oct 2020 12:29:23 +0000 (7 08:29 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 7 Oct 2020 12:29:23 +0000 (7 08:29 -0400)
treed32fd80c40e1ebfb5a8abbf25756e7ca4f92657d
parentad7ffa5240c4b3a9b675a12f0705d9cbe0bc8beb
parentfaa752f3c9bd3faa2d23e6273f657771a3cad078
Merge remote-tracking branch 'tor-gitlab/mr/77' into maint-0.3.5
src/core/or/channel.c