commit f0fa7a3420d2cfe1a1d28fc06b2e20a491066a1f Merge: c4ecb8f86 9c404602a Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 7 08:51:16 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

changes/bug23105-diagnostic | 4 ++++ src/or/relay.c | 3 +++ 2 files changed, 7 insertions(+)