commit 2d7e08d57ef5d3b785cfaa6961d6d3c73fe59535
Merge: 048714d2c 987f2fa50
Author: teor <[email protected]>
Date: Thu Apr 9 11:03:27 2020 +1000
Merge branch 'maint-0.4.1' into maint-0.4.2
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(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
