[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

[nickm at torproject.org]

commit 1e079ec30db716f92bf944489ec0408daef18d0f
Merge: ae7cb3349 9c404602a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 7 08:51:16 2017 -0400

    Merge branch 'maint-0.3.1'

 changes/bug23105-diagnostic | 4 ++++
 src/or/relay.c              | 3 +++
 2 files changed, 7 insertions(+)