[tor-commits] [tor/maint-0.3.3] Merge branch 'bug25686_diagnostic_032' into maint-0.3.2

[nickm at torproject.org]

commit ff70cc84f8b00e710171bc988ababc9fe1be88e9
Merge: 53513e4bf faf458006
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 13 09:56:17 2018 -0400

    Merge branch 'bug25686_diagnostic_032' into maint-0.3.2

 changes/bug25686_diagnostic | 4 ++++
 src/or/directory.c          | 5 +++--
 src/or/router.c             | 8 +++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)