commit fb35918747493b518b62542899ed99cd8a3f0548 Merge: 6c4e10c93 93ff1870b Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 17 10:45:58 2018 -0400

Merge branch 'maint-0.3.3' into release-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(-)