commit dec7998f5c42dde955760efc72f57025a32da238 Merge: 2e5220c 56a7c5b Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 8 09:21:15 2017 -0400

Merge branch 'maint-0.2.4' into maint-0.2.5

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