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

[nickm at torproject.org]

commit 63d0426af5b87f4dd0de710702728c4d737514de
Merge: 916791f 53011e3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 8 09:21:15 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

 changes/trove-2017-004 | 4 ++--
 changes/trove-2017-005 | 7 +++++++
 src/or/relay.c         | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)