[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1784'

[teor at torproject.org]

commit 44f92e8e4278403b9e633668f8be70f197b6e8db
Merge: c86d08e3e 894ff2dc8
Author: teor <teor at torproject.org>
Date:   Tue Mar 17 23:11:31 2020 +1000

    Merge remote-tracking branch 'tor-github/pr/1784'

 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(-)