commit 987c7cae7073ba2c579cc81f973446831246858d Merge: d561da1 d15d09a Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 8 09:21:15 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

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