commit 1163d9a62fb40ecea50ff1279dcb55bcd7cced32
Merge: 23e401749 987f2fa50
Author: teor <t...@torproject.org>
Date: Thu Apr 9 11:03:24 2020 +1000
Merge branch 'maint-0.4.1' into release-0.4.1
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
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
