commit 86f461e362480bb5bdbeec983df55044d0837cd8
Merge: 412a8256a e7f631478
Author: Nick Mathewson <[email protected]>
Date: Tue Feb 13 15:00:43 2018 -0500
Merge remote-tracking branch 'dgoulet/ticket24902_029_05'
changes/bug25223 | 4 ++++
changes/ticket25202 | 4 ++++
doc/tor.1.txt | 35 +++++++++++++++++++++--------------
src/or/dos.c | 18 ++++++++++++++++++
4 files changed, 47 insertions(+), 14 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
