[tor-commits] [tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5

[teor at torproject.org]

commit d380acaecad5f554f7294cfcd7fbf100f9bbaca3
Merge: 38e07b88f 894ff2dc8
Author: teor <teor at torproject.org>
Date:   Thu Apr 9 11:02:49 2020 +1000

    Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5

 changes/ticket33491   |  6 ++++++
 src/core/or/channel.c |  2 +-
 src/core/or/dos.c     |  4 ++--
 src/core/or/dos.h     |  3 ++-
 src/test/test_dos.c   | 24 ++++++++++++------------
 5 files changed, 23 insertions(+), 16 deletions(-)