[tor-commits] [tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3

[teor at torproject.org]

commit 2d6f00e45b3003337242704e0fde2d2adbaa6cf5
Merge: 34faee060 2d7e08d57
Author: teor <teor at torproject.org>
Date:   Thu Apr 9 11:03:34 2020 +1000

    Merge branch 'maint-0.4.2' into maint-0.4.3

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