commit 3ce02372d65c3edc83fbc9ff47d6fa80a76a6e18 Merge: fe3b7e1 d15d09a Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 8 09:21:15 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

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