[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket24902_029_05'

[nickm at torproject.org]

commit f0d7905bc9f20ecee43da3db369073ffb73b4997
Merge: 953c769a8 78d6cb587
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 5 11:38:58 2018 -0500

    Merge remote-tracking branch 'dgoulet/ticket24902_029_05'

 src/or/dos.c        | 2 --
 src/test/test_dos.c | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)