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