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

[nickm at torproject.org]

commit 2e71f3ccfee3451263d2ec35343dea3548e7e4b5
Merge: bc5d90423 1c80eb92f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 13 09:57:10 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

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