commit 2cc6d8d5786508c3b1dd248efa447f693d21840a Merge: 5d34df5 987c7ca Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 8 09:21:15 2017 -0400
Merge branch 'maint-0.2.9' into release-0.2.9
changes/trove-2017-005 | 7 +++++++ src/or/relay.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-)