commit ca2e7eabc293791bb6d4664f851fb2a6374bbfb6 Merge: 3ef7e6f18 1a5746f8e 1b6ccb52e Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 29 17:26:40 2017 -0400

Merge branches 'bug8185_031' and 'bug8185_diagnostic_032'

changes/8185_diagnostic | 4 ++++ changes/bug8185_025 | 6 ++++++ src/or/relay.c | 21 ++++++++++++++++++++- 3 files changed, 30 insertions(+), 1 deletion(-)