commit cdb58af90d26452be60781355fbf40f7328735bd Merge: 98f6100 56a7c5b Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 8 09:21:15 2017 -0400

Merge branch 'maint-0.2.4' into release-0.2.4

changes/trove-2017-005 | 7 +++++++ src/or/relay.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-)