[tor-commits] [tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1

[nickm at torproject.org]

commit d08d29f15f0c80b74f6440b8b84eefe241c87aad
Merge: b588b6087 4bbefc2aa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 22 12:53:06 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1

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