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

[nickm at torproject.org]

commit 7664d6f518ea804e2bee942cfd15a8d4a9a724d3
Merge: e655744c8 d08d29f15
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 22 12:53:12 2019 -0400

    Merge branch 'maint-0.4.1' into release-0.4.1

 changes/bug30916           |  4 ++++
 src/feature/relay/router.c | 18 ++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)