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

[nickm at torproject.org]

commit b60ffc5ce0fc9dfd4c2fbb238e32143c64fadbda
Merge: 305e39d0f 4fe4f8179
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Feb 13 13:11:10 2018 -0500

    Merge remote-tracking branch 'dgoulet/bug25223_029_01' into ticket24902_029_05

 changes/bug25223 | 3 +++
 src/or/dos.c     | 8 ++++++++
 2 files changed, 11 insertions(+)