commit c5bbf72fb81eb8369178d61e990c14a9e631e419 Merge: c32108ee0 93ff1870b Author: Nick Mathewson <nickm@torproject.org> Date: Tue Apr 17 10:45:58 2018 -0400 Merge branch 'maint-0.3.3' src/or/dos.c | 15 +++++++++------ src/or/relay.c | 4 ++++ src/or/relay.h | 1 + src/test/test_status.c | 12 +++++++++++- 4 files changed, 25 insertions(+), 7 deletions(-)