[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0

[nickm at torproject.org]

commit 53011e3e54c3d8374c7044b657f90eb723ac39d1
Merge: eb5d05f 987c7ca
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 8 09:21:15 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

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