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

[nickm at torproject.org]

commit 0f6770826748d85f40cdfba08bdb298d0c02edca
Merge: ec2af981d 8803930de
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 24 13:36:47 2019 -0400

    Merge branch 'maint-0.4.1' into release-0.4.1

 changes/bug30956           |  4 ++++
 doc/tor.1.txt              |  6 ++++--
 src/feature/relay/router.c | 17 +++++++++++------
 3 files changed, 19 insertions(+), 8 deletions(-)