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

[nickm at torproject.org]

commit 1c80eb92fa6c5240b1029c5ee1febe2d20b7d882
Merge: bbbb5f39b ff70cc84f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 13 09:57:10 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

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