commit 76e9de7c6d1a22d89053dd4fa8671d5696c52634 Merge: 8c8ed91aa 1c80eb92f Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 13 09:57:10 2018 -0400

Merge branch '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(-)