[tor-commits] [tor/release-0.2.6] Merge branch 'maint-0.2.6' into release-0.2.6

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