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

[nickm at torproject.org]

commit 0a78d2947cc1f7a0aa2ede2c37baec3e4c23a424
Merge: 020c003 dec7998
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 8 09:21:15 2017 -0400

    Merge branch 'maint-0.2.5' into release-0.2.5

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