commit c1646d6e894f11fe3a363468d7a668648f2d63d7 Merge: 9a6f938 40bccc2 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jun 8 09:21:15 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux changes/trove-2017-005 | 7 +++++++ src/or/relay.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-)